diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 67f18de..eb636e0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -83,6 +83,8 @@
     <uses-permission android:name="android.permission.MANAGE_NOTIFICATIONS"/>
     <uses-permission android:name="android.permission.DELETE_PACKAGES"/>
     <uses-permission android:name="android.permission.MANAGE_APP_OPS_RESTRICTIONS"/>
+    <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/>
+    <uses-permission android:name="android.permission.READ_PRINT_SERVICES" />
     <uses-permission android:name="android.permission.NETWORK_SETTINGS" />
 
     <application android:label="@string/settings_label"
@@ -210,7 +212,7 @@
 
         <activity android:name=".search.SearchActivity"
                   android:label="@string/search_settings"
-                  android:icon="@drawable/ic_search_history"
+                  android:icon="@drawable/ic_search_24dp"
                   android:parentActivityName="Settings"
                   android:theme="@style/Theme.Settings.NoActionBar">
         </activity>
@@ -556,7 +558,7 @@
         </activity>
 
         <activity android:name=".Settings$LanguageAndInputSettingsActivity"
-            android:label="@string/language_input_gesture_title"
+            android:label="@string/language_settings"
             android:icon="@drawable/ic_settings_language"
             android:taskAffinity="com.android.settings"
             android:parentActivityName="Settings$SystemDashboardActivity">
@@ -669,13 +671,6 @@
                 android:value="true" />
         </activity>
 
-        <receiver android:name=".inputmethod.InputMethodDialogReceiver"
-                android:enabled="true">
-            <intent-filter>
-                <action android:name="android.settings.SHOW_INPUT_METHOD_PICKER" />
-            </intent-filter>
-        </receiver>
-
         <activity android:name="Settings$UserDictionarySettingsActivity"
                 android:label="@string/user_dict_settings_title"
                 android:taskAffinity="com.android.settings"
@@ -803,7 +798,7 @@
 
         <activity android:name=".support.NewDeviceIntroSuggestionActivity"
                   android:label="@string/new_device_suggestion_title"
-                  android:icon="@drawable/ic_new_releases_24dp"
+                  android:icon="@drawable/ic_new_device_suggestion_24dp"
                   android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -925,6 +920,26 @@
                 android:value="true" />
         </activity>
 
+        <activity android:name="Settings$NightDisplaySuggestionActivity"
+            android:enabled="@*android:bool/config_nightDisplayAvailable"
+            android:taskAffinity=""
+            android:icon="@drawable/ic_settings_night_display">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.dismiss"
+                android:value="6,10,30" />
+            <meta-data android:name="com.android.settings.title"
+                android:resource="@string/night_display_suggestion_title" />
+            <meta-data android:name="com.android.settings.summary"
+                android:resource="@string/night_display_suggestion_summary" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.display.NightDisplaySettings" />
+        </activity>
+
         <activity android:name="Settings$DeviceInfoSettingsActivity"
                 android:label="@string/device_info_settings"
                 android:icon="@drawable/ic_settings_about"
@@ -2336,6 +2351,7 @@
         <!-- Triggered when user-selected home app isn't encryption aware -->
         <activity android:name=".FallbackHome"
                   android:excludeFromRecents="true"
+                  android:label=""
                   android:screenOrientation="nosensor"
                   android:theme="@style/FallbackHome">
             <intent-filter android:priority="-1000">
@@ -2372,6 +2388,24 @@
                 android:value="com.android.settings.CryptKeeperSettings" />
         </activity>
 
+        <activity android:name="Settings$DataPlanUsageSummaryActivity"
+                android:label="@string/data_usage_summary_title"
+                android:icon="@drawable/ic_settings_data_usage"
+                android:taskAffinity="">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="com.android.settings.SHORTCUT" />
+            </intent-filter>
+            <intent-filter android:priority="10">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                    android:value="com.android.settings.category.ia.wireless" />
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                    android:value="com.android.settings.datausage.DataPlanUsageSummary" />
+        </activity>
+
         <activity android:name="Settings$DataUsageSummaryActivity"
                 android:label="@string/data_usage_summary_title"
                 android:icon="@drawable/ic_settings_data_usage"
@@ -2390,6 +2424,17 @@
                 android:value="com.android.settings.datausage.DataUsageSummary" />
         </activity>
 
+        <activity android:name="Settings$MobileDataUsageListActivity"
+                  android:label="@string/cellular_data_usage"
+                  android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.MOBILE_DATA_USAGE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.datausage.DataUsageList" />
+        </activity>
+
         <activity android:name="Settings$DreamSettingsActivity"
                 android:label="@string/screensaver_settings_title"
                 android:icon="@drawable/ic_settings_display"
@@ -2444,11 +2489,6 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <intent-filter android:priority="10">
-                <action android:name="com.android.settings.action.SETTINGS" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.ia.apps.default" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.nfc.PaymentSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -2483,6 +2523,16 @@
             </intent-filter>
         </activity>
 
+        <activity android:name="Settings$SpecialAccessSettingsActivity"
+                  android:taskAffinity="">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.applications.SpecialAccessSettings" />
+        </activity>
+
         <activity android:name="Settings$NotificationAccessSettingsActivity"
                   android:label="@string/manage_notification_access_title"
                   android:taskAffinity="">
@@ -2941,7 +2991,7 @@
             <meta-data android:name="com.android.settings.category"
                        android:value="com.android.settings.category.ia.apps"/>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.applications.AdvancedAppSettings" />
+                       android:value="com.android.settings.applications.DefaultAppSettings" />
             <meta-data android:name="com.android.settings.summary"
                        android:resource="@string/summary_empty"/>
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -3138,7 +3188,7 @@
         <activity
             android:name=".Settings$DoubleTapPowerSuggestionActivity"
             android:label="@string/double_tap_power_for_camera_title"
-            android:icon="@drawable/ic_suggestion_gesture">
+            android:icon="@drawable/ic_settings_gestures">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="com.android.settings.suggested.category.GESTURE" />
@@ -3156,7 +3206,7 @@
         <activity
             android:name=".Settings$DoubleTwistSuggestionActivity"
             android:label="@string/double_twist_for_camera_mode_title"
-            android:icon="@drawable/ic_suggestion_gesture">
+            android:icon="@drawable/ic_settings_gestures">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="com.android.settings.suggested.category.GESTURE" />
@@ -3174,7 +3224,7 @@
         <activity
             android:name=".Settings$AmbientDisplaySuggestionActivity"
             android:label="@string/ambient_display_title"
-            android:icon="@drawable/ic_suggestion_gesture">
+            android:icon="@drawable/ic_settings_gestures">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="com.android.settings.suggested.category.GESTURE" />
@@ -3192,7 +3242,7 @@
         <activity
             android:name=".Settings$AmbientDisplayPickupSuggestionActivity"
             android:label="@string/ambient_display_pickup_title"
-            android:icon="@drawable/ic_suggestion_gesture">
+            android:icon="@drawable/ic_settings_gestures">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="com.android.settings.suggested.category.GESTURE" />
@@ -3210,7 +3260,7 @@
         <activity
             android:name=".Settings$SwipeToNotificationSuggestionActivity"
             android:label="@string/fingerprint_swipe_for_notifications_title"
-            android:icon="@drawable/ic_suggestion_gesture">
+            android:icon="@drawable/ic_settings_gestures">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="com.android.settings.suggested.category.GESTURE" />
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..244516e
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,11 @@
+asapperstein@google.com
+asargent@google.com
+dehboxturtle@google.com
+dhnishi@google.com
+dling@google.com
+jackqdyulei@google.com
+mfritze@google.com
+zhfan@google.com
+
+# Emergency approvers in case the above are not available
+miket@google.com
diff --git a/res/drawable-hdpi/ic_search_history_am.png b/res/drawable-hdpi/ic_search_history_am.png
deleted file mode 100644
index eaef70c..0000000
--- a/res/drawable-hdpi/ic_search_history_am.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_search_history_am.png b/res/drawable-mdpi/ic_search_history_am.png
deleted file mode 100644
index fd6755f..0000000
--- a/res/drawable-mdpi/ic_search_history_am.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-nodpi/fingerprint_enroll_introduction.png b/res/drawable-nodpi/fingerprint_enroll_introduction.png
new file mode 100644
index 0000000..268ca43
--- /dev/null
+++ b/res/drawable-nodpi/fingerprint_enroll_introduction.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_search_history_am.png b/res/drawable-xhdpi/ic_search_history_am.png
deleted file mode 100644
index 7183fc2..0000000
--- a/res/drawable-xhdpi/ic_search_history_am.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_search_history_am.png b/res/drawable-xxhdpi/ic_search_history_am.png
deleted file mode 100644
index 174409b..0000000
--- a/res/drawable-xxhdpi/ic_search_history_am.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_search_history_am.png b/res/drawable-xxxhdpi/ic_search_history_am.png
deleted file mode 100644
index ffce51e..0000000
--- a/res/drawable-xxxhdpi/ic_search_history_am.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/ic_airplanemode_active.xml b/res/drawable/ic_airplanemode_active.xml
index 5759341..10dd7ed 100644
--- a/res/drawable/ic_airplanemode_active.xml
+++ b/res/drawable/ic_airplanemode_active.xml
@@ -20,9 +20,9 @@
         android:viewportHeight="24.0"
         android:tint="?android:attr/colorControlNormal">
     <path
-        android:pathData="M10.18,9"
-        android:fillColor="#FFFFFFFF"/>
-    <path
-        android:pathData="M21,16v-2l-8,-5V3.5c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,2.67 10,3.5V9l-8,5v2l8,-2.5V19l-2,1.5V22l3.5,-1 3.5,1v-1.5L13,19v-5.5l8,2.5z"
+        android:pathData="M20.8,13.56L13.5,9V3.5C13.5,2.67,12.83,2,12,2s-1.5,0.67-1.5,1.5V9l-7.3,4.56c-0.43,0.27-0.7,0.75-0.7,1.27v0.49
+c0,0.34,0.33,0.58,0.65,0.48l7.35-2.3V19l-1.6,1.2c-0.25,0.19-0.4,0.49-0.4,0.8v0.67c0,0.17,0.14,0.28,0.31,0.24
+c1.94-0.55,1.3-0.37,3.19-0.91c1.21,0.35,1.99,0.57,3.19,0.91c0.17,0.04,0.31-0.07,0.31-0.24V21c0-0.31-0.15-0.61-0.4-0.8L13.5,19
+v-5.5l7.35,2.3c0.32,0.1,0.65-0.14,0.65-0.48v-0.49C21.5,14.31,21.23,13.83,20.8,13.56z"
         android:fillColor="#FFFFFFFF"/>
 </vector>
diff --git a/res/drawable/ic_apps.xml b/res/drawable/ic_apps.xml
index 784a818..9f00141 100644
--- a/res/drawable/ic_apps.xml
+++ b/res/drawable/ic_apps.xml
@@ -20,6 +20,11 @@
         android:viewportHeight="24.0"
         android:tint="?android:attr/colorControlNormal">
     <path
-        android:pathData="M4,8h4L8,4L4,4v4zM10,20h4v-4h-4v4zM4,20h4v-4L4,16v4zM4,14h4v-4L4,10v4zM10,14h4v-4h-4v4zM16,4v4h4L20,4h-4zM10,8h4L14,4h-4v4zM16,14h4v-4h-4v4zM16,20h4v-4h-4v4z"
+        android:pathData="M6 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm6 12c1.1 0 2-.9 2-2s-.9-2-2-2-2
+.9-2 2 .9 2 2 2zm-6 0c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0-6c1.1 0 2-.9
+2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm6 0c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2
+2zm4-8c0 1.1 .9 2 2 2s2-.9 2-2-.9-2-2-2-2 .9-2 2zm-4 2c1.1 0 2-.9
+2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm6 6c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2
+2zm0 6c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2z"
         android:fillColor="#FFFFFFFF"/>
 </vector>
diff --git a/res/drawable/ic_arrow_down_24dp.xml b/res/drawable/ic_arrow_down_24dp.xml
index 7c5866d..f334902 100644
--- a/res/drawable/ic_arrow_down_24dp.xml
+++ b/res/drawable/ic_arrow_down_24dp.xml
@@ -22,5 +22,6 @@
         android:tint="?android:attr/colorAccent">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M7.41,7.84L12,12.42l4.59,-4.58L18,9.25l-6,6 -6,-6z"/>
+        android:pathData="M8.12 9.29L12 13.17l3.88-3.88a.996 .996 0 1 1 1.41 1.41l-4.59 4.59a.996 .996 0 0
+1-1.41 0L6.7 10.7a.996 .996 0 0 1 0-1.41c.39-.38 1.03-.39 1.42 0z"/>
 </vector>
diff --git a/res/drawable/ic_cast_24dp.xml b/res/drawable/ic_cast_24dp.xml
index 7dc895e..948deca 100644
--- a/res/drawable/ic_cast_24dp.xml
+++ b/res/drawable/ic_cast_24dp.xml
@@ -22,5 +22,10 @@
         android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v3h2L3,5h18v14h-7v2h7c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM1,18v3h3c0,-1.66 -1.34,-3 -3,-3zM1,14v2c2.76,0 5,2.24 5,5h2c0,-3.87 -3.13,-7 -7,-7zM1,10v2c4.97,0 9,4.03 9,9h2c0,-6.08 -4.93,-11 -11,-11z"/>
+        android:pathData="M1 18v2c0 .55 .45 1 1 1h2c0-1.66-1.34-3-3-3zm0-2.94c-.01 .51 .32 .93 .82 1.02
+2.08 .36 3.74 2 4.1 4.08 .09 .48 .5 .84 .99 .84 .61 0 1.09-.54 1-1.14a6.996
+6.996 0 0 0-5.8-5.78c-.59-.09-1.09 .38 -1.11 .98 zm0-4.03c-.01 .52 .34 .96 .85
+1.01 4.26 .43 7.68 3.82 8.1 8.08 .05 .5 .48 .88 .99 .88 .59 0 1.06-.51
+1-1.1-.52-5.21-4.66-9.34-9.87-9.85-.57-.05-1.05 .4 -1.07 .98 zM21 3H3c-1.1 0-2
+.9-2 2v3h2V5h18v14h-7v2h7c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"/>
 </vector>
diff --git a/res/drawable/ic_chevron_right_24dp.xml b/res/drawable/ic_chevron_right_24dp.xml
index 63532cb..ba62187 100644
--- a/res/drawable/ic_chevron_right_24dp.xml
+++ b/res/drawable/ic_chevron_right_24dp.xml
@@ -23,5 +23,6 @@
     android:viewportWidth="24.0"
     android:tint="?android:attr/colorControlNormal">
     <path android:fillColor="#FF000000"
-          android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z" />
+          android:pathData="M9.29,15.63l3.88-3.88L9.29,7.87c-0.39-0.39-0.39-1.02,0-1.41l0,0c0.39-0.39,1.02-0.39,1.41,0l4.59,4.59
+c0.39,0.39,0.39,1.02,0,1.41l-4.59,4.59c-0.39,0.39-1.02,0.39-1.41,0l0,0C8.91,16.66,8.9,16.02,9.29,15.63z" />
 </vector>
diff --git a/res/drawable/ic_data_saver.xml b/res/drawable/ic_data_saver.xml
index 7356772..d2d55a9 100644
--- a/res/drawable/ic_data_saver.xml
+++ b/res/drawable/ic_data_saver.xml
@@ -17,14 +17,9 @@
         android:width="24.0dp"
         android:height="24.0dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M12.0,19.0c-3.9,0.0 -7.0,-3.1 -7.0,-7.0c0.0,-3.5 2.6,-6.4 6.0,-6.9L11.0,2.0C5.9,2.5 2.0,6.8 2.0,12.0c0.0,5.5 4.5,10.0 10.0,10.0c3.3,0.0 6.2,-1.6 8.1,-4.1l-2.6,-1.5C16.2,18.0 14.2,19.0 12.0,19.0z"/>
-    <path
-        android:fillColor="#4DFFFFFF"
-        android:pathData="M13.0,2.0l0.0,3.0c3.4,0.5 6.0,3.4 6.0,6.9c0.0,0.9 -0.2,1.8 -0.5,2.5l2.6,1.5c0.6,-1.2 0.9,-2.6 0.9,-4.1C22.0,6.8 18.0,2.6 13.0,2.0z"/>
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M16.0,11.0l0.0,2.0 -3.0,0.0 0.0,3.0 -2.0,0.0 0.0,-3.0 -3.0,0.0 0.0,-2.0 3.0,0.0 0.0,-3.0 2.0,0.0 0.0,3.0z"/>
+        android:pathData="M18.32,16.75l1.32,0.76c0.26,0.15 0.34,0.51 0.15,0.74 -2.09,2.6 -5.44,4.14 -9.14,3.65 -4.4,-0.58 -7.96,-4.12 -8.56,-8.52C1.34,7.8 5.21,2.95 10.43,2.12c0.3,-0.05 0.57,0.2 0.57,0.5v1.53c0,0.24 -0.18,0.44 -0.41,0.49 -3.6,0.69 -6.29,3.95 -6.07,7.79 0.21,3.82 3.43,6.95 7.25,7.07 2.37,0.08 4.51,-0.96 5.93,-2.63a0.48,0.48 0,0 1,0.62 -0.12zM19.5,12c0,0.83 -0.14,1.63 -0.39,2.38 -0.08,0.23 0.01,0.47 0.21,0.59l1.33,0.77c0.26,0.15 0.61,0.04 0.72,-0.24 0.4,-1.09 0.63,-2.27 0.63,-3.5 0,-4.99 -3.65,-9.12 -8.43,-9.88 -0.3,-0.04 -0.57,0.2 -0.57,0.5v1.53c0,0.24 0.18,0.44 0.41,0.48 3.46,0.68 6.09,3.72 6.09,7.37z" />
 </vector>
diff --git a/res/drawable/ic_devices_other.xml b/res/drawable/ic_devices_other.xml
index 20639a3..b22e483 100644
--- a/res/drawable/ic_devices_other.xml
+++ b/res/drawable/ic_devices_other.xml
@@ -20,6 +20,13 @@
         android:viewportHeight="24.0"
         android:tint="?android:attr/colorControlNormal">
     <path
-        android:pathData="M3,6h18L21,4L3,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h4v-2L3,18L3,6zM13,12L9,12v1.78c-0.61,0.55 -1,1.33 -1,2.22s0.39,1.67 1,2.22L9,20h4v-1.78c0.61,-0.55 1,-1.34 1,-2.22s-0.39,-1.67 -1,-2.22L13,12zM11,17.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM22,8h-6c-0.5,0 -1,0.5 -1,1v10c0,0.5 0.5,1 1,1h6c0.5,0 1,-0.5 1,-1L23,9c0,-0.5 -0.5,-1 -1,-1zM21,18h-4v-8h4v8z"
-        android:fillColor="#FFFFFFFF"/>
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M3,6h17c0.55,0,1-0.45,1-1v0c0-0.55-0.45-1-1-1H3C1.9,4,1,4.9,1,6v12c0,1.1,0.9,2,2,2h3c0.55,0,1-0.45,1-1v0
+        c0-0.55-0.45-1-1-1H3V6z
+        M13,12H9v1.78C8.39,14.33,8,15.11,8,16c0,0.89,0.39,1.67,1,2.22V20h4v-1.78c0.61-0.55,1-1.34,1-2.22
+        s-0.39-1.67-1-2.22V12z
+        M11,17.5c-0.83,0-1.5-0.67-1.5-1.5s0.67-1.5,1.5-1.5s1.5,0.67,1.5,1.5S11.83,17.5,11,17.5z
+        M22,8h-6
+        c-0.5,0-1,0.5-1,1v10c0,0.5,0.5,1,1,1h6c0.5,0,1-0.5,1-1V9C23,8.5,22.5,8,22,8z
+        M21,18h-4v-8h4V18z" />
 </vector>
diff --git a/res/drawable/ic_expand_more.xml b/res/drawable/ic_expand_more.xml
index 609cf36..edffde3 100644
--- a/res/drawable/ic_expand_more.xml
+++ b/res/drawable/ic_expand_more.xml
@@ -23,7 +23,8 @@
     android:tint="?android:attr/colorControlNormal">
 
     <path
-        android:fillColor="@android:color/white"
-        android:pathData="M16.59,8.59L12.0,13.17 7.41,8.59 6.0,10.0l6.0,6.0 6.0,-6.0z"/>
+        android:fillColor="#000000"
+        android:pathData="M8.12 9.29L12 13.17l3.88-3.88a.996 .996 0 1 1 1.41 1.41l-4.59 4.59a.996 .996 0 0
+1-1.41 0L6.7 10.7a.996 .996 0 0 1 0-1.41c.39-.38 1.03-.39 1.42 0z" />
 
 </vector>
diff --git a/res/drawable/ic_help.xml b/res/drawable/ic_help.xml
index 7a225e5..6add484 100644
--- a/res/drawable/ic_help.xml
+++ b/res/drawable/ic_help.xml
@@ -20,6 +20,11 @@
         android:viewportHeight="24.0"
         android:tint="?android:attr/colorControlNormal">
     <path
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"
+        android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 16.81c-.72
+0-1.3-.58-1.3-1.3s.58-1.3 1.3-1.3 1.3 .58 1.3 1.3-.58 1.3-1.3
+1.3zm1.07-4.62c-.09 .52 -.59 .87 -1.13 .79 -.57-.08-.94-.66-.83-1.23 .52 -2.61
+2.66-2.84 2.87-4.5 .12 -.96-.42-1.87-1.34-2.17-1.04-.33-2.21 .16 -2.55 1.37-.12
+.45 -.52 .74 -.97 .74 -.66 0-1.13-.63-.96-1.27 .63 -2.25 2.91-3.38 5.05-2.74
+1.71 .51 2.84 2.16 2.78 3.95-.07 2.44-2.49 2.61-2.92 5.06z"
         android:fillColor="#FFFFFFFF"/>
 </vector>
diff --git a/res/drawable/ic_menu_add.xml b/res/drawable/ic_menu_add.xml
index 3387f29..9e2175b 100644
--- a/res/drawable/ic_menu_add.xml
+++ b/res/drawable/ic_menu_add.xml
@@ -23,5 +23,6 @@
     android:tint="?android:attr/colorAccent">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+        android:pathData="M18,13h-5v5c0,0.55-0.45,1-1,1h0c-0.55,0-1-0.45-1-1v-5H6c-0.55,0-1-0.45-1-1v0c0-0.55,0.45-1,1-1h5V6c0-0.55,0.45-1,1-1h0
+c0.55,0,1,0.45,1,1v5h5c0.55,0,1,0.45,1,1v0C19,12.55,18.55,13,18,13z"/>
 </vector>
diff --git a/res/drawable/ic_network_cell.xml b/res/drawable/ic_network_cell.xml
index cc3c633..1f24717 100644
--- a/res/drawable/ic_network_cell.xml
+++ b/res/drawable/ic_network_cell.xml
@@ -14,16 +14,13 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
         android:tint="?android:attr/colorControlNormal">
     <path
-        android:pathData="M2,22h20V2z"
-        android:fillAlpha=".3"
-        android:fillColor="#FFFFFFFF"/>
-    <path
-        android:pathData="M17,7L2,22h15z"
+        android:pathData="m3.8,22l17.19,0c0.55,0 1.01,-0.45 1.01,-1.01l0,-17.19c0,-0.71 -0.87,-1.08 -1.38,-0.57l-17.38,17.39c-0.51,0.51 -0.15,1.38 0.56,1.38z"
         android:fillColor="#FFFFFFFF"/>
 </vector>
diff --git a/res/drawable/ic_new_releases_24dp.xml b/res/drawable/ic_new_device_suggestion_24dp.xml
similarity index 100%
rename from res/drawable/ic_new_releases_24dp.xml
rename to res/drawable/ic_new_device_suggestion_24dp.xml
diff --git a/res/drawable/ic_restore.xml b/res/drawable/ic_restore.xml
index 737f811..201b1df 100644
--- a/res/drawable/ic_restore.xml
+++ b/res/drawable/ic_restore.xml
@@ -22,7 +22,11 @@
     android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M13 3c-4.97 0-9 4.03-9 9H1l3.89 3.89 .07 .14L9 12H6c0-3.87 3.13-7 7-7s7 3.13 7
-7-3.13 7-7 7c-1.93 0-3.68-.79-4.94-2.06l-1.42 1.42C8.27 19.99 10.51 21 13
-21c4.97 0 9-4.03 9-9s-4.03-9-9-9zm-1 5v5l4.28 2.54 .72 -1.21-3.5-2.08V8H12z" />
+        android:pathData="M13.5 7.75v4.5l3.37 2c.34 .2 .46 .65 .25 .99 s-.64 .45 -.98 .24 L12
+13V7.75c0-.41 .34 -.75 .75 -.75s.75 .34 .75 .75 zM13.05 3C8.11 3 4.1 7.02 4.1
+11.95c0 .02 .01 .03 .01 .05H2.05c-.47 0-.71 .57 -.37 .9 l2.95 2.94c.21 .21 .54
+.21 .75 0l2.95-2.94c.33-.33 .1 -.9-.37-.9H5.99c0-.02 .01 -.03 .01 -.05C6 8.06
+9.16 4.9 13.05 4.9S20.1 8.11 20.1 12s-3.16 7.1-7.05 7.1c-1.58
+0-3.08-.51-4.32-1.48a.94 .94 0 0 0-1.32 .16 l-.01 .01 a.94 .94 0 0 0 .16
+1.32l.01 .01 A8.77 8.77 0 0 0 13.05 21c4.94 0 8.95-4.07 8.95-9s-4.02-9-8.95-9z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_search_24dp.xml b/res/drawable/ic_search_24dp.xml
index 4693dd7..8f14e88 100644
--- a/res/drawable/ic_search_24dp.xml
+++ b/res/drawable/ic_search_24dp.xml
@@ -16,12 +16,15 @@
   -->
 
 <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/colorControlNormal">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
+
     <path
-        android:pathData="M15.5,14l-0.8,0l-0.3,-0.3c1,-1.1 1.6,-2.6 1.6,-4.2C16,5.9 13.1,3 9.5,3C5.9,3 3,5.9 3,9.5S5.9,16 9.5,16c1.6,0 3.1,-0.6 4.2,-1.6l0.3,0.3l0,0.8l5,5l1.5,-1.5L15.5,14zM9.5,14C7,14 5,12 5,9.5S7,5 9.5,5C12,5 14,7 14,9.5S12,14 9.5,14z"
-        android:fillColor="#ffffff"/>
-</vector>
+        android:fillColor="#000000"
+        android:pathData="M15.5,14h-0.79l-0.28-0.27c1.2-1.4,1.82-3.31,1.48-5.34c-0.47-2.78-2.79-5-5.59-5.34c-4.23-0.52-7.79,3.04-7.27,7.27
+c0.34,2.8,2.56,5.12,5.34,5.59c2.03,0.34,3.94-0.28,5.34-1.48L14,14.71v0.79l5.2,5.19c0.41,0.41,1.07,0.41,1.48,0l0.01-0.01
+c0.41-0.41,0.41-1.07,0-1.48L15.5,14z M9.5,14C7.01,14,5,11.99,5,9.5S7.01,5,9.5,5S14,7.01,14,9.5S11.99,14,9.5,14z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings.xml b/res/drawable/ic_settings.xml
index 439c1a7..3d8563d 100644
--- a/res/drawable/ic_settings.xml
+++ b/res/drawable/ic_settings.xml
@@ -21,16 +21,14 @@
     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"/>
+        android:pathData="M21.4 14.2l-1.94-1.45c.03-.25 .04 -.5 .04 -.76s-.01-.51-.04-.76L21.4 9.8c.42-.31
+.52 -.94 .24 -1.41l-1.6-2.76c-.28-.48-.88-.7-1.36-.5l-2.14 .91
+c-.48-.37-1.01-.68-1.57-.92l-.27-2.2c-.06-.52-.56-.92-1.11-.92h-3.18c-.55 0-1.05
+.4 -1.11 .92 l-.26 2.19c-.57 .24 -1.1 .55 -1.58 .92 l-2.14-.91c-.48-.2-1.08 .02
+-1.36 .5 l-1.6 2.76c-.28 .48 -.18 1.1 .24 1.42l1.94 1.45c-.03 .24 -.04 .49 -.04
+.75 s.01 .51 .04 .76 L2.6 14.2c-.42 .31 -.52 .94 -.24 1.41l1.6 2.76c.28 .48 .88
+.7 1.36 .5 l2.14-.91c.48 .37 1.01 .68 1.57 .92 l.27 2.19c.06 .53 .56 .93 1.11
+.93 h3.18c.55 0 1.04-.4 1.11-.92l.27-2.19c.56-.24 1.09-.55 1.57-.92l2.14 .91
+c.48 .2 1.08-.02 1.36-.5l1.6-2.76c.28-.48 .18 -1.1-.24-1.42zM12 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_about.xml b/res/drawable/ic_settings_about.xml
index cdf8275..887fca6 100644
--- a/res/drawable/ic_settings_about.xml
+++ b/res/drawable/ic_settings_about.xml
@@ -20,6 +20,12 @@
         android:viewportHeight="24.0"
         android:tint="?android:attr/colorControlNormal">
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M11.0,17.0l2.0,0.0l0.0,-6.0l-2.0,0.0l0.0,6.0zm1.0,-15.0C6.48,2.0 2.0,6.48 2.0,12.0s4.48,10.0 10.0,10.0 10.0,-4.48 10.0,-10.0S17.52,2.0 12.0,2.0zm0.0,18.0c-4.41,0.0 -8.0,-3.59 -8.0,-8.0s3.59,-8.0 8.0,-8.0 8.0,3.59 8.0,8.0 -3.59,8.0 -8.0,8.0zM11.0,9.0l2.0,0.0L13.0,7.0l-2.0,0.0l0.0,2.0z"/>
+        android:fillColor="#FF000000"
+        android:pathData="M12,17L12,17c0.55,0 1,-0.45 1,-1v-4c0,-0.55 -0.45,-1 -1,-1l0,0c-0.55,0 -1,0.45 -1,1v4C11,16.55 11.45,17 12,17z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2c-5.52,0 -10,4.48 -10,10s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8s8,3.59 8,8S16.41,20 12,20z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,9.1L12,9.1c0.61,0 1.1,-0.49 1.1,-1.1l0,0c0,-0.61 -0.49,-1.1 -1.1,-1.1l0,0c-0.61,0 -1.1,0.49 -1.1,1.1l0,0C10.9,8.61 11.39,9.1 12,9.1z"/>
 </vector>
diff --git a/res/drawable/ic_settings_accessibility.xml b/res/drawable/ic_settings_accessibility.xml
index 1570312..4cf5182 100644
--- a/res/drawable/ic_settings_accessibility.xml
+++ b/res/drawable/ic_settings_accessibility.xml
@@ -21,5 +21,5 @@
         android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M20.5 6c-2.61.7-5.67 1-8.5 1s-5.89-.3-8.5-1L3 8c1.86.5 4 .83 6 1v13h2v-6h2v6h2V9c2-.17 4.14-.5 6-1l-.5-2zM12 6c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2z"/>
+        android:pathData="M20.75,6.99c-0.14,-0.55 -0.69,-0.87 -1.24,-0.75C17.13,6.77 14.48,7 12,7S6.87,6.77 4.49,6.24c-0.55,-0.12 -1.1,0.2 -1.24,0.75l0,0C3.11,7.55 3.45,8.12 4,8.25C5.61,8.61 7.35,8.86 9,9v12c0,0.55 0.45,1 1,1h0c0.55,0 1,-0.45 1,-1v-5h2v5c0,0.55 0.45,1 1,1h0c0.55,0 1,-0.45 1,-1V9c1.65,-0.14 3.39,-0.39 5,-0.75C20.55,8.12 20.89,7.55 20.75,6.99L20.75,6.99zM12,6c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2s-2,0.9 -2,2S10.9,6 12,6z"/>
 </vector>
diff --git a/res/drawable/ic_settings_bluetooth.xml b/res/drawable/ic_settings_bluetooth.xml
index fb4dfa4..6e32e1a 100644
--- a/res/drawable/ic_settings_bluetooth.xml
+++ b/res/drawable/ic_settings_bluetooth.xml
@@ -16,10 +16,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24.0dp"
         android:height="24.0dp"
-        android:viewportWidth="48.0"
-        android:viewportHeight="48.0"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
         android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M35.41,15.41L24.0,4.0l-2.0,0.0l0.0,15.17L12.83,10.0 10.0,12.83 21.17,24.0 10.0,35.17 12.83,38.0 22.0,28.83L22.0,44.0l2.0,0.0l11.41,-11.41L26.83,24.0l8.58,-8.59zM26.0,11.66l3.76,3.76L26.0,19.17l0.0,-7.51zm3.76,20.93L26.0,36.34l0.0,-7.52l3.76,3.77z"/>
+        android:pathData="M13.5,12l3.8,-3.7c0.4,-0.4 0.4,-1.1 0,-1.5l-4.5,-4.5c-0.4,-0.4 -1.1,-0.4 -1.5,0.1C11.1,2.5 11,2.8 11,3v6.4L6.9,5.4C6.5,5 5.9,5 5.5,5.4s-0.4,1.1 0,1.5l5.1,5.1l-5.1,5.1c-0.4,0.4 -0.4,1.1 0,1.5s1.1,0.4 1.5,0l4.1,-4V21c0,0.6 0.5,1 1,1c0.3,0 0.5,-0.1 0.7,-0.3l0.1,0l4.5,-4.5c0.4,-0.4 0.4,-1.1 0,-1.5L13.5,12zM13,9.7V5.4l2.1,2.2L13,9.7zM13,18.6v-4.3l2.1,2.2L13,18.6z"/>
 </vector>
diff --git a/res/drawable/ic_settings_data_usage.xml b/res/drawable/ic_settings_data_usage.xml
index 31ea994..0e0b447 100644
--- a/res/drawable/ic_settings_data_usage.xml
+++ b/res/drawable/ic_settings_data_usage.xml
@@ -16,23 +16,16 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24.0dp"
         android:height="24.0dp"
-        android:viewportWidth="48.0"
-        android:viewportHeight="48.0"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
         android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FFFFFFFF"
-        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"/>
+        android:pathData="M18.32 16.75l1.32 .76 c.26 .15 .34 .51 .15 .74 -2.09 2.6-5.44 4.14-9.14
+3.65-4.4-.58-7.96-4.12-8.56-8.52C1.34 7.8 5.21 2.95 10.43 2.12c.3-.05 .57 .2 .57
+.5v1.53c0 .24-.18 .44 -.41 .49 -3.6 .69 -6.29 3.95-6.07 7.79 .21 3.82 3.43 6.95
+7.25 7.07 2.37 .08 4.51-.96 5.93-2.63a.48 .48 0 0 1 .62-.12zM19.5 12c0 .83-.14
+1.63-.39 2.38-.08 .23 .01 .47 .21 .59 l1.33 .77 c.26 .15 .61 .04 .72-.24 .4
+-1.09 .63 -2.27 .63 -3.5 0-4.99-3.65-9.12-8.43-9.88-.3-.04-.57 .2 -.57 .5
+v1.53c0 .24 .18 .44 .41 .48 3.46 .68 6.09 3.72 6.09 7.37z"/>
 </vector>
diff --git a/res/drawable/ic_settings_date_time.xml b/res/drawable/ic_settings_date_time.xml
index b965878..1d2f3d3 100644
--- a/res/drawable/ic_settings_date_time.xml
+++ b/res/drawable/ic_settings_date_time.xml
@@ -1,28 +1,25 @@
 <!--
-    Copyright (C) 2016 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.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
+        android:width="24dp"
+        android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
         android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M11.99,2.0C6.47,2.0 2.0,6.48 2.0,12.0s4.47,10.0 9.99,10.0C17.52,22.0 22.0,17.52 22.0,12.0S17.52,2.0 11.99,2.0zM12.0,20.0c-4.42,0.0 -8.0,-3.58 -8.0,-8.0s3.58,-8.0 8.0,-8.0 8.0,3.58 8.0,8.0 -3.58,8.0 -8.0,8.0z"/>
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M12.5,7.0L11.0,7.0l0.0,6.0l5.25,3.1 0.75,-1.23 -4.5,-2.67z"/>
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM11.75,6.1c-0.5,0 -0.75,0.32 -0.75,0.72L11,13l4.64,2.78c0.34,0.2 0.78,0.1 0.98,-0.24a0.71,0.71 0,0 0,-0.25 -0.99l-3.87,-2.3L12.5,6.82c0,-0.4 -0.25,-0.72 -0.75,-0.72z"/>
 </vector>
diff --git a/res/drawable/ic_settings_display.xml b/res/drawable/ic_settings_display.xml
index ff763f0..de71508 100644
--- a/res/drawable/ic_settings_display.xml
+++ b/res/drawable/ic_settings_display.xml
@@ -21,5 +21,8 @@
         android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FFFFFFFF"
-        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"/>
+        android:pathData="M20,15.31l2.6-2.6c0.39-0.39,0.39-1.02,0-1.41L20,8.69V5c0-0.55-0.45-1-1-1h-3.69l-2.6-2.6c-0.39-0.39-1.02-0.39-1.41,0
+L8.69,4H5C4.45,4,4,4.45,4,5v3.69l-2.6,2.6c-0.39,0.39-0.39,1.02,0,1.41l2.6,2.6V19c0,0.55,0.45,1,1,1h3.69l2.6,2.6
+c0.39,0.39,1.02,0.39,1.41,0l2.6-2.6H19c0.55,0,1-0.45,1-1V15.31z
+M12,18V6c3.31,0,6,2.69,6,6S15.31,18,12,18z"/>
 </vector>
diff --git a/res/drawable/ic_settings_gestures.xml b/res/drawable/ic_settings_gestures.xml
index d882cb3..4fe0bf3 100644
--- a/res/drawable/ic_settings_gestures.xml
+++ b/res/drawable/ic_settings_gestures.xml
@@ -16,10 +16,13 @@
 <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:viewportWidth="32.0"
+        android:viewportHeight="32.0"
         android:tint="?android:attr/colorControlNormal">
     <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"/>
+        android:pathData="M20,20.2V24H6V5.3h8.7l2.4,-4H7.6c-2.2,0 -4,1.8 -4,4v21.3c0,2.2 1.8,4 4,4h10.7c2.2,0 4,-1.8 4,-4V14.9L20,20.2zM15.6,28h-5.3v-1.3h5.3V28z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M28.5,7l1.1,-2.4L32,3.5l-2.4,-1.1L28.5,0l-1.1,2.4L25,3.5l2.4,1.1L28.5,7zM21,7.4l-2.2,-4.8l-2.2,4.8l-4.8,2.2l4.8,2.2l2.2,4.8l2.2,-4.8l4.8,-2.2L21,7.4zM28.5,12.2l-1.1,2.4L25,15.6l2.4,1.1l1.1,2.4l1.1,-2.4l2.4,-1.1l-2.4,-1.1L28.5,12.2z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_print.xml b/res/drawable/ic_settings_print.xml
index 7470014..0eab402 100644
--- a/res/drawable/ic_settings_print.xml
+++ b/res/drawable/ic_settings_print.xml
@@ -21,5 +21,8 @@
         android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M19.0,8.0L5.0,8.0c-1.66,0.0 -3.0,1.34 -3.0,3.0l0.0,6.0l4.0,0.0l0.0,4.0l12.0,0.0l0.0,-4.0l4.0,0.0l0.0,-6.0c0.0,-1.66 -1.34,-3.0 -3.0,-3.0zm-3.0,11.0L8.0,19.0l0.0,-5.0l8.0,0.0l0.0,5.0zm3.0,-7.0c-0.55,0.0 -1.0,-0.45 -1.0,-1.0s0.45,-1.0 1.0,-1.0 1.0,0.45 1.0,1.0 -0.45,1.0 -1.0,1.0zm-1.0,-9.0L6.0,3.0l0.0,4.0l12.0,0.0L18.0,3.0z"/>
+        android:pathData="M19,8H5c-1.66,0-3,1.34-3,3v5c0,0.55,0.45,1,1,1h3v3c0,0.55,0.45,1,1,1h10c0.55,0,1-0.45,1-1v-3h3c0.55,0,1-0.45,1-1v-5
+C22,9.34,20.66,8,19,8z M16,19H8v-5h8V19z
+M19,12c-0.55,0-1-0.45-1-1s0.45-1,1-1s1,0.45,1,1S19.55,12,19,12z M17,3H7
+C6.45,3,6,3.45,6,4v3h12V4C18,3.45,17.55,3,17,3z"/>
 </vector>
diff --git a/res/drawable/ic_settings_sim.xml b/res/drawable/ic_settings_sim.xml
index ca548cf..d083c9d 100644
--- a/res/drawable/ic_settings_sim.xml
+++ b/res/drawable/ic_settings_sim.xml
@@ -15,7 +15,14 @@
      limitations under the License.
 -->
 
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ic_sim_sd"
-    android:tint="?android:attr/colorControlNormal" />
-
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24.0dp"
+        android:height="24.0dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19.99 4c0-1.1-.89-2-1.99-2h-8L4 8v12c0 1.1.9 2 2 2h12.01c1.1 0 1.99-.9 1.99-2l-.01-16zM9 19H7v-2h2v2zm8 0h-2v-2h2v2zm-8-4H7v-4h2v4zm4 4h-2v-4h2v4zm0-6h-2v-2h2v2zm4 2h-2v-4h2v4z"/>
+      <path android:pathData="M0 0h24v24H0z"/>
+</vector>
diff --git a/res/drawable/ic_settings_sound.xml b/res/drawable/ic_settings_sound.xml
index 598a02a..7054d78 100644
--- a/res/drawable/ic_settings_sound.xml
+++ b/res/drawable/ic_settings_sound.xml
@@ -21,5 +21,10 @@
         android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M3.0,9.0l0.0,6.0l4.0,0.0l5.0,5.0L12.0,4.0L7.0,9.0L3.0,9.0zm13.5,3.0c0.0,-1.77 -1.02,-3.29 -2.5,-4.03l0.0,8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14.0,3.23l0.0,2.06c2.8,0.86 5.0,3.54 5.0,6.71s-2.11,5.85 -5.0,6.71l0.0,2.06c4.01,-0.91 7.0,-4.49 7.0,-8.77s-2.99,-7.86 -7.0,-8.77z"/>
+        android:pathData="M3 10v4c0 .55 .45 1 1 1h3l3.29 3.29c.63 .63 1.71 .18
+1.71-.71V6.41c0-.89-1.08-1.34-1.71-.71L7 9H4c-.55 0-1 .45-1 1zm13.5 2A4.5 4.5 0
+0 0 14 7.97v8.05c1.48-.73 2.5-2.25 2.5-4.02zM14 4.46v.19c0 .38 .25 .71 .61
+.85C17.18 6.54 19 9.06 19 12s-1.82 5.46-4.39 6.5c-.36 .14 -.61 .47 -.61 .85
+v.19c0 .63 .63 1.08 1.22 .86 a8.995 8.995 0 0 0 0-16.8c-.59-.23-1.22 .23 -1.22
+.86 z"/>
 </vector>
diff --git a/res/drawable/ic_settings_wireless.xml b/res/drawable/ic_settings_wireless.xml
index 9859f31..0c894eb 100644
--- a/res/drawable/ic_settings_wireless.xml
+++ b/res/drawable/ic_settings_wireless.xml
@@ -16,10 +16,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24.0dp"
         android:height="24.0dp"
-        android:viewportWidth="18.0"
-        android:viewportHeight="18.0"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
         android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FFFFFFFF"
-        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"/>
+        android:pathData="M23.66,8.11c0.39,-0.48 0.29,-1.19 -0.22,-1.54C21.67,5.36 17.55,3 12,3 6.44,3 2.33,5.36 0.56,6.57c-0.51,0.35 -0.61,1.06 -0.23,1.54L11.16,21.6c0.42,0.53 1.23,0.53 1.66,0L23.66,8.11z"/>
 </vector>
diff --git a/res/drawable/ic_signal_workmode_enable.xml b/res/drawable/ic_signal_workmode_enable.xml
index 49af897..f7e8c80 100644
--- a/res/drawable/ic_signal_workmode_enable.xml
+++ b/res/drawable/ic_signal_workmode_enable.xml
@@ -1,63 +1,9 @@
-<?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:name="root"
-    android:height="42dp"
-    android:width="42dp"
-    android:viewportHeight="42"
-    android:viewportWidth="42" >
-    <group
-        android:name="ic_signal_briefcase"
-        android:translateX="21.9995"
-        android:translateY="25.73401" >
-        <group
-            android:name="ic_signal_briefcase_pivot"
-            android:translateX="-23.21545"
-            android:translateY="-18.86649" >
-            <clip-path
-                android:name="mask"
-                android:pathData="M 37.8337860107,-40.3974914551 c 0.0,0.0 -35.8077850342,31.5523681641 -35.8077850342,31.5523681641 c 0.0,0.0 40.9884796143,40.9278411865 40.9884796143,40.9278411865 c 0.0,0.0 -2.61700439453,2.0938873291 -2.61700439453,2.0938873291 c 0.0,0.0 -41.1884460449,-40.9392852783 -41.1884460449,-40.9392852783 c 0.0,0.0 -34.6200408936,25.4699249268 -34.6200408936,25.4699249268 c 0.0,0.0 55.9664764404,69.742401123 55.9664764404,69.742401123 c 0.0,0.0 73.2448120117,-59.1047973633 73.2448120117,-59.1047973633 c 0.0,0.0 -55.9664916992,-69.7423400879 -55.9664916992,-69.7423400879 Z" />
-            <group
-                android:name="cross" >
-                <path
-                    android:name="cross_1"
-                    android:pathData="M 7.54049682617,3.9430847168 c 0.0,0.0 31.5749816895,31.4499664307 31.5749816895,31.4499664307 "
-                    android:strokeColor="#FFFFFFFF"
-                    android:strokeAlpha="1"
-                    android:strokeWidth="3.5"
-                    android:fillColor="#00000000" />
-            </group>
-            <group
-                android:name="briefcase"
-                android:translateX="23.481"
-                android:translateY="18.71151" >
-                <path
-                    android:fillColor="#FFFFFFFF"
-                    android:fillAlpha="1"
-                    android:pathData="M-4.83333,-14.3333 L-7.16667,-11.8333 L-7.16667,-9.5 L-4.83333,-9.5 L-4.83333,-11.8333 L4.83333,-11.8333 L4.83333,-9.5 L7.16667,-9.5 L7.16667,-11.8333 L4.83333,-14.3333 Z" />
-                <path
-                    android:fillColor="#FFFFFFFF"
-                    android:fillAlpha="1"
-                    android:pathData="M13.1667,-9.5 L-13.1667,-9.5 C-14.5,-9.5,-15.5,-8.5,-15.5,-7.16666 L-15.5,0.00000286102 C-15.5,1.33334,-14.5,2.33334,-13.1667,2.33334 L-3.66667,2.33334 L-3.66667,0.00000286102 L3.5,0.00000286102 L3.5,2.33334 L13,2.33334 C14.3333,2.33334,15.3333,1.33334,15.3333,0 L15.3333,-7.16666 C15.5,-8.5,14.3333,-9.5,13.1667,-9.5 Z" />
-                <path
-                    android:fillColor="#FFFFFFFF"
-                    android:fillAlpha="1"
-                    android:pathData="M-3.5,7.16667 L-3.5,4.83334 L-14.3333,4.83334 L-14.3333,10.8333 C-14.3333,12.1667,-13.3333,13.1667,-12,13.1667 L11.8333,13.1667 C13.1667,13.1667,14.1667,12.1667,14.1667,10.8333 L14.1667,4.83334 L3.5,4.83334 L3.5,7.16667 L-3.5,7.16667 Z" />
-            </group>
-        </group>
-    </group>
+        android:width="42dp"
+        android:height="42dp"
+        android:viewportWidth="42.0"
+        android:viewportHeight="42.0">
+    <path
+        android:pathData="M40.25,38.04l-2.56,-2.56L12.62,10.41L5.69,3.48l-2.2,2.2l4.73,4.72H7.09c-1.94,0 -3.48,1.56 -3.48,3.5L3.59,33.16c0,1.94 1.56,3.5 3.5,3.5h27.37l3.59,3.59L40.25,38.04zM38.5,13.91c0.09,-1.94 -1.47,-3.5 -3.41,-3.41h-7V6.91c0,-1.94 -1.56,-3.5 -3.5,-3.41h-7c-1.94,-0.09 -3.5,1.47 -3.5,3.41v0.56l24.41,24.5V13.91zM24.59,10.5H17.5V6.91h7.09V10.5z"
+        android:fillColor="#FFFFFF"/>
 </vector>
diff --git a/res/drawable/ic_info_outline_24dp.xml b/res/drawable/ic_sms_mirroring_24dp.xml
similarity index 67%
rename from res/drawable/ic_info_outline_24dp.xml
rename to res/drawable/ic_sms_mirroring_24dp.xml
index 3fe1e9e..5fe3003 100644
--- a/res/drawable/ic_info_outline_24dp.xml
+++ b/res/drawable/ic_sms_mirroring_24dp.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2016 The Android Open Source Project
+<!-- Copyright (C) 2017 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -19,8 +18,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?android:attr/textColorSecondary">
+        android:tint="?android:attr/colorControlNormal">
     <path
-        android:fillColor="#000000"
-        android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
+        android:fillColor="#FF000000"
+        android:pathData="M20,2C21.1,2 22,2.9 22,4L22,16C22,17.1 21.1,18 20,18L6,18L2,22L2.01,4C2.01,2.9 2.9,2 4,2L20,2ZM8,8L4,12L8,16L8,13L14,13L14,11L8,11L8,8ZM19.666,7.872L16.038,4.372L16.038,6.997L10,6.997L10,9L16.038,9L16.038,11.372L19.666,7.872Z"/>
 </vector>
diff --git a/res/drawable/ic_suggestion_gesture.xml b/res/drawable/ic_suggestion_gesture.xml
deleted file mode 100644
index b90ad94..0000000
--- a/res/drawable/ic_suggestion_gesture.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-    Copyright (C) 2017 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="32.0"
-    android:viewportHeight="32.0"
-    android:autoMirrored="true">
-    <path
-        android:fillColor="@color/material_grey_600"
-        android:pathData="M20,20.2V24H6V5.3h8.7l2.4,-4H7.6c-2.2,0 -4,1.8 -4,4v21.3c0,2.2 1.8,4 4,4h10.7c2.2,0 4,-1.8 4,-4V14.9L20,20.2zM15.6,28h-5.3v-1.3h5.3V28z"/>
-    <path
-        android:fillColor="@color/material_grey_600"
-        android:pathData="M28.5,7l1.1,-2.4L32,3.5l-2.4,-1.1L28.5,0l-1.1,2.4L25,3.5l2.4,1.1L28.5,7zM21,7.4l-2.2,-4.8l-2.2,4.8l-4.8,2.2l4.8,2.2l2.2,4.8l2.2,-4.8l4.8,-2.2L21,7.4zM28.5,12.2l-1.1,2.4L25,15.6l2.4,1.1l1.1,2.4l1.1,-2.4l2.4,-1.1l-2.4,-1.1L28.5,12.2z"/>
-</vector>
diff --git a/res/drawable/ic_vpn_key.xml b/res/drawable/ic_vpn_key.xml
index aad1096..71b29d6 100644
--- a/res/drawable/ic_vpn_key.xml
+++ b/res/drawable/ic_vpn_key.xml
@@ -20,6 +20,7 @@
         android:viewportHeight="24.0"
         android:tint="?android:attr/colorControlNormal">
     <path
-        android:pathData="M12.65,10C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H17v4h4v-4h2v-4H12.65zM7,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"
+        android:pathData="M12.65,10C11.7,7.31,8.9,5.5,5.78,6.12C3.49,6.58,1.62,8.41,1.14,10.7C0.32,14.57,3.26,18,7,18c2.61,0,4.83-1.67,5.65-4H16
+v2c0,1.1,0.9,2,2,2h0c1.1,0,2-0.9,2-2v-2h1c1.1,0,2-0.9,2-2v0c0-1.1-0.9-2-2-2H12.65z M7,14c-1.1,0-2-0.9-2-2s0.9-2,2-2s2,0.9,2,2 S8.1,14,7,14z"
         android:fillColor="#FFFFFFFF"/>
 </vector>
diff --git a/res/drawable/ic_wifi_tethering.xml b/res/drawable/ic_wifi_tethering.xml
index 359da5f..676c307 100644
--- a/res/drawable/ic_wifi_tethering.xml
+++ b/res/drawable/ic_wifi_tethering.xml
@@ -20,6 +20,6 @@
         android:viewportHeight="24.0"
         android:tint="?android:attr/colorControlNormal">
     <path
-        android:pathData="M12,11c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,13c0,-3.31 -2.69,-6 -6,-6s-6,2.69 -6,6c0,2.22 1.21,4.15 3,5.19l1,-1.74c-1.19,-0.7 -2,-1.97 -2,-3.45 0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,1.48 -0.81,2.75 -2,3.45l1,1.74c1.79,-1.04 3,-2.97 3,-5.19zM12,3C6.48,3 2,7.48 2,13c0,3.7 2.01,6.92 4.99,8.65l1,-1.73C5.61,18.53 4,15.96 4,13c0,-4.42 3.58,-8 8,-8s8,3.58 8,8c0,2.96 -1.61,5.53 -4,6.92l1,1.73c2.99,-1.73 5,-4.95 5,-8.65 0,-5.52 -4.48,-10 -10,-10z"
+        android:pathData="M12,11c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,13a6,6 0,0 0,-6.75 -5.95c-2.62,0.32 -4.78,2.41 -5.18,5.02 -0.32,2.14 0.49,4.11 1.92,5.39 0.48,0.43 1.24,0.33 1.56,-0.23 0.24,-0.42 0.14,-0.94 -0.22,-1.26a3.99,3.99 0,0 1,-1.22 -3.94,3.954 3.954,0 0,1 2.9,-2.91A4.007,4.007 0,0 1,16 13c0,1.18 -0.51,2.23 -1.33,2.96 -0.36,0.33 -0.47,0.85 -0.23,1.27 0.31,0.54 1.04,0.69 1.5,0.28A5.97,5.97 0,0 0,18 13zM10.83,3.07c-4.62,0.52 -8.35,4.33 -8.78,8.96a9.966,9.966 0,0 0,4.02 9.01c0.48,0.35 1.16,0.2 1.46,-0.31 0.25,-0.43 0.14,-0.99 -0.26,-1.29 -2.28,-1.69 -3.65,-4.55 -3.16,-7.7 0.54,-3.5 3.46,-6.29 6.98,-6.68C15.91,4.51 20,8.28 20,13c0,2.65 -1.29,4.98 -3.27,6.44 -0.4,0.3 -0.51,0.85 -0.26,1.29 0.3,0.52 0.98,0.66 1.46,0.31A9.96,9.96 0,0 0,22 13c0,-5.91 -5.13,-10.62 -11.17,-9.93z"
         android:fillColor="#FFFFFFFF"/>
 </vector>
diff --git a/res/drawable/ic_zen.xml b/res/drawable/ic_zen.xml
index 17ecf21..8c50d5d 100644
--- a/res/drawable/ic_zen.xml
+++ b/res/drawable/ic_zen.xml
@@ -14,13 +14,13 @@
      limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
     android:height="24dp"
-    android:viewportHeight="48.0"
-    android:viewportWidth="48.0"
     android:width="24dp" >
 
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M24.0,4.0C12.95,4.0 4.0,12.95 4.0,24.0s8.95,20.0 20.0,20.0 20.0,-8.95 20.0,-20.0S35.05,4.0 24.0,4.0zm10.0,22.0L14.0,26.0l0.0,-4.0l20.0,0.0l0.0,4.0z" />
+        android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm4 11H8c-.55 0-1-.45-1-1s.45-1 1-1h8c.55 0 1 .45 1 1s-.45 1-1 1z" />
 
 </vector>
diff --git a/res/layout-land/choose_lock_pattern.xml b/res/layout-land/choose_lock_pattern.xml
index 0743577..8e78b05 100644
--- a/res/layout-land/choose_lock_pattern.xml
+++ b/res/layout-land/choose_lock_pattern.xml
@@ -138,10 +138,12 @@
         </LinearLayout>
 
         <!-- right side: lock pattern -->
-        <FrameLayout
+        <com.android.setupwizardlib.view.FillContentLayout
+            style="@style/LockPatternContainerStyle"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="1.0">
+            android:layout_weight="1.0"
+            android:paddingStart="0dp">
 
             <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
                 android:layout_width="match_parent"
@@ -149,7 +151,7 @@
                 android:layout_gravity="center"
                 android:background="@color/lock_pattern_background" />
 
-        </FrameLayout>
+        </com.android.setupwizardlib.view.FillContentLayout>
 
     </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
 
diff --git a/res/layout-land/confirm_lock_pattern_internal.xml b/res/layout-land/confirm_lock_pattern_internal.xml
index 4e58f32..952ab49 100644
--- a/res/layout-land/confirm_lock_pattern_internal.xml
+++ b/res/layout-land/confirm_lock_pattern_internal.xml
@@ -96,10 +96,12 @@
 
         </ScrollView>
 
-        <FrameLayout
+        <com.android.setupwizardlib.view.FillContentLayout
+            style="@style/LockPatternContainerStyle"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="1">
+            android:layout_weight="1"
+            android:paddingStart="0dp">
 
             <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
                 android:layout_width="match_parent"
@@ -107,7 +109,7 @@
                 android:layout_gravity="center"
                 android:background="@color/lock_pattern_background" />
 
-        </FrameLayout>
+        </com.android.setupwizardlib.view.FillContentLayout>
 
     </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 10fea84..9890e68 100644
--- a/res/layout-land/fingerprint_enroll_enrolling.xml
+++ b/res/layout-land/fingerprint_enroll_enrolling.xml
@@ -108,10 +108,18 @@
                 android:gravity="center"
                 android:orientation="vertical">
 
-                <include layout="@layout/fingerprint_enroll_enrolling_content"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"/>
+                <com.android.setupwizardlib.view.FillContentLayout
+                    android:layout_width="@dimen/fingerprint_progress_bar_max_size"
+                    android:layout_height="@dimen/fingerprint_progress_bar_max_size"
+                    android:paddingTop="0dp"
+                    android:paddingBottom="0dp"
+                    android:layout_marginVertical="24dp">
+
+                    <include layout="@layout/fingerprint_enroll_enrolling_content"
+                         android:layout_width="match_parent"
+                         android:layout_height="match_parent"
+                         android:layout_gravity="center" />
+                </com.android.setupwizardlib.view.FillContentLayout>
 
                 <TextView
                     style="@style/TextAppearance.FingerprintErrorText"
diff --git a/res/layout-sw320dp/settings_entity_header.xml b/res/layout-sw320dp/settings_entity_header.xml
new file mode 100644
index 0000000..951961c
--- /dev/null
+++ b/res/layout-sw320dp/settings_entity_header.xml
@@ -0,0 +1,115 @@
+<?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.
+  -->
+
+<!-- Entity header -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/entity_header"
+    style="@style/EntityHeader"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="24dp"
+    android:paddingBottom="24dp">
+
+    <LinearLayout
+        android:id="@+id/entity_header_content"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:background="?android:attr/selectableItemBackground"
+        android:orientation="horizontal"
+        android:paddingStart="56dp">
+
+        <ImageView
+            android:id="@+id/entity_header_icon"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:scaleType="fitCenter"
+            android:layout_gravity="center_horizontal"
+            android:antialias="true" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/entity_header_title"
+                style="@style/TextAppearance.EntityHeaderTitle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="false"
+                android:ellipsize="marquee"
+                android:gravity="start"
+                android:textDirection="locale"
+                android:paddingTop="8dp" />
+
+            <TextView
+                android:id="@+id/install_type"
+                android:visibility="gone"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="start"
+                android:singleLine="true"
+                android:ellipsize="marquee"
+                android:textAppearance="@android:style/TextAppearance.Material.Body1"
+                android:textColor="?android:attr/textColorSecondary" />
+
+            <TextView
+                android:id="@+id/entity_header_summary"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="start"
+                android:singleLine="true"
+                android:ellipsize="marquee"
+                android:textAppearance="@android:style/TextAppearance.Material.Body1"
+                android:textColor="?android:attr/textColorSecondary" />
+
+        </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/entity_header_links"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <ImageButton
+            android:id="@android:id/button1"
+            style="?android:attr/actionOverflowButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_weight="1"
+            android:layout_height="0dp"
+            android:minWidth="@dimen/min_tap_target_size"
+            android:src="@null"
+            android:tint="?android:attr/colorAccent" />
+
+        <ImageButton
+            android:id="@android:id/button2"
+            style="?android:attr/actionOverflowButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_weight="1"
+            android:layout_height="0dp"
+            android:minWidth="@dimen/min_tap_target_size"
+            android:src="@null"
+            android:tint="?android:attr/colorAccent" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/app_action_buttons.xml b/res/layout/app_action_buttons.xml
index 5b00205..e12fa23 100644
--- a/res/layout/app_action_buttons.xml
+++ b/res/layout/app_action_buttons.xml
@@ -19,8 +19,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:gravity="bottom"
-    android:paddingTop="4dp"
+    android:gravity="center"
+    android:paddingTop="8dp"
     android:paddingStart="8dp"
     android:paddingEnd="8dp"
     android:orientation="horizontal">
@@ -31,8 +31,7 @@
         android:layout_width="0dp"
         android:layout_weight="1"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:paddingEnd="8dp"/>
+        android:layout_marginBottom="4dp" />
 
     <Button
         android:id="@+id/right_button"
@@ -40,7 +39,6 @@
         android:layout_width="0dp"
         android:layout_weight="1"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:paddingStart="8dp"/>
+        android:layout_marginBottom="4dp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/app_preference_item.xml b/res/layout/app_preference_item.xml
index 2f722a1..f13ced7 100755
--- a/res/layout/app_preference_item.xml
+++ b/res/layout/app_preference_item.xml
@@ -16,19 +16,31 @@
 ** limitations under the License.
 */
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    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="wrap_content"
+    android:clipToPadding="false"
     android:minHeight="?android:attr/listPreferredItemHeight"
-    android:padding="6dip">
-    <ImageView
-        android:id="@android:id/icon"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+    <FrameLayout
+        android:id="@+id/icon_frame"
+        style="@style/preference_icon_frame"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:adjustViewBounds="true"
-        android:padding="6dip"
-        android:duplicateParentState="true"
-        />
+        android:layout_height="wrap_content"
+        android:gravity="start|center_vertical"
+        android:paddingEnd="12dp"
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp">
+        <android.support.v7.internal.widget.PreferenceImageView
+            android:id="@android:id/icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            settings:maxWidth="48dp"
+            settings:maxHeight="48dp" />
+    </FrameLayout>
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/res/layout/choose_lock_password.xml b/res/layout/choose_lock_password.xml
index 7ce3034..f1b631e 100644
--- a/res/layout/choose_lock_password.xml
+++ b/res/layout/choose_lock_password.xml
@@ -21,7 +21,7 @@
     android:layout_height="match_parent"
     android:icon="@drawable/ic_lock"
     settings:suwFooter="@layout/choose_lock_password_footer"
-    settings:suwHeaderText="@string/lockpassword_choose_your_password_header">
+    settings:suwHeaderText="@string/lockpassword_choose_your_screen_lock_header">
 
     <LinearLayout
         style="@style/SuwContentFrame"
@@ -33,11 +33,11 @@
         android:orientation="vertical">
 
         <TextView
-            android:id="@+id/fingerprint_backup_message"
+            android:id="@+id/message"
             style="@style/SuwDescription.Glif"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:visibility="gone" />
+            android:minLines="2"/>
 
         <LinearLayout
             android:id="@+id/password_container"
diff --git a/res/layout/choose_lock_password_footer.xml b/res/layout/choose_lock_password_footer.xml
index 323a884..41306e9 100644
--- a/res/layout/choose_lock_password_footer.xml
+++ b/res/layout/choose_lock_password_footer.xml
@@ -28,6 +28,15 @@
         android:layout_height="wrap_content"
         android:text="@string/lockpassword_cancel_label" />
 
+
+    <!-- left : clear -->
+    <Button android:id="@+id/clear_button"
+        style="@style/SuwGlifButton.Secondary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:text="@string/lockpassword_clear_label" />
+
     <Space
         android:layout_width="0dp"
         android:layout_height="0dp"
diff --git a/res/layout/choose_lock_pattern_common.xml b/res/layout/choose_lock_pattern_common.xml
index 3ea960d..7dca27d 100644
--- a/res/layout/choose_lock_pattern_common.xml
+++ b/res/layout/choose_lock_pattern_common.xml
@@ -64,19 +64,31 @@
             android:gravity="center"
             android:clipChildren="false"
             android:clipToPadding="false"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingLeft="0dp"
+            android:paddingRight="0dp">
 
             <TextView android:id="@+id/headerText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:minLines="2"
                 android:gravity="center"
+                android:paddingHorizontal="?attr/suwMarginSides"
                 android:textSize="18sp" />
 
-            <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-                android:layout_width="match_parent"
-                android:layout_height="0dip"
-                android:layout_weight="1" />
+            <com.android.setupwizardlib.view.FillContentLayout
+                style="@style/LockPatternContainerStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1">
+
+                <com.android.internal.widget.LockPatternView
+                    android:id="@+id/lockPattern"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center" />
+
+            </com.android.setupwizardlib.view.FillContentLayout>
 
         </LinearLayout>
 
diff --git a/res/layout/confirm_lock_password_internal.xml b/res/layout/confirm_lock_password_internal.xml
index 558522c..05bd4a0 100644
--- a/res/layout/confirm_lock_password_internal.xml
+++ b/res/layout/confirm_lock_password_internal.xml
@@ -81,10 +81,14 @@
             android:visibility="gone"/>
 
         <Button
-            style="@style/SetupWizardButton.Negative"
             android:id="@+id/cancelButton"
+            style="@style/SuwGlifButton.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="?attr/suwMarginSides"
+            android:layout_marginEnd="?attr/suwMarginSides"
+            android:layout_marginBottom="80dp"
+            android:layout_gravity="center_horizontal"
             android:text="@string/cancel" />
 
     </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
diff --git a/res/layout/confirm_lock_pattern_internal_base.xml b/res/layout/confirm_lock_pattern_internal_base.xml
index 758fc0d..2b09a7e 100644
--- a/res/layout/confirm_lock_pattern_internal_base.xml
+++ b/res/layout/confirm_lock_pattern_internal_base.xml
@@ -56,42 +56,61 @@
 
         </LinearLayout>
 
-        <com.android.internal.widget.LockPatternView
-            android:id="@+id/lockPattern"
+        <LinearLayout
+            style="@style/SuwContentFrame"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="4"
-            android:layout_gravity="center_horizontal"/>
-
-        <TextView
-            style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
-            android:accessibilityLiveRegion="polite"
-            android:id="@+id/errorText"
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="12dp"
-            android:layout_marginStart="12dp"
-            android:layout_marginEnd="12dp"
-            android:gravity="center_vertical"/>
+            android:orientation="vertical"
+            android:gravity="center"
+            android:paddingLeft="0dp"
+            android:paddingRight="0dp">
 
-        <ImageView
-            android:id="@+id/fingerprintIcon"
-            android:layout_gravity="center_horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="24dp"
-            android:contentDescription="@string/confirm_fingerprint_icon_content_description"
-            android:visibility="gone"/>
+            <com.android.setupwizardlib.view.FillContentLayout
+                style="@style/LockPatternContainerStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1">
 
-        <Button
-            android:id="@+id/cancelButton"
-            style="@style/SuwGlifButton.Secondary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="?attr/suwMarginSides"
-            android:layout_marginEnd="?attr/suwMarginSides"
-            android:text="@string/cancel" />
+                <com.android.internal.widget.LockPatternView
+                    android:id="@+id/lockPattern"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center" />
+
+            </com.android.setupwizardlib.view.FillContentLayout>
+
+            <TextView
+                style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
+                android:accessibilityLiveRegion="polite"
+                android:id="@+id/errorText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginHorizontal="?attr/suwMarginSides"
+                android:layout_marginTop="12dp"
+                android:gravity="center_vertical"/>
+
+            <ImageView
+                android:id="@+id/fingerprintIcon"
+                android:layout_gravity="center_horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="?attr/suwMarginSides"
+                android:layout_marginBottom="24dp"
+                android:contentDescription="@string/confirm_fingerprint_icon_content_description"
+                android:visibility="gone"/>
+
+            <Button
+                android:id="@+id/cancelButton"
+                style="@style/SuwGlifButton.Secondary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="?attr/suwMarginSides"
+                android:layout_marginEnd="?attr/suwMarginSides"
+                android:layout_marginBottom="80dp"
+                android:text="@string/cancel" />
+
+        </LinearLayout>
 
     </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
 
diff --git a/res/layout/dashboard_category.xml b/res/layout/dashboard_category.xml
deleted file mode 100644
index 1314c16..0000000
--- a/res/layout/dashboard_category.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/category"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/dashboard_category_height"
-    android:orientation="vertical"
-    android:paddingBottom="8dip">
-
-    <TextView android:id="@android:id/title"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingStart="@dimen/dashboard_category_title_margin_start"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:gravity="center_vertical"
-        android:textAppearance="@style/TextAppearance.CategoryTitle"
-        android:textAlignment="viewStart"
-        />
-
-</LinearLayout>
diff --git a/res/layout/data_plans_sync_time_preference.xml b/res/layout/data_plans_sync_time_preference.xml
new file mode 100644
index 0000000..bb9da90
--- /dev/null
+++ b/res/layout/data_plans_sync_time_preference.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2017 The Android Open Source Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at"+
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Shows the data plans sync time -->
+<TextView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@android:id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="@dimen/preference_no_icon_padding_start"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:gravity="end"
+        android:textColor="?android:attr/textColorSecondary"/>
diff --git a/res/layout/data_usage_bytes_editor.xml b/res/layout/data_usage_bytes_editor.xml
index 2878c3e..af2d59b 100644
--- a/res/layout/data_usage_bytes_editor.xml
+++ b/res/layout/data_usage_bytes_editor.xml
@@ -37,7 +37,6 @@
         android:id="@+id/size_spinner"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:entries="@array/bytes_picker_sizes" />
+        android:layout_gravity="center_vertical" />
 
 </LinearLayout>
diff --git a/res/layout/data_usage_spinner_item.xml b/res/layout/data_usage_spinner_item.xml
new file mode 100644
index 0000000..1706edf
--- /dev/null
+++ b/res/layout/data_usage_spinner_item.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Copied from frameworks/base/core/res/res/layout/simple_spinner_item.xml and modified
+     layout height and added padding. -->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+          android:id="@android:id/text1"
+          style="?android:attr/spinnerItemStyle"
+          android:singleLine="true"
+          android:layout_width="match_parent"
+          android:layout_height="?android:attr/listPreferredItemHeightSmall"
+          android:ellipsize="marquee"
+          android:textAlignment="inherit"
+          android:gravity="center"
+          android:paddingStart="30dp"
+          android:paddingEnd="30dp"/>
\ No newline at end of file
diff --git a/res/layout/fingerprint_enroll_enrolling_base.xml b/res/layout/fingerprint_enroll_enrolling_base.xml
index 60ca601..00a452c 100644
--- a/res/layout/fingerprint_enroll_enrolling_base.xml
+++ b/res/layout/fingerprint_enroll_enrolling_base.xml
@@ -64,11 +64,18 @@
             android:gravity="center"
             android:orientation="vertical">
 
-            <include layout="@layout/fingerprint_enroll_enrolling_content"
+            <com.android.setupwizardlib.view.FillContentLayout
                 android:layout_width="@dimen/fingerprint_progress_bar_max_size"
                 android:layout_height="@dimen/fingerprint_progress_bar_max_size"
-                android:layout_gravity="center"
-                android:layout_marginVertical="24dp"/>
+                android:paddingTop="0dp"
+                android:paddingBottom="0dp"
+                android:layout_marginVertical="24dp">
+
+                <include layout="@layout/fingerprint_enroll_enrolling_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center" />
+            </com.android.setupwizardlib.view.FillContentLayout>
 
             <TextView
                 style="@style/TextAppearance.FingerprintErrorText"
diff --git a/res/layout/fingerprint_enroll_enrolling_content.xml b/res/layout/fingerprint_enroll_enrolling_content.xml
index 1622f3f..b7abdec 100644
--- a/res/layout/fingerprint_enroll_enrolling_content.xml
+++ b/res/layout/fingerprint_enroll_enrolling_content.xml
@@ -18,8 +18,8 @@
 <com.android.settings.widget.RingProgressBar
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/fingerprint_progress_bar"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="@drawable/fp_illustration"
     android:minHeight="@dimen/fingerprint_progress_bar_min_size"
     android:progress="0" />
diff --git a/res/layout/fingerprint_enroll_finish_base.xml b/res/layout/fingerprint_enroll_finish_base.xml
index ba3d07f..cf9f759 100644
--- a/res/layout/fingerprint_enroll_finish_base.xml
+++ b/res/layout/fingerprint_enroll_finish_base.xml
@@ -41,22 +41,40 @@
             android:minLines="3"
             android:text="@string/security_settings_fingerprint_enroll_finish_message"/>
 
-        <com.android.setupwizardlib.view.FillContentLayout
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
             android:layout_weight="1"
-            android:maxWidth="@dimen/fingerprint_finish_max_size"
-            android:maxHeight="@dimen/fingerprint_finish_max_size">
+            android:gravity="center"
+            android:orientation="vertical">
 
-            <ImageView
-                android:id="@+id/fingerprint_in_app_indicator"
-                style="@style/SuwContentIllustration"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:contentDescription="@android:string/fingerprint_icon_content_description"
-                android:src="@drawable/fp_app_indicator" />
+            <com.android.setupwizardlib.view.FillContentLayout
+                android:layout_width="@dimen/fingerprint_progress_bar_max_size"
+                android:layout_height="@dimen/fingerprint_progress_bar_max_size"
+                android:layout_marginVertical="24dp"
+                android:paddingTop="0dp"
+                android:paddingBottom="0dp"
+                android:gravity="center|center_horizontal">
 
-        </com.android.setupwizardlib.view.FillContentLayout>
+                <ImageView
+                    android:id="@+id/fingerprint_in_app_indicator"
+                    style="@style/SuwContentIllustration"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:padding="7dp"
+                    android:contentDescription="@android:string/fingerprint_icon_content_description"
+                    android:src="@drawable/fp_app_indicator" />
+            </com.android.setupwizardlib.view.FillContentLayout>
+
+            <!-- Added to align elements with fingerprint_enroll_enrolling_base -->
+            <TextView
+                style="@style/TextAppearance.FingerprintErrorText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal|bottom"
+                android:visibility="invisible" />
+
+        </LinearLayout>
 
     </LinearLayout>
 
diff --git a/res/layout/fingerprint_enroll_introduction.xml b/res/layout/fingerprint_enroll_introduction.xml
index 4f73395..4228f42 100644
--- a/res/layout/fingerprint_enroll_introduction.xml
+++ b/res/layout/fingerprint_enroll_introduction.xml
@@ -45,6 +45,20 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
+        <com.android.setupwizardlib.view.FillContentLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <ImageView
+                style="@style/SuwContentIllustration"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:contentDescription="@null"
+                android:src="@drawable/fingerprint_enroll_introduction" />
+
+        </com.android.setupwizardlib.view.FillContentLayout>
+
     </LinearLayout>
 
 </com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout/manage_data_plans_preference.xml b/res/layout/manage_data_plans_preference.xml
new file mode 100644
index 0000000..1686d3f
--- /dev/null
+++ b/res/layout/manage_data_plans_preference.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2017 The Android Open Source Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at"+
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<FrameLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="@dimen/preference_no_icon_padding_start"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingTop="8dp"
+        android:paddingBottom="16dp">
+    <Button
+            android:id="@+id/manage_data_plans"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/data_plan_usage_manage_plans_button_text"
+            android:textAllCaps="true"
+            style="@style/AppActionPrimaryButton" />
+</FrameLayout>
diff --git a/res/layout/nfc_payment_how_it_works.xml b/res/layout/nfc_payment_how_it_works.xml
index 565a16b..87a0095 100644
--- a/res/layout/nfc_payment_how_it_works.xml
+++ b/res/layout/nfc_payment_how_it_works.xml
@@ -15,44 +15,52 @@
             android:background="#FFB2DFDB" >
         </LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/nfc_how_it_works_image_text"
+        <ScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:paddingTop="72dp"
-            android:orientation="vertical">
+            android:paddingBottom="48dp"
+            android:fillViewport="true">
 
-          <ImageView
-              android:id="@+id/nfc_how_it_works_image"
-              android:layout_width="match_parent"
-              android:layout_height="188dp"
-              android:gravity="center"
-              android:src="@drawable/nfc_how_it_works" />
+            <LinearLayout
+                android:id="@+id/nfc_how_it_works_image_text"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
+                android:paddingTop="72dp"
+                android:orientation="vertical">
 
-          <TextView
-              android:id="@+id/nfc_how_it_works_title"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:text="@string/nfc_how_it_works_title"
-              android:paddingLeft="16dp"
-              android:paddingRight="16dp"
-              android:textColor="#FF263238"
-              android:textSize="24sp" />
+                <ImageView
+                    android:id="@+id/nfc_how_it_works_image"
+                    android:layout_width="match_parent"
+                    android:layout_height="188dp"
+                    android:gravity="center"
+                    android:src="@drawable/nfc_how_it_works" />
 
-          <TextView
-              android:id="@+id/nfc_how_it_works_content"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:paddingTop="10dp"
-              android:paddingBottom="18dp"
-              android:paddingLeft="16dp"
-              android:paddingRight="16dp"
-              android:text="@string/nfc_how_it_works_content"
-              android:textColor="#FF263238"
-              android:textSize="16sp" />
-        </LinearLayout>
+                <TextView
+                    android:id="@+id/nfc_how_it_works_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/nfc_how_it_works_title"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="16dp"
+                    android:textColor="#FF263238"
+                    android:textSize="24sp" />
+
+                <TextView
+                    android:id="@+id/nfc_how_it_works_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="18dp"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="16dp"
+                    android:text="@string/nfc_how_it_works_content"
+                    android:textColor="#FF263238"
+                    android:textSize="16sp" />
+            </LinearLayout>
+        </ScrollView>
+
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="48dp"
diff --git a/res/layout/preference_category_material_settings.xml b/res/layout/preference_category_material_settings.xml
deleted file mode 100644
index 3334bbb..0000000
--- a/res/layout/preference_category_material_settings.xml
+++ /dev/null
@@ -1,67 +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.
-  -->
-
-<!-- Based off frameworks/base/core/res/res/layout/preference_category_material.xml
-     except that this supports icon -->
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="8dp"
-    android:layout_marginBottom="8dp"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart" >
-
-    <LinearLayout
-        android:id="@+id/icon_container"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="start|center_vertical"
-        android:orientation="horizontal">
-        <com.android.internal.widget.PreferenceImageView
-            android:id="@android:id/icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:tint="?android:attr/textColorPrimary"
-            android:maxWidth="18dp"
-            android:maxHeight="18dp"/>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="56dp"
-        android:orientation="vertical">
-        <TextView
-            android:id="@android:id/title"
-            android:layout_marginTop="16dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="@android:style/TextAppearance.Material.Body2"
-            android:textAlignment="viewStart"
-            android:textColor="?android:attr/colorAccent"
-            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"/>
-        <TextView
-            android:id="@android:id/summary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-            android:textColor="?android:attr/textColorSecondary"
-            android:ellipsize="end"
-            android:singleLine="true" />
-    </LinearLayout>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/preference_dropdown_material_settings.xml b/res/layout/preference_dropdown_material_settings.xml
index 22f98b6..a3f5ab9 100644
--- a/res/layout/preference_dropdown_material_settings.xml
+++ b/res/layout/preference_dropdown_material_settings.xml
@@ -30,6 +30,6 @@
         android:layout_marginStart="@dimen/preference_no_icon_padding_start"
         android:visibility="invisible" />
 
-    <include layout="@layout/preference_material_settings"/>
+    <include layout="@layout/preference_material"/>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/preference_material_settings.xml b/res/layout/preference_material_settings.xml
deleted file mode 100644
index e2ab3bb..0000000
--- a/res/layout/preference_material_settings.xml
+++ /dev/null
@@ -1,86 +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.
--->
-
-<!-- Based off frameworks/base/core/res/res/layout/preference_material.xml
-     except that this has the negative margin on the image removed. -->
-<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:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:background="?android:attr/selectableItemBackground"
-    android:clipToPadding="false">
-
-    <LinearLayout
-        android:id="@+id/icon_frame"
-        style="@style/preference_icon_frame"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="start|center_vertical"
-        android:orientation="horizontal"
-        android:paddingEnd="12dp"
-        android:paddingTop="4dp"
-        android:paddingBottom="4dp">
-        <com.android.internal.widget.PreferenceImageView
-            android:id="@android:id/icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxWidth="48dp"
-            android:maxHeight="48dp"/>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:paddingTop="12dp"
-        android:paddingBottom="12dp">
-
-        <TextView
-            android:id="@android:id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minHeight="24dp"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceListItem"
-            android:ellipsize="marquee"/>
-
-        <TextView
-            android:id="@android:id/summary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minHeight="24dp"
-            android:layout_below="@android:id/title"
-            android:layout_alignStart="@android:id/title"
-            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-            android:textColor="?android:attr/textColorSecondary"
-            android:maxLines="10"/>
-
-    </RelativeLayout>
-
-    <!-- Preference should place its actual preference widget here. -->
-    <LinearLayout
-        android:id="@android:id/widget_frame"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:gravity="end|center_vertical"
-        android:paddingStart="16dp"
-        android:orientation="vertical"/>
-
-</LinearLayout>
diff --git a/res/layout/preference_widget_delete.xml b/res/layout/preference_widget_delete.xml
new file mode 100644
index 0000000..b62946c
--- /dev/null
+++ b/res/layout/preference_widget_delete.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<!-- Settings button -->
+<ImageView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/delete_button"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center"
+    android:paddingStart="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:background="?android:attr/selectableItemBackground"
+    android:scaleType="center"
+    android:src="@drawable/ic_delete"
+    android:contentDescription="@string/delete" />
\ No newline at end of file
diff --git a/res/layout/radio_info.xml b/res/layout/radio_info.xml
index e7d08cc..502505c 100644
--- a/res/layout/radio_info.xml
+++ b/res/layout/radio_info.xml
@@ -37,6 +37,12 @@
             <TextView android:id="@+id/number" style="@style/info_value" />
         </LinearLayout>
 
+        <!-- IMSI -->
+        <LinearLayout style="@style/entry_layout">
+            <TextView android:text="@string/radio_info_imsi_label" style="@style/info_label" />
+            <TextView android:id="@+id/imsi" style="@style/info_value" />
+        </LinearLayout>
+
         <!-- Network Identifier -->
         <LinearLayout style="@style/entry_layout">
             <TextView android:text="@string/radio_info_current_network_label" style="@style/info_label" />
diff --git a/res/layout/restricted_preference_dropdown.xml b/res/layout/restricted_preference_dropdown.xml
index c93a007..86053bf 100644
--- a/res/layout/restricted_preference_dropdown.xml
+++ b/res/layout/restricted_preference_dropdown.xml
@@ -26,6 +26,6 @@
             android:visibility="invisible"
             android:layout_marginStart="@dimen/preference_no_icon_padding_start"/>
 
-    <include layout="@layout/preference_material_settings" />
+    <include layout="@layout/preference_material" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/search_saved_query_item.xml b/res/layout/search_saved_query_item.xml
index 50001a5..f8c239a 100644
--- a/res/layout/search_saved_query_item.xml
+++ b/res/layout/search_saved_query_item.xml
@@ -20,28 +20,25 @@
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:background="?android:attr/selectableItemBackground"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical">
 
+    <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"
+        android:layout_marginEnd="@dimen/dashboard_tile_image_margin"
+        android:src="@drawable/ic_restore" />
+
     <TextView
         android:id="@android:id/title"
         android:layout_height="match_parent"
-        android:layout_width="wrap_content"
-        android:layout_weight="1"
-        android:text="test"
+        android:layout_width="match_parent"
         android:gravity="center_vertical"
-        android:background="?android:attr/selectableItemBackground"
-        android:paddingStart="@dimen/preference_no_icon_padding_start"
         android:textAppearance="?android:attr/textAppearanceListItem" />
 
-    <ImageView
-        android:id="@android:id/icon"
-        android:background="?android:attr/selectableItemBackground"
-        android:layout_width="@dimen/dashboard_category_height"
-        android:layout_height="@dimen/dashboard_category_height"
-        android:paddingStart="@dimen/search_suggestion_item_image_margin_start"
-        android:paddingEnd="@dimen/search_suggestion_item_image_margin_end"
-        android:scaleType="center"
-        android:src="@drawable/ic_cross_grey_24dp" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/search_suggestion_item.xml b/res/layout/search_suggestion_item.xml
deleted file mode 100644
index 85a3381..0000000
--- a/res/layout/search_suggestion_item.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:minHeight="?android:attr/listPreferredItemHeight"
-              android:gravity="center_vertical">
-
-    <RelativeLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-
-        <TextView android:id="@+id/title"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:layout_marginStart="@dimen/search_title_padding_start"
-                  android:singleLine="true"
-                  android:textAppearance="?android:attr/textAppearanceMedium"
-                  android:ellipsize="marquee"
-                  android:fadingEdge="horizontal" />
-
-    </RelativeLayout>
-
-    <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:minWidth="@*android:dimen/preference_icon_minWidth"
-            android:orientation="horizontal">
-
-        <ImageView
-                android:id="@+id/icon"
-                android:layout_width="@dimen/search_suggestion_item_image_size"
-                android:layout_height="@dimen/search_suggestion_item_image_size"
-                android:scaleType="centerInside"
-                android:src="@drawable/ic_search_history"
-                android:layout_marginStart="@dimen/search_suggestion_item_image_margin_start"
-                android:layout_marginEnd="@dimen/search_suggestion_item_image_margin_end"
-                />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/res/layout/settings_data_plan_summary_preference.xml b/res/layout/settings_data_plan_summary_preference.xml
new file mode 100644
index 0000000..e887474
--- /dev/null
+++ b/res/layout/settings_data_plan_summary_preference.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2017 The Android Open Source Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at"+
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+        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="wrap_content"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:paddingStart="@dimen/preference_no_icon_padding_start"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:orientation="horizontal">
+
+    <!-- Shows the data plan usage in chart -->
+    <com.android.settings.widget.DonutView
+            android:id="@+id/donut"
+            android:layout_width="72dp"
+            android:layout_height="72dp"
+            android:layout_marginEnd="8dp"
+            android:layout_gravity="center"
+            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+            android:gravity="end|center_vertical"
+            settings:applyColorAccent="false"
+            settings:showPercentString="false"
+            settings:thickness="6dp"/>
+
+    <LinearLayout
+            android:id="@+id/data_plan_row"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="2dp"
+            android:orientation="vertical">
+
+        <!-- Shows the data plan usage -->
+        <TextView
+                android:id="@android:id/title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="0dp"
+                android:paddingTop="0dp"
+                android:fontFamily="@*android:string/config_headlineFontFamily"
+                android:textAppearance="@android:style/TextAppearance.Material.Title"/>
+
+        <!-- Shows the data plan name -->
+        <TextView
+                android:id="@android:id/text1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingBottom="5dp"
+                android:maxLines="3"
+                android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+                android:textColor="?android:attr/textColorSecondary"/>
+
+        <!-- Shows the data plan description -->
+        <TextView
+                android:id="@android:id/text2"
+                android:textStyle="italic"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxLines="5"
+                android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+                android:textColor="?android:attr/textColorSecondary"/>
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/layout/settings_entity_header.xml b/res/layout/settings_entity_header.xml
index 9c4ca93..2660ef0 100644
--- a/res/layout/settings_entity_header.xml
+++ b/res/layout/settings_entity_header.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2016 The Android Open Source Project
+  Copyright (C) 2017 The Android Open Source Project
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -16,63 +16,33 @@
   -->
 
 <!-- Entity header -->
-<RelativeLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/entity_header"
     style="@style/EntityHeader"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="0dp"
+    android:paddingStart="@dimen/preference_no_icon_padding_start"
     android:paddingTop="24dp"
-    android:paddingBottom="24dp">
-
-    <ImageView
-        android:id="@+id/entity_header_icon"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:scaleType="fitXY"
-        android:layout_gravity="center_horizontal"
-        android:antialias="true" />
+    android:paddingBottom="32dp"
+    android:orientation="horizontal">
 
     <LinearLayout
-        android:id="@+id/entity_header_links"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_alignParentEnd="true"
-        android:orientation="vertical">
-
-        <ImageButton
-            android:id="@android:id/button1"
-            style="?android:attr/actionOverflowButtonStyle"
-            android:layout_width="wrap_content"
-            android:layout_weight="1"
-            android:layout_height="0dp"
-            android:minWidth="@dimen/min_tap_target_size"
-            android:src="@drawable/ic_settings_24dp"
-            android:tint="?android:attr/colorAccent" />
-
-        <ImageButton
-            android:id="@android:id/button2"
-            style="?android:attr/actionOverflowButtonStyle"
-            android:layout_width="wrap_content"
-            android:layout_weight="1"
-            android:layout_height="0dp"
-            android:minWidth="@dimen/min_tap_target_size"
-            android:src="@null"
-            android:tint="?android:attr/colorAccent" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
+        android:id="@+id/entity_header_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_toEndOf="@id/entity_header_icon"
-        android:layout_toStartOf="@id/entity_header_links"
-        android:paddingStart="24dp"
-        android:paddingEnd="24dp"
+        android:layout_weight="1"
+        android:background="?android:attr/selectableItemBackground"
         android:orientation="vertical">
 
+        <ImageView
+            android:id="@+id/entity_header_icon"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginBottom="16dp"
+            android:scaleType="fitXY"
+            android:antialias="true" />
+
         <TextView
             android:id="@+id/entity_header_title"
             style="@style/TextAppearance.EntityHeaderTitle"
@@ -81,8 +51,7 @@
             android:singleLine="false"
             android:ellipsize="marquee"
             android:gravity="start"
-            android:textDirection="locale"
-            android:paddingTop="8dp" />
+            android:textDirection="locale" />
 
         <TextView
             android:id="@+id/install_type"
@@ -108,4 +77,32 @@
 
     </LinearLayout>
 
-</RelativeLayout>
+    <LinearLayout
+        android:id="@+id/entity_header_links"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <ImageButton
+            android:id="@android:id/button1"
+            style="?android:attr/actionOverflowButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_weight="1"
+            android:layout_height="0dp"
+            android:minWidth="@dimen/min_tap_target_size"
+            android:src="@null"
+            android:tint="?android:attr/colorAccent" />
+
+        <ImageButton
+            android:id="@android:id/button2"
+            style="?android:attr/actionOverflowButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_weight="1"
+            android:layout_height="0dp"
+            android:minWidth="@dimen/min_tap_target_size"
+            android:src="@null"
+            android:tint="?android:attr/colorAccent" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/setup_choose_lock_generic_fingerprint_header.xml b/res/layout/setup_choose_lock_generic_fingerprint_header.xml
index 4c696f3..ec5d750 100644
--- a/res/layout/setup_choose_lock_generic_fingerprint_header.xml
+++ b/res/layout/setup_choose_lock_generic_fingerprint_header.xml
@@ -23,4 +23,4 @@
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:paddingTop="@dimen/suw_description_glif_margin_top"
     android:paddingBottom="@dimen/suw_description_glif_margin_bottom_lists"
-    android:text="@string/setup_lock_settings_picker_fingerprint_message" />
+    android:text="@string/lock_settings_picker_fingerprint_added_security_message" />
diff --git a/res/layout/usb_dialog_container.xml b/res/layout/usb_dialog_container.xml
index e145911..bc6399f 100644
--- a/res/layout/usb_dialog_container.xml
+++ b/res/layout/usb_dialog_container.xml
@@ -25,6 +25,7 @@
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingTop="20dp"
         android:orientation="vertical" />
 
 </ScrollView>
diff --git a/res/layout/wifi_network_details_two_buttons_panel.xml b/res/layout/wifi_network_details_two_buttons_panel.xml
index 6abfac3..f076eeaf 100644
--- a/res/layout/wifi_network_details_two_buttons_panel.xml
+++ b/res/layout/wifi_network_details_two_buttons_panel.xml
@@ -23,28 +23,23 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="bottom"
-        android:paddingTop="4dip"
-        android:orientation="horizontal">
+        android:paddingTop="4dp"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp">
         <Button
+            style="@android:style/@Widget.Material.Button.Colored"
             android:id="@+id/forget_button"
-            android:layout_width="120dip"
-            android:layout_weight="0.4"
+            android:text="@string/forget"
+            android:layout_width="0dp"
+            android:layout_weight="1"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"/>
-        <!-- Spacer -->
-        <View
-            android:id="@+id/buttons_spacer_left"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:visibility="invisible"
-            android:layout_weight="0.2" />
+            android:layout_gravity="center"/>
         <Button
             style="@android:style/Widget.Material.Button.Colored"
             android:id="@+id/signin_button"
-            android:layout_width="120dip"
-            android:text="@string/cancel"
-            android:layout_weight="0.4"
+            android:text="@string/support_sign_in_button_text"
+            android:layout_width="0dp"
+            android:layout_weight="1"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"/>
+            android:layout_gravity="center"/>
 </LinearLayout>
diff --git a/res/layout/wifi_progress_header.xml b/res/layout/wifi_progress_header.xml
index 05518ae..3f5d428 100644
--- a/res/layout/wifi_progress_header.xml
+++ b/res/layout/wifi_progress_header.xml
@@ -15,8 +15,20 @@
     limitations under the License.
 -->
 
-<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/TrimmedHorizontalProgressBar"
+<FrameLayout
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:indeterminate="true" />
+    android:layout_height="3dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <View
+        android:id="@+id/progress_bar_background"
+        style="@style/TrimmedHorizontalProgressBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?android:attr/colorSecondary" />
+    <ProgressBar
+        android:id="@+id/progress_bar_animation"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/TrimmedHorizontalProgressBar"
+        android:indeterminate="true" />
+</FrameLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 57f8e34..dd21c78 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s wil toegang tot jou boodskappe verkry. Gee toegang aan %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM-toegangversoek"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> wil toegang hê tot jou SIM-kaart. As jy toegang tot jou SIM-kaart verleen, sal die dataverbinding op jou toestel vir die duur van die verbinding gedeaktiveer wees. Verleen toegang aan <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Vir ander toestelle sigbaar as \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\'"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Vir ander toestelle sigbaar as \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\""</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Jou toestelle"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Bind nuwe toestel saam"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum en tyd"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Volgende"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Slaan vingerafdruk oor?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Vingerafdrukopstelling neem net \'n minuut of twee. As jy dit oorslaan, kan jy jou vingerafdruk later in instellings byvoeg."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Slaan skermslot oor?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Toestelbeskermingkenmerke sal nie aangeskakel word nie. Jy sal nie ander mense kan keer om hierdie tablet te gebruik as dit verloor, gesteel of teruggestel word nie."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Toestelbeskermingkenmerke sal nie aangeskakel word nie. Jy sal nie ander mense kan keer om hierdie toestel te gebruik as dit verloor, gesteel of teruggestel word nie."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Toestelbeskermingkenmerke sal nie aangeskakel word nie. Jy sal nie ander mense kan keer om hierdie te foon gebruik as dit verloor, gesteel of teruggestel word nie."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Jy het die maksimum aantal vingerafdrukke bygevoeg"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Kan nie nog vingerafdrukke byvoeg nie"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Verwyder alle vingerafdrukke?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Verwyder \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\""</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Wil jy hierdie vingerafdruk uitvee?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Jy sal nie jou vingerafdrukke kan gebruik om jou foon te ontsluit, aankope te magtig of daarmee by programme aan te meld nie"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Jy sal nie jou vingerafdrukke kan gebruik om jou werkprofiel te ontsluit, aankope te magtig of by werkprogramme aan te meld nie"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Ja, verwyder"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Beskerm jou tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Beskerm jou toestel"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Beskerm jou foon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Stel \'n rugsteunskermslot op vir bykomende sekuriteit."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Stel \'n rugsteunskermslot op vir bykomende sekuriteit."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Keer ander mense om hierdie tablet sonder jou toestemming te gebruik deur kenmerke vir toestelbeskerming te aktiveer. Kies die skermslot wat jy wil gebruik."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Keer ander mense om hierdie toestel sonder jou toestemming te gebruik deur kenmerke vir toestelbeskerming te aktiveer. Kies die skermslot wat jy wil gebruik."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Keer ander mense om hierdie foon sonder jou toestemming te gebruik deur kenmerke vir toestelbeskerming te aktiveer. Kies die skermslot wat jy wil gebruik."</string>
@@ -497,37 +502,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Verwyder toestelbeskerming?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Verwyder profielbeskerming?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Toestelbeskermingkenmerke sal nie sonder jou patroon werk nie."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Toestelbeskermingkenmerke sal nie sonder jou patroon werk nie.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Toestelbeskermingkenmerke sal nie sonder jou patroon werk nie.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Jou gestoorde vingerafdrukke sal ook van hierdie toestel af verwyder word, en jy sal nie met hulle jou foon kan ontsluit, aankope kan magtig, of by programme kan aanmeld nie.\""</string>
+</xliff:g>Jou gestoorde vingerafdrukke sal ook van hierdie toestel af verwyder word, en jy sal nie met hulle jou foon kan ontsluit, aankope kan magtig, en by programme kan aanmeld nie."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Toestelbeskermingkenmerke sal nie sonder jou PIN werk nie."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Toestelbeskermingkenmerke sal nie sonder jou PIN werk nie.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Toestelbeskermingkenmerke sal nie sonder jou PIN werk nie.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Jou gestoorde vingerafdrukke sal ook van hierdie toestel af verwyder word, en jy sal nie met hulle jou foon kan ontsluit, aankope kan magtig, of by programme kan aanmeld nie.\""</string>
+</xliff:g>Jou gestoorde vingerafdrukke sal ook van hierdie toestel af verwyder word, en jy sal nie met hulle jou foon kan ontsluit, aankope kan magtig, en by programme kan aanmeld nie."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Toestelbeskermingkenmerke sal nie sonder jou wagwoord werk nie."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Toestelbeskermingkenmerke sal nie sonder jou wagwoord werk nie.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Toestelbeskermingkenmerke sal nie sonder jou wagwoord werk nie.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Jou gestoorde vingerafdrukke sal ook van hierdie toestel af verwyder word, en jy sal nie met hulle jou foon kan ontsluit, aankope kan magtig, of by programme kan aanmeld nie.\""</string>
+</xliff:g>Jou gestoorde vingerafdrukke sal ook van hierdie toestel af verwyder word en jy sal nie met hulle jou foon kan ontsluit, aankope kan magtig, en by programme kan aanmeld nie."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Toestelbeskermingkenmerke sal nie sonder jou skermslot werk nie."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Toestelbeskermingkenmerke sal nie sonder jou skermslot werk nie.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Toestelbeskermingkenmerke sal nie sonder jou skermslot werk nie.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Jou gestoorde vingerafdrukke sal ook van hierdie toestel af verwyder word, en jy sal nie met hulle jou foon kan ontsluit, aankope kan magtig, of by programme kan aanmeld nie.\""</string>
+</xliff:g>Jou gestoorde vingerafdrukke sal ook van hierdie toestel af verwyder word, en jy sal nie met hulle jou foon kan ontsluit, aankope kan magtig, en by programme kan aanmeld nie."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Profielbeskermingkenmerke sal nie sonder jou patroon werk nie."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Profielbeskermingkenmerke sal nie sonder jou patroon werk nie.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Profielbeskermingkenmerke sal nie sonder jou patroon werk nie.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Jou gestoorde vingerafdrukke sal ook van hierdie profiel af verwyder word en jy sal nie met hulle jou profiel kan ontsluit, aankope kan magtig, of by programme kan aanmeld nie.\""</string>
+</xliff:g>Jou gestoorde vingerafdrukke sal ook van hierdie profiel af verwyder word en jy sal nie met hulle jou profiel kan ontsluit, aankope kan magtig, en by programme kan aanmeld nie."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Profielbeskermingkenmerke sal nie sonder jou PIN werk nie."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Profielbeskermingkenmerke sal nie sonder jou PIN werk nie.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Profielbeskermingkenmerke sal nie sonder jou PIN werk nie.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Jou gestoorde vingerafdrukke sal ook van hierdie profiel af verwyder word en jy sal nie met hulle jou profiel kan ontsluit, aankope kan magtig, of by programme kan aanmeld nie.\""</string>
+</xliff:g>Jou gestoorde vingerafdrukke sal ook van hierdie profiel af verwyder word en jy sal nie met hulle jou profiel kan ontsluit, aankope kan magtig, en by programme kan aanmeld nie."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Profielbeskermingkenmerke sal nie sonder jou wagwoord werk nie."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Profielbeskermingkenmerke sal nie sonder jou wagwoord werk nie.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Profielbeskermingkenmerke sal nie sonder jou wagwoord werk nie.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Jou gestoorde vingerafdrukke sal ook van hierdie profiel af verwyder word en jy sal nie met hulle jou profiel kan ontsluit, aankope kan magtig, of by programme kan aanmeld nie.\""</string>
+</xliff:g>Jou gestoorde vingerafdrukke sal ook van hierdie profiel af verwyder word en jy sal nie met hulle jou profiel kan ontsluit, aankope kan magtig, en by programme kan aanmeld nie."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Profielbeskermingkenmerke sal nie sonder jou skermslot werk nie."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Profielbeskermingkenmerke sal nie sonder jou skermslot werk nie.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Profielbeskermingkenmerke sal nie sonder jou skermslot werk nie.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Jou gestoorde vingerafdrukke sal ook van hierdie profiel af verwyder word en jy sal nie met hulle jou profiel kan ontsluit, aankope kan magtig, of by programme kan aanmeld nie.\""</string>
+</xliff:g>Jou gestoorde vingerafdrukke sal ook van hierdie profiel af verwyder word en jy sal nie met hulle jou profiel kan ontsluit, aankope kan magtig, en by programme kan aanmeld nie."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Ja, verwyder"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Verander ontsluitpatroon"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Verander ontsluit-PIN"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Stygende, dalende of herhalende volgorde van syfers word nie toegelaat nie"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Kanselleer"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Vee uit"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Kanselleer"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Volgende"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Opstelling is klaar."</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS beskikbaar"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS beskikbaar)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Voer jou netwerkwagwoord in"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Diensverskaffer-Wi‑Fi-netwerk"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Gekoppel via <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Om liggingsakkuraatheid te verbeter en vir ander doele, wil <xliff:g id="APP_NAME">%1$s</xliff:g> netwerkskandering aanskakel, selfs wanneer Wi-Fi af is.\n\n Laat dit toe vir alle programme wat wil skandeer?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Gaan in die oorloopkieslys na Gevorderd om dit af te skakel."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Laat toe"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Koppel"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Netwerkverbinding het misluk"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Vergeet"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Wysig"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Kon netwerk nie vergeet nie"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Stoor"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Netwerkstoring het misluk"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Gevorderde Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-adres"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-adres"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Netwerkinligting"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnetmasker"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-adresse"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Kanselleer uitnodiging?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Wil jy die uitnodiging kanselleer om met <xliff:g id="PEER_NAME">%1$s</xliff:g> te koppel?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Vergeet hierdie groep?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Draagbare Wi-Fi-warmkol"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi-warmkol"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Deel nie tans internet of inhoud met ander toestelle nie"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Deel tans hierdie tablet se internetverbinding via warmkol"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Deel tans hierdie foon se internetverbinding via warmkol"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Program deel tans inhoud. Skakel warmkol af en dan aan om internetverbinding te deel"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi-naam"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Warmkol se naam"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Skakel tans aan <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> …"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Ander toestelle kan aan <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> koppel"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi-wagwoord"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Warmkol se wagwoord"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP-band"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Gebruik warmkol om \'n Wi-Fi-netwerk vir jou ander toestelle te skep. Warmkol verskaf internet deur jou mobiele dataverbinding te gebruik. Bykomende dataheffings kan dalk geld."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Programme kan \'n warmkol skep om inhoud met nabygeleë toestelle te deel."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Adres wat nooddienste as jou ligging gebruik as jy \'n noodoproep met Wi‑Fi maak"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skerm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Klank"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Soek"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Bestuur soekinstellings en geskiedenis"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Geen resultate nie"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Maak geskiedenis skoon"</string>
     <string name="display_settings" msgid="7965901687241669598">"Skerm"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Outodraai skerm"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Helder kleure"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Laai verstek APN-instellings terug"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Stel terug na verstek"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Terugstel van verstek APN-instellings voltooi"</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Stel terug"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Terugstelling van netwerkinstellings"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Stel opsies terug"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Netwerk, programme of toestel kan teruggestel word"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Stel Wi-Fi, mobiel en Bluetooth terug"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Dit sal alle netwerkinstellings terugstel, insluitend:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobiele data"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Stel instellings terug"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Stel alle netwerkinstellings terug? Jy kan nie hierdie handeling ontdoen nie!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Stel terug?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Netwerkterugstelling is nie vir hierdie gebruiker beskikbaar nie"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Netwerkinstellings is teruggestel"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Fabrieksterugstelling"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> rekeninge sal teruggestel word</item>
-      <item quantity="one">1 rekening sal teruggestel word</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Interne berging en alle data sal teruggestel word"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Vee alle data uit (fabriekterugstelling)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Dit sal al die data uit jou tablet se "<b>"interne geheue"</b>" uitvee, insluitend: \n\n"<li>"jou Google-rekening"</li>\n" "<li>"stelsel- en programdata-instellings"</li>\n<li>"afgelaaide programme"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Dit sal al die data uit jou tablet se "<b>"interne geheue"</b>" uitvee, insluitend: \n\n"<li>"jou Google-rekening"</li>\n" "<li>"stelsel- en programdata-instellings"</li>\n<li>"afgelaaide programme"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Jy is tans aangemeld by die volgende rekeninge:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Veiligheidsinligting"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Jy het nie \'n dataverbinding nie. Om die inligting nou te sien, gaan na %s op enige rekenaar wat aan die internet gekoppel is."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Laai tans…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Kies jou wagwoord"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Stel \'n skermslot"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Stel \'n wagwoord vir sekuriteit"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Stel wagwoord vir vingerafdruk"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Kies jou patroon"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Stel patroon vir vingerafdruk"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Kies jou PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Stel \'n PIN vir sekuriteit"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Stel PIN vir vingerafdruk"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Bevestig jou wagwoord"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Voer jou wagwoord weer in"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Bevestig jou patroon"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Bevestig jou PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Voer jou PIN weer in"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Wagwoorde stem nie ooreen nie"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN\'e stem nie ooreen nie"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Ontsluitmetode"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Gebruik jou werkpatroon om voort te gaan"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Voer jou werk-PIN in om voort te gaan"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Voer jou werkwagwoord in om voort te gaan"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Gebruik jou toestelpatroon om voort te gaan. Vereis nadat toestel herbegin."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Voer jou toestel-PIN in om voort te gaan. Vereis nadat toestel herbegin."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Voer jou toestelwagwoord in om voort te gaan. Vereis nadat toestel herbegin."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Gebruik jou werkpatroon om voort te gaan. Vereis nadat toestel herbegin."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Voer jou werk-PIN in om voort te gaan. Vereis nadat toestel herbegin."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Voer jou werkwagwoord in om voort te gaan. Vereis nadat toestel herbegin."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Gebruik jou toestelpatroon vir bykomende sekuriteit"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Voer jou toestel-PIN in vir bykomende sekuriteit"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Voer jou toestelwagwoord in vir bykomende sekuriteit"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Gebruik jou werkpatroon vir bykomende sekuriteit"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Voer jou werk-PIN in vir bykomende sekuriteit"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Voer jou werkwagwoord in vir bykomende sekuriteit"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Jou foon is na fabriekinstellings teruggestel. Voer jou vorige patroon in om die foon te gebruik."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Jou foon is na fabriekinstellings toe teruggestel. Voer jou vorige PIN in om die foon te gebruik."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Jou foon is na fabriekinstellings teruggestel. Voer jou vorige wagwoord in om die foon te gebruik."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verifieer patroon"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verifieer PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verifieer wagwoord"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Verkeerde PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Verkeerde wagwoord"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Verkeerde patroon"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Skep legstuk en laat toegang toe?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Nadat jy die legstuk geskep het, kan <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> toegang verkry tot alle data wat dit vertoon."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Laat <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> altyd toe om legstukke te skep en om by hul data in te gaan."</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>d. <xliff:g id="HOURS">%2$d</xliff:g>u. <xliff:g id="MINUTES">%3$d</xliff:g>m."</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>u. <xliff:g id="MINUTES">%2$d</xliff:g>m."</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>m."</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Gebruikstatistieke"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Gebruikstatistieke"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Rangskik volgens:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Skermlesers, skerm, interaksiekontroles"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Visie-instellings"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Jy kan hierdie toestel pasmaak om by jou behoeftes te pas. Hierdie toeganklikheidkenmerke kan later in Instellings verander word."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Vergroot lettergrootte"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Verander lettergrootte"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Skermlesers"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Oudio en teks op skerm"</string>
     <string name="display_category_title" msgid="685461049938269166">"Vertoon"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Om te zoem"</b>", tik 3 keer vinnig op die skerm.\n"<ul><li>"Sleep 2 of meer vingers om te rollees"</li>\n<li>"Knyp 2 of meer vingers om zoem te verstel"</li></ul>\n\n<b>"Om tydelik te zoem"</b>", tik 3 keer vinnig op die skerm en hou jou vinger op die skerm met die derde tik.\n"<ul><li>"Sleep om op die skerm rond te beweeg"</li>\n<li>"Lig vinger op om uit te zoem"</li></ul>\n\n"Jy kan nie op die sleutelbord en navigasiebalk inzoem nie."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Wanneer vergroting aangeskakel is, kan jy die Toeganklikheidsknoppie aan die onderkant van die skerm gebruik om vinnig te vergroot.\n\n"<b>"Om te zoem"</b>", tik op die Toeganklikheidsknoppie en tik dan enige plek op die skerm.\n"<ul><li>"Sleep 2 of meer vingers om te rollees"</li>\n<li>"Knyp 2 of meer vingers om zoem te verstel"</li></ul>\n\n<b>"Om tydelik te zoem"</b>", tik op die Toeganklikheidsknoppie en raak en hou enige plek op die skerm.\n"<ul><li>"Sleep om op die skerm rond te beweeg"</li>\n<li>"Lig jou vinger op om uit te zoem"</li></ul>\n\n"Jy kan nie op die sleutelbord of navigasiebalk inzoem nie."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Die Toeganklikheidsknoppie is gestel op <xliff:g id="SERVICE">%1$s</xliff:g>. Raak en hou die Toeganklikheidsknoppie en kies vergroting as jy vergroting wil gebruik."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Toeganklikheid-kortpad"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Volumesleutelkortpad"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Kortpaddiens"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Laat vanaf sluitskerm toe"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Wanneer die kortpad aan is, kan jy albei volumeknoppies vir 3 sekondes druk om \'n toeganklikheidskenmerk te begin."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Wanneer die kortpad aan is, kan jy albei volumesleutels 3 sekondes lank druk om \'n toeganklikheidkenmerk te begin."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Hoëkontras-teks"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Dateer outomaties skermvergroting op"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Dateer skermvergroting op tydens programverwisseling"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Kan prestasie beïnvloed"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klik ná wyser ophou beweeg"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Vertraging voor klik"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"AAN"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"AF"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Wys in Vinnige instellings"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"het <xliff:g id="NUMBER">%1$d</xliff:g> gekies uit <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> van <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Kies almal"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Bestuur planne"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datagebruik"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Programdatagebruik"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Diensverskaffer se datarekeninge kan van jou toestel verskil."</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Selnetwerke"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Beperkte Wi-Fi-netwerke"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Skakel Wi-Fi aan om beperkte netwerke te kies."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Outomaties"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Beperk"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Nie beperk nie"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Diensverskaffer se datarekeninge kan van jou toestel verskil."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Noodoproep"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Keer terug na oproep"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Oproepbestuurder"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Nooduitsendings"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Noodwaarskuwings"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Netwerkoperateurs"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Toegangspuntname"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Verbeterde 4G LTE-modus"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Voorkeur-SIM vir"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Vra elke keer"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Keuse vereis"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"SIM-keuse"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Instellings"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">Wys %d versteekte items</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Programkennisgewings"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kennisgewingkategorie"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Belangrikheid"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Laat die program besluit"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Laat klank toe"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Moet nooit kennisgewings wys nie"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Geen klank of visuele onderbreking nie"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Geen klank nie"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Maak geluid"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Maak geluid en spring op op skerm"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Pop op skerm"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Laag"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Middelmatig"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Hoog"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Dringend"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Laat klank toe"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Moenie \'n geluid maak, vibreer of hierdie kennisgewings vir \'n kort tyd op die huidige skerm wys nie."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Laat onderbrekings toe"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Laat die program \'n geluid maak, vibreer en/of kennisgewings op die skerm wys"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Min belang"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Middelmatige belang"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Groot belang"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"beeld-in-beeld-prent in"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Beeld-in-beeld"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Laat beeld-in-beeld toe"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Laat toe dat hierdie program \'n beeld-in-beeld-venster skep terwyl die program oop is of nadat jy dit verlaat het (byvoorbeeld, om voort te gaan om \'n video te kyk). Hierdie venster wys bo-oor ander programme wat jy gebruik."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Laat toe dat hierdie program \'n beeld-in-beeld-venster skep terwyl die program oop is of nadat jy dit verlaat het (byvoorbeeld, om voort te gaan om \'n video te kyk). Hierdie venster wys bo-oor ander programme wat jy gebruik."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Toegang tot Moenie Steur Nie"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Geen geïnstalleerde programme het toegang tot Moenie Steur Nie versoek nie"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Laai tans programme …"</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Dra tans lêers oor"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Dra tans foto\'s oor (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Gebruik toestel as MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS-weerspieëling"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Agtergrondkontrolering"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Volle agtergrondtoegang"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Gebruik teks van die skerm af"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Stel Aandbeligting-skedule"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Tint skerm geelbruin om jou te help om aan die slaap te raak"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Aandbeligting is aan"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Skerm is geelbruin getint. Dit kan jou help om aan die slaap te raak."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Voorstelle"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gebruik koeler skermkleure"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Skakel skerm af om kleur toe te pas"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Herselflaai toestel om telefonie-monitorverandering toe te pas"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera-HAL-HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Herselflaai toestel om Kamera-HAL-HDR+-verandering toe te pas"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kameralasersensor"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Outomatiese stelselopdaterings"</string>
     <string name="usage" msgid="2977875522080448986">"Gebruik"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobieledatagebruik"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Datawaarskuwing"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Stel datalimiet"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datalimiet"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> gebruik tussen <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> in <xliff:g id="ID_2">%2$s</xliff:g> gebruik"</string>
     <string name="configure" msgid="1029654422228677273">"Stel op"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Ander programme wat by gebruik ingesluit is"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Maak skoon en skakel om"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Stel ShortcutManager se koersbeperking terug"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager se koersbeperking is teruggestel"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Beheer sluitskermkennisgewings"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Beheer inligting op sluitskerm"</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="8483187649355540109">"Steundiens en wenke"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Geen geïnstalleerde programme het toegang tot betaalde SMS\'e versoek nie"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Betaalde SMS\'e kan jou geld kos en die koste sal by jou diensverskafferfakture gevoeg word. As jy toestemming vir \'n program aktiveer, sal jy betaalde SMS\'e met daardie program kan stuur."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Toegang tot betaalde SMS\'e"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Nie vir ander toestelle sigbaar nie"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Af"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Gekoppel aan <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Gekoppel aan veelvuldige toestelle"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Stelsel-UI-demonstrasiemodus"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Kitsprogramme"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Maak skakels in programme oop, selfs as hulle nie geïnstalleer is nie"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Kitsprogramme"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Kitsprogramrekening"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Kitsprogramvoorkeure"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Geïnstalleerde programme"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Jou berging word nou deur die bergingbestuurder bestuur"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Rekeninge vir <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Altyd-aan-VPN is in jou persoonlike profiel aangeskakel"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Altyd-aan-VPN is in jou werkprofiel aangeskakel"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globale HTTP-instaanbediener is gestel"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Vertroude eiebewyse"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Vertroude eiebewyse"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Vertroude eiebewyse in jou persoonlike profiel"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Vertroude eiebewyse in jou werkprofiel"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Minstens <xliff:g id="COUNT_1">%d</xliff:g> CA-sertifikate</item>
       <item quantity="one">Minstens <xliff:g id="COUNT_0">%d</xliff:g> CA-sertifikaat</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Diensverskaffervoorsiening-inligting"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger-diensverskaffervoorsiening"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Wat is nuut en opwindend?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Kyk na die top-5-kenmerke"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Kry \'n kykie van jou nuwe foon"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Kry \'n kykie van jou nuwe tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Kry \'n kykie van jou nuwe toestel"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Hierdie kenmerk is nie op hierdie toestel beskikbaar nie"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS-registrasiestaat"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Geregistreer"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Nie geregistreer nie"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 309de05..1bce3db 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s የእርስዎን መልዕክቶች ሊደርስበት ይፈልጋል። መዳረሻ ለ%2$s ይሰጥ?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"የሲም መዳረሻ ጥያቄ"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> የእርስዎ ሲም ካርድ ላይ መድረስ ይፈልጋል። ወደ ሲም ካርዱ መዳረሻ መስጠት በእርስዎ መሣሪያ ላይ ግንኙነቱ ላይ በሚቆይበት ጊዜ  ያክል የውሂብ ተገኚነትን ያሰናክላል። ለ<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> መዳረሻ ስጥ"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"ለሌሎች መሣሪያዎች እንደ <xliff:g id="DEVICE_NAME">^1</xliff:g> ሆኖ ይታያል"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"ለሌሎች መሣሪያዎች እንደ «<xliff:g id="DEVICE_NAME">^1</xliff:g>» ሆኖ ይታያል"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"የእርስዎ መሣሪያዎች"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"አዲስ መሣሪያ ያጣምሩ"</string>
     <string name="date_and_time" msgid="9062980487860757694">"ቀን እና ሰዓት"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"ቀጣይ"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"ጣት አሻራ ይዘለል?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"ጣት አሻራን ማዋቀር አንድ ወይም ሁለት ደቂቃ ብቻ ነው የሚወስደው። ይህን ከዘለሉት ጣት አሻራዎን በኋላ ላይ በቅንብሮች ውስጥ ማከል ይችላሉ።"</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"የማያ ገጽ መቆለፊያ ይዘለል?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"የመሣሪያ ጥበቃ ባህሪያት አይበሩም። ይህ ጡባዊ ቢጠፋ፣ ቢሰረቅ ወይም ዳግም እንዲቀናበር ቢደረግ ሌሎች እንዳይጠቀሙበት መከላከል አይችሉም።"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"የመሣሪያ ጥበቃ ባህሪያት አይበሩም። ይህ መሣሪያ ቢጠፋ፣ ቢሰረቅ ወይም ዳግም እንዲቀናበር ቢደረግ ሌሎች እንዳይጠቀሙበት መከላከል አይችሉም።"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"የመሣሪያ ጥበቃ ባህሪያት አይበሩም። ይህ ስልክ ቢጠፋ፣ ቢሰረቅ ወይም ዳግም እንዲቀናበር ቢደረግ ሌሎች እንዳይጠቀሙበት መከላከል አይችሉም።"</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"የሚፈቀደውን ከፍተኛ የጣት አሻራ ብዛት አክለዋል"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"ተጨማሪ የጣት አሻራዎችን ማከል አይቻልም"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"ሁሉም የጣት አሻራዎች ይወገዱ?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"«<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>»ን ያስወግዱ"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"ይህን የጣት አሻራ መሰረዝ ይፈልጋሉ?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"ስልክዎን ለመክፈት፣ ለግዢዎች ፍቃድ ለመስጠት ወይም በጣት አሻራዎችዎ በመለያ ወደ መተግበሪያዎች ለመግባት የእርስዎን የጣት አሻራዎች መጠቀም አይችሉም"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"የጣት አሻራዎችዎን ተጠቅመው የስራ መገለጫዎን መክፈት፣ ግዢዎችን ማጽደቅ ወይም ወደ የስራ መተግበሪያዎች መግባት አይችሉም"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"አዎ፣ አስወግድ"</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"ለተጨማሪ ደህንነት የምትኬ ማያ ገጽ መቆለፊያን ያዘጋጁ።"</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"ለተጨማሪ ደህንነት የምትኬ ማያ ገጽ መቆለፊያን ያዘጋጁ።"</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>
@@ -497,35 +502,35 @@
     <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_fingerprint" msgid="8212242533942400457">"የመሣሪያ ጥበቃ ባህሪዎች ያለ የእርስዎ ስርዓተ ጥለት አይሰሩም።<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"የመሣሪያ ጥበቃ ባህሪዎች ያለ የእርስዎ ስርዓተ ጥለት አይሠሩም።<xliff:g id="EMPTY_LINE">
 
 </xliff:g>የተቀመጡ የእርስዎ የጣት አሻራዎችም እንዲሁም ከዚህ መሳሪያ ይወገዳሉ፣ እና በእነሱ ስልክዎን መክፈት፣ ግዢዎችን መፍቀድ፣ ወይም ወደ መተግበሪያ መግባት አይችሉም።»"</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"የመሣሪያ ጥበቃ ባህሪዎች ያለ የእርስዎ ፒን አይሰሩም።"</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"የመሣሪያ ጥበቃ ባህሪዎች ያለ የእርስዎ ፒን አይሰሩም።<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"የመሣሪያ ጥበቃ ባህሪዎች ያለ የእርስዎ ፒን አይሰሩም።<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_fingerprint" msgid="2228159168587170445">"የመሣሪያ ጥበቃ ባህሪዎች ያለ የእርስዎ የይለፍ ቃል አይሰሩም።<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"የመሣሪያ ጥበቃ ባህሪዎች ያለ የእርስዎ የይለፍ ቃል አይሠሩም።<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_fingerprint" msgid="6363091330281670692">"የመሣሪያ ጥበቃ ባህሪዎች ያለ የእርስዎ ቁልፍ ገጽ አይሰሩም።<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"የመሣሪያ ጥበቃ ባህሪዎች ያለ የእርስዎ ቁልፍ ገጽ አይሰሩም።<xliff:g id="EMPTY_LINE">
 
 </xliff:g>የተቀመጡ የእርስዎ የጣት አሻራዎችም እንዲሁም ከዚህ መሳሪያ ይወገዳሉ፣ እና በእነሱ ስልክዎን መክፈት፣ ግዢዎችን መፍቀድ፣ ወይም ወደ መተግበሪያ መግባት አይችሉም።»"</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"የመሣሪያ ጥበቃ ባሕሪዎች ያለ የእርስዎ ሥርዓተ ጥለት አይሠሩም።"</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"የመገለጫ ጥበቃ ባሕሪዎች ያለ የእርስዎ ሥርዓተ ጥለት አይሠሩም።<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"የመገለጫ ጥበቃ ባሕሪዎች ያለ የእርስዎ ሥርዓተ ጥለት አይሠሩም።<xliff:g id="EMPTY_LINE">
 
 </xliff:g>እንዲሁም የተቀመጡ የእርስዎ ጣት አሻራዎች ከዚህ መገለጫ ይወገዳሉ፣ እና የእርስዎን መገለጫ መክፈት፣ ግዢዎችን መፍቀድ ወይም እነሱን ተጠቅመው በመለያ ወደ መተግበሪያዎች መግባት አይችሉም።»"</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"የመሣሪያ ጥበቃ ባሕሪዎች ያለ የእርስዎ ፒን አይሠሩም።"</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"የመገለጫ ጥበቃ ባሕሪዎች ያለ የእርስዎ ፒን አይሠሩም።<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"የመገለጫ ጥበቃ ባሕሪዎች ያለ የእርስዎ ፒን አይሠሩም።<xliff:g id="EMPTY_LINE">
 
 </xliff:g>እንዲሁም የተቀመጡ የእርስዎ ጣት አሻራዎች ከዚህ መገለጫ ይወገዳሉ፣ እና የእርስዎን መገለጫ መክፈት፣ ግዢዎችን መፍቀድ ወይም እነሱን ተጠቅመው በመለያ ወደ መተግበሪያዎች መግባት አይችሉም።»"</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"የመገለጫ ጥበቃ ባሕሪዎች ያለ የእርስዎ ይለፍ ቃል አይሠሩም።"</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"የመገለጫ ጥበቃ ባሕሪዎች ያለ የይለፍ ቃልዎ አይሠሩም።<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"የመገለጫ ጥበቃ ባሕሪዎች ያለ የይለፍ ቃልዎ አይሠሩም።<xliff:g id="EMPTY_LINE">
 
 </xliff:g>እንዲሁም የተቀመጡ የእርስዎ ጣት አሻራዎች ከዚህ መገለጫ ይወገዳሉ፣ እና የእርስዎን መገለጫ መክፈት፣ ግዢዎችን መፍቀድ ወይም እነሱን ተጠቅመው በመለያ ወደ መተግበሪያዎች መግባት አይችሉም።»"</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"የመሣሪያ ጥበቃ ባሕሪዎች ያለ የእርስዎ ማያ ገጽ መቆለፊያ አይሠሩም።"</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"የመገለጫ ጥበቃ ባሕሪዎች ያለ የእርስዎ የማያ ገጽ መቆለፊያ አይሠሩም።<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"የመገለጫ ጥበቃ ባሕሪዎች ያለ የእርስዎ የማያ ገጽ መቆለፊያ አይሠሩም።<xliff:g id="EMPTY_LINE">
 
 </xliff:g>እንዲሁም የተቀመጡ የእርስዎ ጣት አሻራዎች ከዚህ መገለጫ ይወገዳሉ፣ እና የእርስዎን መገለጫ መክፈት፣ ግዢዎችን መፍቀድ ወይም እነሱን ተጠቅመው በመለያ ወደ መተግበሪያዎች መግባት አይችሉም።»"</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"አዎ፣ አስወግድ"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"ሽቅብ፣ ቁልቁል ወይም ተደጋጋሚ የአኃዞች ተከታታይ አይፈቀድም"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"እሺ"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"ይቅር"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"አጽዳ"</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>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS አለ"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" WPS አለ"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"የአውታረ መረብ ይለፍ ቃልዎን ያስገቡ"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"የአገልግሎት አቅራቢ የWi‑Fi አውታረ መረብ"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"በ<xliff:g id="NAME">%1%s</xliff:g> በኩል አገናኝ"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> የአካባቢ ትክክለኛነትን ለማሻሻል እና ለሌሎች ዓላማዎች የአውታረ መረብ መቃኘትን ማብራት ይፈልጋል፣ Wi-Fi ጠፍቶ ቢሆንም እንኳ።\n\nይሄ ለሁሉም መቃኘት ለሚፈልጉ መተግበሪያዎች ይፈቀድ?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ይህንን ለማጥፋት በትርፍ ፍሰት ምናሌው ውስጥ ወደ የላቁ ይሂዱ።"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ፍቀድ"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"አያይዝ"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ከአውታረ መረቡ ጋር መገናኘት አልተሳካም"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"እርሳ"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"ቀይር"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"አውታረ መረብ መርሳት አልተሳካም"</string>
     <string name="wifi_save" msgid="3331121567988522826">"አስቀምጥ"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"አውታረ መረብ ማስቀመጥ አልተሳካም"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"የላቀ Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC አድራሻ"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP አድራሻ"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"የአውታረ መረብ መረጃ"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"የንዑስ አውታር ጭንብል"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"ዲኤንኤስ"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"የIPv6 አድራሻዎች"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ግብዣ ይቅር?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"ከ<xliff:g id="PEER_NAME">%1$s</xliff:g> ጋር የመገናኘት ግብዣውን ይቅር ማለት ይፈልጋሉ?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ይህ ቡድን ይረሳ?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"ተንቀሳቃሽ የWi-Fi መገናኛ ነጥብ"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"የWi‑Fi መገናኛ ነጥብ"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"በይነመረብን ወይም ይዘትን ከሌሎች መሣሪያዎች ጋር አይጋራም ያለው"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"የዚህ ጡባዊ በይነመረብ ግንኙነት በመገናኛ ነጥብ በኩል በማጋራት ላይ"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"የዚህ ስልክ በይነመረብ ግንኙነት በመገናኛ ነጥብ በኩል በማጋራት ላይ"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"መተግበሪያ ይዘትን እየተጋራ ነው። በይነመረብ ግንኙነትን ለመጋራት፣ መገናኛ ነጥብን ያጥፉ እና በመቀጠል ያብሩት"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"የWi‑Fi ስም"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"የመገናኛ ነጥብ ስም"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>ን በማብራት ላይ..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"ሌሎች መሣሪያዎች ወደ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ሊገናኙ ይችላሉ"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"የWi-Fi ይለፍ ቃል"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"የመገናኛ ነጥብ የይለፍ ቃል"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"የኤፒ ባንድ"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"ለእርስዎ ሌሎች መሣሪያዎች የWi‑Fi አውታረ መረብ ለመፍጠር መገናኛ ነጥብ ይጠቀሙ። መገናኛ ነጥብ የእርስዎን የሞባይል ውሂብ ግንኙነት በመጠቀም በይነመረብን ያቀርባል። ተጨማሪ የሞባይል ውሂብ ክፍያዎች ተፈጻሚ ሊሆኑ ይችሉ ይሆናል።"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"መተግበሪያዎች በአቅራቢያ ካሉ መሣሪያዎች ጋር ይዘትን ለመጋራት መገናኛ ነጥብ ሊፈጥሩ ይችላሉ።"</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"የWi-Fi ጥሪ ሲበራ የእርስዎ ስልክ በምርጫዎ እና በየትኛው ይበልጥ ጠንካራ እንደሆነ የሚወሰን ሆኖ ጥሪዎችን በWi-Fi አውታረ መረቦች ወይም በአገልግሎት አቅራቢዎ አውታረ መረብ በኩል ሊያዞር ይችላል። ይህን ባህሪ ከማብራትዎ በፊት ክፍያዎችን እና ሌሎች ዝርዝሮችን በተመለከተ አገልግሎት አቅራቢዎን ያነጋግሩ።"</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"የአስቸኳይ አደጋ አድራሻን ያዘምኑ"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"እንደ WiFi ያለ የ911 ጥሪ ካደረጉ የአስቸኳይ አደጋ አገልግሎቶች እንደ የእርስዎ አካባቢ ያለ አድራሻ ይጠቀሙበታል"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"Wi‑Fi በመጠቀም የአደጋ ጥሪ በማድረግ ላይ ያሉ ከሆኑ አድራሻ በድንገተኛ አደጋ አገልግሎቶች እንደ የእርስዎ መገኛ አካባቢ ይሆናል"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"አሳይ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ድምፅ"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ድምፆች"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"ፍለጋ"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"የፍለጋ ታሪክ እና ቅንብሮችን ያደራጁ"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"ምንም ውጤቶች የሉም"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"ታሪክን አጽዳ"</string>
     <string name="display_settings" msgid="7965901687241669598">"አሳይ"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"ማያ በራስ ሰር አሽከርክር"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"ፈካ ያሉ ቀለማት"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"ነባሪ የAPN ቅንብሮችን እነበረበት ይመልሱ"</string>
     <string name="menu_restore" msgid="8260067415075573273">"ወደ ነባሪ ዳግም አስጀምር"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"የዳግም አስጀምር ነባሪ APN ቅንብሮች ተጠናቀዋል"</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"ዳግም አስጀምር"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"የአውታረ መረብ ቅንብሮች ዳግም ማቀናበር"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"የዳግም ማስጀመሪያ አማራጮች"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"አውታረ መረብ፣ መተግበሪያዎች ወይም መሣሪያ ዳግም ሊዋቀሩ ይችላሉ"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi፣ ተንቀሳቃሽ ስልክ እና ብሉቱዝን ዳግም አስጀምር"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"የሚከተሉትን ጨምሮ ይህ ሁሉንም የአውታረ መረብ ቅንብሮችን ዳግም ያቀናብራል፦\n\n"<li>"Wi‑Fi"</li>\n<li>"የተንቀሳቃሽ ስልክ ውሂብ"</li>\n<li>"ብሉቱዝ"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"ቅንብሮችን ዳግም ያቀናብሩ"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"ሁሉም አውታረ መረብ ቅንብሮች ዳግም ይጀምሩ? ይህን እርምጃ መቀልበስ አይችሉም!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"ዳግም ይቀናበር?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"የአውታረመረብ ዳግም ማስጀመር ለዚህ ተጠቃሚ አይገኝም"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"የአውታረ መረብ ቅንብሮች ዳግም ጀምረዋል።"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"የፋብሪካ ውሂብ ዳግም አስጀምር"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> መለያዎች ዳግም ይጀመራሉ</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> መለያዎች ዳግም ይጀመራሉ</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"ውስጣዊ ማከማቻ እና ሁሉም ውሂብ ዳግም ይጀመራሉ"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"ሁሉንም ውሂብ ደምስስ (የፋብሪካ ዳግም ማስጀመር)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ይህ ከእርስዎ ጡባዊ "<b>"ውስጣዊ ማከማቻ"</b>" የሚከተሉትን ጨምሮ:\n\n"<li>"የእርስዎ  Google መለያ"</li>\n<li>"ሥርዓት እና መተግበሪያ ውሂብ እና ቅንብሮች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li>" ላይ ያሉ ሁሉንም ውሂብ ይሰርዛል።"</string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ይህ ከእርስዎ ጡባዊ "<b>"ውስጣዊ ማከማቻ"</b>" የሚከተሉትን ጨምሮ:\n\n"<li>"የእርስዎ  Google መለያ"</li>\n<li>"ሥርዓት እና መተግበሪያ ውሂብ እና ቅንብሮች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li>" ላይ ያሉ ሁሉንም ውሂብ ይሰርዛል።"</string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n" እርስዎ በአሁን ጊዜ የሚከተለው መለያዎች ውስጥ ገብተዋል፡\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"የደህንነት መረጃ"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"የውሂብ ግንኙነት የለህም። ይህን መረጃ አሁን ለማየት፣ ከማንኛውም ኮምፒዩተር ጋር ወደ %s የተገናኘ በይነ መረብ ሂድ።"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"በማስገባት ላይ..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"የይለፍ ቃለዎን ይምረጡ"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"የማያ ገጽ ቁልፍ ያቀናብሩ"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"ለደህንነት የይለፍ ቃል ያቀናብሩ"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"የጣት አሻራን ለመጠቀም የይለፍ ቃል ያቀናብሩ"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"የእርስዎን ስርዓተ ጥለት ይምረጡ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"የጣት አሻራን ለመጠቀም፣ ሥርዓተ ጥለትን ያቀናብሩ"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"የእርስዎን ፒን ይምረጡ"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"ለደህንነት አንድ ፒን ያቀናብሩ"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"የጣት አሻራን ለመጠቀም ፒን ያቀናብሩ"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"የይለፍ ቃልዎን ያረጋግጡ"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"የእርስዎን ይለፍ ቃል ደግመው ያስገቡ"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"ስርዓተ ጥለትዎን ያረጋግጡ"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"የእርስዎን ፒን ያረጋግጡ"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"የእርስዎን ፒን ደግመው ያስገቡ"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"የይለፍ ቃላት አይዛመዱም"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"ያስገቡት ፒን አይዛመዱም"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"ምርጫዎችን ክፈት"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"ለመቀጠል የሥራ ስርዓተ-ጥለትዎን ይጠቀሙ"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"ለመቀጠል የሥራ ፒንዎን ያስገቡ"</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">"ለመቀጠል የመሣሪያዎን ፒን ያስገቡ። መሣሪያው ዳግም ከተጀመረ በኋላ የሚያስፈልግ።"</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">"ለመቀጠል የስራ ፒንዎን ያስገቡ። መሣሪያው ዳግም ከተጀመረ በኋላ የሚያስፈልግ።"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"ለመቀጠል የስራ ይለፍ ቃልዎን ያስገቡ። መሣሪያው ዳግም ከተጀመረ በኋላ የሚያስፈልግ።"</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"ለተጨማሪ ደህንነት፣ የእርስዎን መሣሪያ ሥርዓተ ጥለት ይጠቀሙ"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"ለተጨማሪ ደህንነት፣ የእርስዎን መሣሪያ ፒን ያስገቡ"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"ለተጨማሪ ደህንነት፣ የእርስዎን መሣሪያ ይለፍ ቃል ያስገቡ"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"ለተጨማሪ ደህንነት፣ የእርስዎን ሥራ ሥርዓተ ጥለት ይጠቀሙ"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"ለተጨማሪ ደህንነት፣ የእርስዎን ሥራ ፒን ያስገቡ"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"ለተጨማሪ ደህንነት፣ የእርስዎን ሥራ ይለፍ ቃል ያስገቡ"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"የእርስዎ ስክ ወደ የፋብሪካ ቅንብሮች ዳግም ተጀምሯል። ይህን ስልክ ለመጠቀም ቀዳሚውን ስርዓተ-ጥለትዎን ያስገቡ።"</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"የእርስዎ ስክ ወደ የፋብሪካ ቅንብሮች ዳግም ተጀምሯል። ይህን ስልክ ለመጠቀም ቀዳሚውን ፒንዎ ያስገቡ።"</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"የእርስዎ ስክ ወደ የፋብሪካ ቅንብሮች ዳግም ተጀምሯል። ይህን ስልክ ለመጠቀም ቀዳሚውን ይለፍ ቃልዎ ያስገቡ።"</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"ስርዓተ-ጥለትን ያረጋግጡ"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"ፒን ያረጋግጡ"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"የይለፍ ቃል ያረጋግጡ"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"የተሳሳተ ፒን"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"የተሳሳተ ይለፍ ቃል"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"የተሳሳተ ስርዓተ ጥለት"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"አዲስ ምግብር ፍጠር አና መዳረሻ ፍቀድለት?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"ምግብሩን ከፈጠርከው በኋላ <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> የሚያሳየውን ውሂብ ሁሉ ሊደርስበት ይችላል።"</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ፍርግሞች እንዲፈጥርና ውሂባቸውን እንዲደርስ ሁልጊዜ ፍቀድ"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>ቀኖች<xliff:g id="HOURS">%2$d</xliff:g>ሰዓታት<xliff:g id="MINUTES">%3$d</xliff:g> ደቂቃዎች<xliff:g id="SECONDS">%4$d</xliff:g> ሰከንዶች"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>ሰዓታት<xliff:g id="MINUTES">%2$d</xliff:g>ደቂቃዎች<xliff:g id="SECONDS">%3$d</xliff:g>ሰከንዶች"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>ደቂቃ <xliff:g id="SECONDS">%2$d</xliff:g>ሴኮንድ"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> ሴኮንድ"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"የአጠቃቀም ስታስቲክስ"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"የአጠቃቀም ስታስቲክስ"</string>
     <string name="display_order_text" msgid="8592776965827565271">"ለይ በ:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"የማያ ገጽ አንባቢዎች፣ ማሳያ፣ የመስተጋብር መቆጣጠሪያዎች"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"የእይታ ቅንብሮች"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"ይህን መሣሪያ ከእርስዎ ፍላጎቶች ጋር እንዲጣጣም ማበጀት ይችላሉ። እነዚህ የተደራሽነት ባህሪያት በኋላ ላይ በቅንብሮች ውስጥ ሊቀየሩ ይችላሉ።"</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"የቁምፊ መጠን ጨምር"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"የቅርጸ-ቁምፊ መጠን ይቀይሩ"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"የማያ ገጽ አንባቢዎች"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ኦዲዮ እና የማያ ገጽ ላይ ጽሑፍ"</string>
     <string name="display_category_title" msgid="685461049938269166">"አሳይ"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"ለማጉላት"</b>" ማያ ገጹን በፍጥነት 3 ጊዜ መታ ያድርጉት።\n"<ul><li>"ለማሸብለል 2 ወይም ተጨማሪ ጣቶችን ይጎትቱ"</li>\n<li>"ማጉላትን ለማስተካከል በ2 ወይም ተጨማሪ ጣቶች ይቆንጥጡ"</li></ul>\n\n<b>"ለጊዜው ለማጉላት"</b>" ማያ ገጹን በፍጥነት ሶስቴ መታ ያድርጉና ለሶስተኛ ጊዜ መታ ሲያደርጉት በዚያው ያዝ ያድርጉት።\n"<ul><li>"በማያ ገጹ ላይ ለማንቀሳቀስ ይጎትቱ"</li>\n<li>"ለማሳነስ ጣት ያንሱ"</li></ul>\n\n"ቁልፍ ሰሌዳውን እና የአሰሳ አሞሌውን ማጉላት አይችሉም።"</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"ማጉላት ሲበራ በፍጥነት ለማጉላት በማያ ገጹ ታችኛው ክፍል ላይ ያለውን የተደራሽነት አዝራር ይጠቀሙ።\n\n"<b>"ለማጉላት"</b>" የተደራሽነት አዝራሩን መታ ያድርጉ፣ ከዚያ በማያ ገጹ ማንኛውም ክፍል ላይ መታ ያድርጉ።\n"<ul><li>"ለማዘብለል 2 ወይም ተጨማሪ ጣቶችን ይጎትቱ"</li>\n<li>"ማጉላትን ለማስተካከል በ2 ወይም ተጨማሪ ጣቶችን ይቆንጥጡ"</li></ul>\n\n<b>"ለጊዜው ለማጉላት"</b>" የተደራሽነት አዝራሩን መታ ያድርጉ፣ ከዚያ ማንኛውም የማያ ገጽ ክፍሉን ነክተው ይያዙ።\n"<ul><li>"በማያ ገጹ ላይ ለማንቀሳቀስ ይጎትቱ"</li>\n<li>"ለማሳነት ጣት ያንሱ"</li></ul>\n\n"ቁልፍ ሰሌዳውን ወይም የአሰሳ አሞሌውን ማጉላት አይችሉም።"</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"የተደራሽነት አዝራሩ ወደ <xliff:g id="SERVICE">%1$s</xliff:g> ተቀናብሯል። ማጉላትን ለመጠቀም የተደራሽነት አዛሩን ነክተው ይያዙ፣ ከዚያ ማጉላትን ይምረጡ።"</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"የተደራሽነት አቋራጭ"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"የድምፅ ቁልፍ አቋራጭ"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"የአቋራጭ አገልግሎት"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"ከማያ ገጽ ቁልፍ ፍቀድ"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"አቋራጭ ሲበራ የተደራሽነት ባህሪውን ለማስጀመር ሁለቱንም የድምፅ አዝራሮች ለ3 ሰከንዶች ተጭነው መያዝ ይችላሉ።"</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"አቋራጩ ሲበራ የተደራሽነት ባህሪውን ለማስጀመር ሁለቱንም የድምፅ አዝራሮች ለ3 ሰከንዶች ተጭነው መያዝ ይችላሉ።"</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">"ማጉላትን በራስ-አዘምን"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"የመተግበሪያ ሽግግሮች ላይ ማጉላትን አዘምን"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"በአፈጻጸም ላይ ተጽዕኖ ሊኖረው ይችላል"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"ጠቋሚ መንቀሳቀስ ካቆመ በኋላ ጠቅ ማድረግ"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"ጠቅ ከማድረግ በፊት መዘግየት"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"በርቷል"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ጠፍቷል"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"በፈጣን ቅንብሮች ውስጥ አሳይ"</string>
@@ -2358,6 +2363,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"ዕቅዶችን አቀናብር"</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>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"የተንቀሳቃሽ ስልክ አውታረ መረብ"</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_metered_auto" msgid="1262028400911918865">"ራስ-ሰር"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"የሚለካ"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"የማይለካ"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"የአገልግሎት አቅራቢ ውሂብ አቆጣጠር ከየመሣሪያዎ ሊለይ ይችላል።"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"የአደጋ ጊዜ ጥሪ"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"ወደ ስልክ ጥሪ ተመለስ"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"የጥሪ አቀናባሪ"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"የአስቸኳይ አደጋ ስርጭቶች"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"አስቸኳይ ማንቂያዎች"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"የአውታረ መረብ ትእምርተ ከዋኝ"</string>
     <string name="access_point_names" msgid="1381602020438634481">"የመዳረሻ ነጥብ ስሞች"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"የተሻሻለ የ4ጂ LTE ሁነታ"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"ተመራጭ ሲም ለ"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"ሁልጊዜ ጠይቅ"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"መምረጥ ይጠየቃል"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"የሲም ምርጫ"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"ቅንብሮች"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="one">%d የተደበቁ ንጥሎችን አሳይ</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"የመተግበሪያ ማሳወቂያዎች"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"የማሳወቂያ ምድብ"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"አስፈላጊነት"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"መተግበሪያው ይወስን"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"ድምፅ ይፍቀዱ"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"ማሳወቂያዎችን በጭራሽ አታሳይ"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ምንም ድምፅ ወይም የሚታይ ትርጉም የለም"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"ምንም ድምፅ የለም"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"ድምፅ ፍጠር"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"ድምፅ ፍጠር እና በማያ ገጽ ላይ ብቅ በል"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"ብቅ-ባይ ማያ ገጽ"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"ዝቅተኛ"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"መካከለኛ"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"ከፍተኛ"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"አስቸኳይ"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"ድምፅ ይፍቀዱ"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"ድምፅ አታሰማ፣ አትንዘር ወይም እነዚህን ማሳወቂያዎች ወደ የአሁኑ ማያ ገጽ አታሳይ።"</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"መቆራረጦችን ፍቀድ"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"መተግበሪያው ድምፅ መፍጠር፣ መንዘር እና/ወይም በማያ ገጽ ላይ ማሳወቂያ ብቅ እንዲያደርግ ፍቀድ"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"ዝቅተኛ አስፈላጊነት"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"መካከለኛ አስፈላጊነት"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"ከፍተኛ አስፈላጊነት"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"ስዕል-ላይ-ስዕል"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"ስዕል-ላይ-ስዕል"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"ስዕል-በስዕል-ውስጥ ፍቀድ"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"ይህ መተግበሪያ ክፍት ሆኖ ሳለ ወይም ከተዉት በኋላ (ለምሳሌ፦ አንድ ቪዲዮ ለመመልከት) የስዕል-በስዕል ውስጥ መስኮት እንዲፈጥር ይፍቀዱለት። ይህ መስኮት እየተጠቀሙባቸው ባሉ ሌሎች መተግበሪያዎች ላይ ያሳያል።"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"ይህ መተግበሪያ ክፍት ሆኖ ሳለ ወይም ከተዉት በኋላ (ለምሳሌ፦ አንድ ቪዲዮ ለመመልከት) የስዕል-በስዕል ውስጥ መስኮት እንዲፈጥር ይፍቀዱለት። ይህ መስኮት እየተጠቀሙባቸው ባሉ ሌሎች መተግበሪያዎች ላይ ያሳያል።"</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>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"ፋይሎችን በማዛወር ላይ"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"ፎቶዎችን በማዛወር ላይ (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"መሣሪያን እንደ MIDI በመጠቀም ላይ"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"የኤስኤምኤስ ግልባጭ"</string>
     <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>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"የማታ ብርሃት መርሐግብርን ያዘጋጁ"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"እንዲተኙ ለማገዝ ለማያ ገጹ ብርቱካናማ ቅልም ይስጡት።"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"የምሽት ብርሃን በርቷል"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"ማያ ገጽ ብርቱካናማ ቅልም አለው። ይሄ እንዲተኙ ሊያግዘዎት ይችላል።"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"የአስተያየት ጥቆማዎች"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"ቀዝቀዝ ያሉ የማሳያ ቀለሞችን ይጠቀሙ"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"የቀለም ለውጥን ለመተግበር ማያ ገጹን ያጥፉት"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"የቴሌፎኒ መከታተያ ለውጥን ለመተግበር መሣሪያውን ዳግም ያስነሱት"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"ካሜራ HAL ኤችዲአር+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"የካሜራ HAL ኤችዲአር+ ለውጥን ለመተግባር መሣሪያውን ዳግም ያስነሱት"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"የካሜራ ሌዘር ዳሳሽ"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ራስ-ሰር የስርዓት ዝማኔዎች"</string>
     <string name="usage" msgid="2977875522080448986">"አጠቃቀም"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"የተንቀሳቃሽ ውሂብ አጠቃቀም"</string>
@@ -3410,7 +3427,7 @@
     <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="data_usage_template" msgid="2923744765873163859">"<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">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"ጥረግ እና ለውጥ"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"የShortcutManager ደረጃ-ገዳቢ ዳግም ይጀመር?"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager ፍጥነት-መገደብ ዳግም እንዲጀምር ተደርጓል"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"የማያ ገጽ መቆለፊያ ማሳወቂያዎችን ይቆጣጠሩ"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"በማያ ገጽ መቆለፊያ ላይ የቁጥጥር መረጃ"</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="8483187649355540109">"ድጋፍ እና ጠቃሚ ምክሮች"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"ምንም የተጫኑ መተግበሪያዎች የፕሪሚየም ኤስኤምኤስ መዳረሻ አልጠየቁም"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"ፕሪሚየም ኤስኤምኤስ ውድ ገንዘብ ሊያስወጣዎት ይችላል፣ እና በአገልግሎት አቅራቢ ክፍያዎ ላይ ሒሳብ ያስጨምርብዎታል። ለመተግበሪያ ፈቃድን ካነቁ ያንን መተግበሪያ በመጠቀም ፕሪሚየም ኤስኤምኤስ መላክ ይችላሉ።"</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"የፕሪሚየም ኤስኤምኤስ መዳረሻ"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"ለሌሎች መሣሪያዎች አይታይም"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"ጠፍቷል"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"ከ<xliff:g id="ID_1">%1$s</xliff:g> ጋር ተገናኝቷል"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"ከበርካታ መሣሪያዎች ጋር ተገናኝቷል"</string>
     <string name="demo_mode" msgid="2798762752209330277">"የስርዓት ተጠቃሚ በይነገጽ ማሳያ ሁነታ"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"ቅጽበታዊ መተግበሪያዎች"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"አገናኞችን በመተግበሪያዎች ውስጥ ይክፈቱ፣ ባይጫኑም እንኳ"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"ቅጽበታዊ መተግበሪያዎች"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"የቅጽበታዊ መተግበሪያዎች መለያ"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"የቅጽበት መተግበሪያዎች አማራጮች"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"የተጫኑ መተግበሪያዎች"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"የእርስዎ ማከማቻ አሁን በማከማቻ አስተዳዳሪ እየተዳደረ ነው"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"የ<xliff:g id="USER_NAME">%1$s</xliff:g> መለያዎች"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"ሁልጊዜ የበራ VPN በእርስዎ የግል መገለጫ ውስጥ በርቷል"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"ሁልጊዜ የበራ VPN በእርስዎ የሥራ መገለጫ በርቷል"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"ሁለንተናዊ የHTTP ወኪል ተዘጋጅቷል"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"የሚታመን ማስረጃ"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"የሚታመን ማስረጃ"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"በእርስዎ የግል መገለጫ ውስጥ ያሉ የታመኑ ምስክርነቶች"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"በእርስዎ የሥራ መገለጫ ውስጥ ያሉ የታመኑ ምስክርነቶች"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">ቢያንስ <xliff:g id="COUNT_1">%d</xliff:g> የCA እውቅና ማረጋገጫዎች</item>
       <item quantity="other">ቢያንስ <xliff:g id="COUNT_1">%d</xliff:g> የCA እውቅና ማረጋገጫዎች</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"የአገልግሎት አቅራቢ አቅርቦት መረጃ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"የቀስቃሴ አገልግሎት አቅራቢ አቅርቦት"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"ምን አዲስ እና አስደሳች ነገር አለ?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ከፍተኛዎቹን 5 ባህሪያት ይሞክሩዋቸው"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"በአዲሱ ስልክዎ ላይ ጉብኝት ያድርጉ"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"በአዲሱ ጡባዊዎ ላይ ጉብኝት ያድርጉ"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"በአዲሱ መሣሪያዎ ላይ ጉብኝት ያድርጉ"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"ይህ ባህሪ በዚህ መሣሪያ ላይ አይገኝም"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"የIMS ምዝገባ ቀን"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"የተመዘገበ"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"አልተመዘገበም"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 9fc8155..87f3cd7 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -170,7 +170,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"‏يريد %1$s الدخول إلى رسائلك. هل تريد منح %2$s حق الدخول؟"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"‏طلب حق الوصول إلى شريحة SIM"</string>
     <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="bluetooth_device_name_summary" msgid="4757990010751789977">"مرئي باسم \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" للأجهزة الأخرى"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"مرئي باسم \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" للأجهزة الأخرى"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"أجهزتك"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"إقران جهاز جديد"</string>
     <string name="date_and_time" msgid="9062980487860757694">"التاريخ والوقت"</string>
@@ -384,6 +384,9 @@
     <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="1961957425135180242">"التالي"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"هل تريد تخطّي بصمة الإصبع؟"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"لا يستغرق إعداد بصمة الإصبع أكثر من دقيقة أو دقيقتين. وعند تخطّي ذلك، يمكنك إضافة بصمة إصبع لاحقًا من الإعدادات."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"هل تريد تخطّي قفل الشاشة؟"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"لن يتم تشغيل ميزات حماية الجهاز. ولن تتمكن من منع الآخرين من استخدام هذا الجهاز اللوحي في حالة فقدانه أو سرقته أو إعادة ضبطه."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"لن يتم تشغيل ميزات حماية الجهاز. ولن تتمكن من منع الآخرين من استخدام هذا الجهاز في حالة فقدانه أو سرقته أو إعادة ضبطه."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"لن يتم تشغيل ميزات حماية الجهاز. ولن تتمكن من منع الآخرين من استخدام هذا الهاتف في حالة فقدانه أو سرقته أو إعادة ضبطه."</string>
@@ -423,6 +426,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"لقد أضفت الحد الأقصى لعدد بصمات الإصبع"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"يتعذر إضافة مزيد من بصمات الإصبع"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"هل تريد إزالة جميع بصمات الإصبع؟"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"إزالة \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\""</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"هل تريد حذف بصمة الإصبع هذه؟"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"لن تتمكن من استخدام بصمات إصبعك لإلغاء قفل الهاتف، أو السماح بعمليات الشراء، أو تسجيل الدخول إلى التطبيقات من خلالها."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"لن تتمكن من استخدام بصمات إصبعك لإلغاء تأمين الملف الشخصي للعمل، أو السماح بعمليات الشراء، أو تسجيل الدخول إلى تطبيقات العمل"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"نعم، إزالة"</string>
@@ -467,7 +472,7 @@
     <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="5585650064305600578">"يمكنك إعداد قفل شاشة احتياطي لتعزيز أمان الجهاز."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"يمكنك إعداد قفل شاشة احتياطي لتعزيز أمان الجهاز."</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>
@@ -509,37 +514,37 @@
     <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_fingerprint" msgid="8212242533942400457">"لن تعمل ميزات حماية الجهاز بدون النقش.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"لن تعمل ميزات حماية الجهاز بدون النقش.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ستتم إزالة بصمات الإصبع المحفوظة من هذا الجهاز أيضًا ولن تتمكن من إلغاء تأمين هاتفك أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها.\""</string>
+</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الجهاز ولن تتمكن من إلغاء قفل هاتفك أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"لن تعمل ميزات حماية الجهاز بدون رقم التعريف الشخصي."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"لن تعمل ميزات حماية الجهاز بدون رقم التعريف الشخصي.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"لن تعمل ميزات حماية الجهاز بدون رقم التعريف الشخصي.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ستتم إزالة بصمات الإصبع المحفوظة من هذا الجهاز أيضًا ولن تتمكن من إلغاء تأمين هاتفك أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها.\""</string>
+</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الجهاز ولن تتمكن من إلغاء قفل هاتفك أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"لن تعمل ميزات حماية الجهاز بدون كلمة المرور.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ستتم إزالة بصمات الإصبع المحفوظة من هذا الجهاز أيضًا ولن تتمكن من إلغاء تأمين هاتفك أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها.\""</string>
+</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الجهاز ولن تتمكن من إلغاء قفل هاتفك أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"لن تعمل ميزات حماية الجهاز بدون قفل الشاشة.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ستتم إزالة بصمات الإصبع المحفوظة من هذا الجهاز أيضًا ولن تتمكن من إلغاء تأمين هاتفك أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها.\""</string>
+</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الجهاز ولن تتمكن من إلغاء قفل هاتفك أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"لن تعمل ميزات حماية الملف الشخصي بدون النقش."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"لن تعمل ميزات حماية الملف الشخصي بدون النقش.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"لن تعمل ميزات حماية الملف الشخصي بدون النقش.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ستتم إزالة بصمات الإصبع المحفوظة أيضًا من هذا الملف الشخصي ولن تتمكن من إلغاء تأمين ملفك الشخصي أو مصادقة عمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها\"."</string>
+</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الملف الشخصي ولن تتمكن من إلغاء تأمين ملفك الشخصي أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"لن تعمل ميزات حماية الملف الشخصي بدون رقم التعريف الشخصي."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"لن تعمل ميزات حماية الملف الشخصي بدون رقم التعريف الشخصي.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"لن تعمل ميزات حماية الملف الشخصي بدون رقم التعريف الشخصي.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ستتم إزالة بصمات الإصبع المحفوظة أيضًا من هذا الملف الشخصي ولن تتمكن من إلغاء تأمين ملفك الشخصي أو مصادقة عمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها\"."</string>
+</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الملف الشخصي ولن تتمكن من إلغاء تأمين ملفك الشخصي أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"لن تعمل ميزات حماية الملف الشخصي بدون كلمة المرور."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"لن تعمل ميزات حماية الملف الشخصي بدون كلمة المرور.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"لن تعمل ميزات حماية الملف الشخصي بدون كلمة المرور.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ستتم ازالة بصمات الإصبع المحفوظة أيضًا من هذا الملف الشخصي ولن تتمكن من إلغاء تأمين ملفك الشخصي أو مصادقة عمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها\"."</string>
+</xliff:g>كما ستتم ازالة بصمات الإصبع المحفوظة من هذا الملف الشخصي ولن تتمكن من إلغاء تأمين ملفك الشخصي أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"لن تعمل ميزات حماية الملف الشخصي بدون قفل الشاشة."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"لن تعمل ميزات حماية الملف الشخصي بدون قفل الشاشة.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"لن تعمل ميزات حماية الملف الشخصي بدون قفل الشاشة.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ستتم إزالة بصمات الإصبع المحفوظة أيضًا من هذا الملف الشخصي ولن تتمكن من إلغاء تأمين ملفك الشخصي أو مصادقة عمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها\"."</string>
+</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الملف الشخصي ولن تتمكن من إلغاء تأمين ملفك الشخصي أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"نعم، إزالة"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"تغيير نقش إلغاء التأمين"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"‏تغيير رمز PIN لإلغاء التأمين"</string>
@@ -622,6 +627,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"غير مسموح باستخدام الترتيب التصاعدي أو التنازلي أو المكرر للأرقام"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"موافق"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"إلغاء"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"محو"</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>
@@ -818,10 +824,10 @@
     <string name="wifi_wps_complete" msgid="2388138550456729134">"‏نجحت عملية WPS. جارٍ الاتصال بالشبكة…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"‏تم الاتصال بشبكة Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>."</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"‏إعداد WPS قيد التقدم فعلاً ويمكن أن يستغرق اكتماله فترة قد تصل إلى دقيقتين"</string>
-    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"‏أخفقت عملية WPS. يرجى إعادة المحاولة خلال بضع دقائق."</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"‏تعذّر إتمام عملية WPS. يرجى إعادة المحاولة خلال بضع دقائق."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"‏إعداد أمان جهاز التوجيه اللاسلكي (WEP) ليس متوافقًا"</string>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"‏إعداد أمان جهاز التوجيه اللاسلكي (TKIP) ليس متوافقًا"</string>
-    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"أخفقت المصادقة. يُرجى إعادة المحاولة."</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"تعذّرت المصادقة. يُرجى إعادة المحاولة."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"‏تم اكتشاف جلسة WPS أخرى، يُرجى إعادة المحاولة خلال بضع دقائق."</string>
     <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"‏تم قطع الاتصال بشبكة Wi‑Fi. وتم إلغاء إعداد WPS."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"اسم الشبكة"</string>
@@ -860,6 +866,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"‏WPS متاح"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS متاح)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"أدخل كلمة مرور الشبكة"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"‏شبكة Wi‑Fi لمشغِّل شبكة الجوّال"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"الاتصال عبر <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"‏لتحسين مستوى دقة تحديد الموقع ولأغراض أخرى، يحتاج <xliff:g id="APP_NAME">%1$s</xliff:g> إلى تشغيل البحث عن الشبكات، حتى مع إيقاف Wi-Fi.\n\nهل تريد السماح بذلك لجميع التطبيقات التي تحتاج إلى فحص؟"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"لتعطيل هذا، يمكنك الانتقال إلى \"متقدم\" في القائمة الكاملة."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"سماح"</string>
@@ -877,6 +885,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"اتصال"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"تعذّر التوصيل بالشبكة"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"حذف"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"تعديل"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"تعذّر حذف الشبكة"</string>
     <string name="wifi_save" msgid="3331121567988522826">"حفظ"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"تعذّر حفظ الشبكة"</string>
@@ -893,6 +902,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"‏إعدادات Wi-Fi المتقدمة"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"‏عنوان Mac"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"‏عنوان IP"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"معلومات الشبكة"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"قناع الشبكة الفرعية"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"نظام أسماء النطاقات"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"‏عناوين IPv6"</string>
@@ -925,16 +935,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"هل تريد إلغاء الدعوة؟"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"هل تريد إلغاء الدعوة للاتصال بـ <xliff:g id="PEER_NAME">%1$s</xliff:g>؟"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"حذف هذه المجموعة؟"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"‏نقطة اتصال Wi-Fi المحمولة"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"‏نقطة اتصال Wi‑Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"لا تتم مشاركة اتصال الإنترنت أو المحتوى مع الأجهزة الأخرى"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"تتم مشاركة اتصال الإنترنت لهذا الجهاز اللوحي عبر نقطة الاتصال"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"تتم مشاركة اتصال الإنترنت لهذا الهاتف عبر نقطة الاتصال"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"يشارك التطبيق المحتوى. لمشاركة اتصال الإنترنت، يجب إيقاف نقطة الاتصال، ثم تشغيلها."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"‏اسم شبكة Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"اسم نقطة الاتصال"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"جارٍ تشغيل <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"يمكن توصيل الأجهزة الأخرى بشبكة <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"‏كلمة مرور شبكة Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"كلمة مرور نقطة الاتصال"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"‏نطاق AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"‏يمكنك استخدام نقطة اتصال لإنشاء شبكة Wi‑Fi لأجهزتك الأخرى. وتوفر نقطة الاتصال اتصال الإنترنت باستخدام اتصال بيانات الجوّال. وقد يتم تطبيق رسوم بيانات الجوّال الإضافية."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"يمكن للتطبيقات إنشاء نقطة اتصال لمشاركة المحتوى مع الأجهزة المجاورة."</string>
@@ -986,7 +995,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"‏عند تشغيل الاتصال عبر Wi-Fi، يمكن للهاتف توجيه المكالمات عبر شبكات Wi-Fi أو عبر شبكة مشغّل شبكة الجوّال، حسب تفضيلك وحسب الإشارة الأقوى. وقبل تشغيل هذه الميزة، راجع رسوم مشغل شبكة الجوّال والتفاصيل الأخرى حول شبكة الجوّال."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"تحديث عنوان الطوارئ"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"‏العنوان الذي تستخدمه خدمات الطوارئ على أساس أنه موقعك في حالة إجرائك اتصالاً برقم 911 باستخدام WiFi"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"‏العنوان الذي تستخدمه خدمات الطوارئ باعتباره موقعك في حالة إجراء مكالمة طوارئ باستخدام شبكة Wi‑Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"عرض"</string>
     <string name="sound_settings" msgid="5534671337768745343">"الصوت"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"مستويات الصوت"</string>
@@ -1040,6 +1049,7 @@
     <string name="search_settings" msgid="1910951467596035063">"بحث"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"إدارة إعدادات البحث والسجل"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"ليست هناك نتائج"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"محو السجلّ"</string>
     <string name="display_settings" msgid="7965901687241669598">"الشاشة"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"التدوير التلقائي للشاشة"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"ألوان ساطعة"</string>
@@ -1159,7 +1169,7 @@
       <item quantity="other">‏رمز رقم التعريف الشخصي لبطاقة SIM غير صحيح، ويتبقى لديك <xliff:g id="NUMBER_1">%d</xliff:g> من المحاولات.</item>
       <item quantity="one">‏رمزPIN لبطاقة SIM غير صحيح، ولديك محاولة واحدة (<xliff:g id="NUMBER_0">%d</xliff:g>) يجب أن تتصل بعدها بمشغّل شبكة الجوّال لإلغاء قفل الجهاز.</item>
     </plurals>
-    <string name="pin_failed" msgid="1848423634948587645">"‏أخفقت عملية \"رقم التعريف الشخصي\" لبطاقة SIM!"</string>
+    <string name="pin_failed" msgid="1848423634948587645">"‏تعذّر إتمام عملية \"رقم التعريف الشخصي\" لبطاقة SIM!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"حالة الجهاز اللوحي"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"حالة الهاتف"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"تحديثات النظام"</string>
@@ -1376,8 +1386,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"‏جارٍ استعادة إعدادات APN الافتراضية."</string>
     <string name="menu_restore" msgid="8260067415075573273">"إعادة تعيين إلى الإعداد الافتراضي"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"‏اكتملت إعادة تعيين إعدادات APN الافتراضية."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"إعادة التعيين"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"إعادة تعيين إعدادات الشبكة"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"إعادة تعيين الخيارات"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"يمكن إعادة تعيين الشبكة أو التطبيقات أو الجهاز"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"‏إعادة تعيين شبكة Wi-Fi والجوّال وبلوتوث"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"‏سيؤدي هذا إلى إعادة تعيين إعدادات الشبكة، بما فيها:\n\n"<li>"Wi‑Fi"</li>\n<li>"بيانات الجوال"</li>\n<li>"بلوتوث"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"إعادة تعيين الإعدادات"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"هل تريد إعادة تعيين كل إعدادات الشبكة؟ لا يمكنك التراجع عن هذا الإجراء!"</string>
@@ -1385,16 +1396,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"هل تريد إعادة التعيين؟"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"إعادة ضبط الشبكة ليست متاحة لهذا المستخدم"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"إعادة تعيين إعدادات الشبكة"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"إعادة الضبط بحسب بيانات المصنع"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="zero">ستتم إعادة تعيين <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> حساب</item>
-      <item quantity="two">ستتم إعادة تعيين حسابين (<xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g>)</item>
-      <item quantity="few">ستتم إعادة تعيين <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> حسابات</item>
-      <item quantity="many">ستتم إعادة تعيين <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> حسابًا</item>
-      <item quantity="other">ستتم إعادة تعيين <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> حساب</item>
-      <item quantity="one">ستتم إعادة تعيين حساب واحد</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"ستتم إعادة تعيين وحدة التخزين الداخلية وكل البيانات"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"محو جميع البيانات (إعادة التعيين على إعدادات المصنع)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"‏يؤدي ذلك إلى مسح جميع البيانات من "<b>"وحدة التخزين الداخلية"</b>" لجهازك اللوحي، بما في ذلك:\n\n"<li>"حسابك في Google"</li>\n<li>"النظام وبيانات التطبيقات والإعدادات"</li>\n<li>"التطبيقات التي تم تنزيلها"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"‏يؤدي ذلك إلى مسح جميع البيانات من "<b>"وحدة التخزين الداخلية"</b>" لهاتفك، بما في ذلك:\n\n"<li>"حسابك في Google"</li>\n<li>"النظام وبيانات التطبيقات والإعدادات"</li>\n<li>"التطبيقات التي تم تنزيلها"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"تم تسجيل دخولك حاليًا في الحسابات التالية:\n"</string>
@@ -1518,15 +1520,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"معلومات الأمان"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"‏ليس لديك اتصال بيانات. لعرض هذه المعلومات الآن، انتقل إلى %s من أي كمبيوتر متصل بالإنترنت."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"جارٍ التحميل…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"اختيار كلمة المرور"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"تعيين قفل شاشة"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"يجب تعيين كلمة مرور لأغراض أمنية"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"لاستخدام بصمة الإصبع، عيّن كلمة مرور"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"اختيار نقشك"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"لاستخدام بصمة الإصبع، يُرجى رسم نقش من ابتكارك"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"‏اختيار رمز PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"يجب تعيين رقم تعريف شخصي لأغراض أمنية"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"لاستخدام بصمة الإصبع، عيّن رقم التعريف الشخصي"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"تأكيد كلمة مرورك"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"أعد إدخال كلمة المرور"</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_pin_header" msgid="7744513791910572550">"أعد إدخال رقم التعريف الشخصي"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"كلمات المرور غير متطابقة"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"أرقام التعريف الشخصي غير متطابقة"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"تحديد طريقة إلغاء القفل"</string>
@@ -1539,12 +1542,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"استخدم نقش ملفك الشخصي للعمل للمتابعة."</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"أدخل رقم التعريف الشخصي لملفك الشخصي للعمل للمتابعة."</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">"أدخل رقم التعريف الشخصي لجهازك للمتابعة. رقم التعريف الشخصي مطلوب بعد إعادة تشغيل الجهاز."</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">"أدخل رقم التعريف الشخصي لملفك الشخصي للعمل للمتابعة. رقم التعريف الشخصي مطلوب بعد إعادة تشغيل الجهاز."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"أدخل كلمة مرور ملفك الشخصي للعمل للمتابعة. كلمة مرور هذا الملف مطلوبة بعد إعادة تشغيل الجهاز."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"استخدام نقش للجهاز لزيادة الأمان"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"إدخال رقم تعريف شخصي للجهاز لزيادة الأمان"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"إدخال كلمة مرور للجهاز لزيادة الأمان"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"استخدام نقش للملف الشخصي للعمل لزيادة الأمان"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"إدخال رقم تعريف شخصي للملف الشخصي للعمل لزيادة الأمان"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"إدخال كلمة مرور للملف الشخصي للعمل لزيادة الأمان"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"تم إعادة تعيين هاتفك على إعدادات المصنع. لاستخدام هذا الهاتف، أدخل النقش السابق."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"تم إعادة تعيين هاتفك على إعدادات المصنع. لاستخدام هذا الهاتف، أدخل رقم التعريف الشخصي السابق."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"تم إعادة تعيين هاتفك على إعدادات المصنع. لاستخدام هذا الهاتف، أدخل كلمة المرور السابقة."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"التحقق من النقش"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"التحقق من رقم التعريف الشخصي"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"التحقق من كلمة المرور"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"رقم تعريف شخصي خاطئ"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"كلمة مرور خاطئة"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"نقش خاطئ"</string>
@@ -1851,13 +1860,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"هل تريد إنشاء الأداة والسماح بالوصول؟"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"بعد إنشاء الأداة، بإمكان <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> الوصول إلى كل البيانات التي تعرضها هذه الأداة."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"السماح دومًا لـ <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> بإنشاء الأدوات والوصول إلى بياناتها"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> ي <xliff:g id="HOURS">%2$d</xliff:g> س <xliff:g id="MINUTES">%3$d</xliff:g> د <xliff:g id="SECONDS">%4$d</xliff:g> ث"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> س <xliff:g id="MINUTES">%2$d</xliff:g> د <xliff:g id="SECONDS">%3$d</xliff:g> ث"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> دقيقة <xliff:g id="SECONDS">%2$d</xliff:g> ثانية"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> ث"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"إحصاءات الاستخدام"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"إحصاءات الاستخدام"</string>
     <string name="display_order_text" msgid="8592776965827565271">"تصنيف بحسب:"</string>
@@ -1869,7 +1871,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"أجهزة قارئ الشاشة، والعرض، وعناصر التحكم التفاعلية"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"إعدادات الرؤية"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"يمكنك تخصيص هذا الجهاز للتوافق مع احتياجاتك. ويمكن تغيير ميزات إمكانية الوصول هذه لاحقًا من خلال الإعدادات."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"زيادة حجم الخط"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"تغيير حجم الخط"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"أجهزة قارئ الشاشة"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"الصوت والنص على الشاشة"</string>
     <string name="display_category_title" msgid="685461049938269166">"العرض"</string>
@@ -1890,10 +1892,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"للتكبير/التصغير"</b>"، انقر على الشاشة 3 مرات بسرعة.\n"<ul><li>"اسحب بإصبعين أو أكثر للتمرير"</li>\n<li>"اضغط بإصبعين أو أكثر على الشاشة لضبط التكبير/التصغير"</li></ul>\n\n<b>"للتكبير/التصغير مؤقتًا"</b>"، انقر على الشاشة 3 مرات بسرعة واستمر بالضغط بإصبعك بعد النقرة الثالثة.\n"<ul><li>"اسحب للتنقل على الشاشة"</li>\n<li>"ارفع إصبعك للتصغير"</li></ul>\n\n"لا يمكنك استخدام التكبير عند استخدام لوحة المفاتيح وشريط التنقل."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"عند تشغيل ميزة التكبير، استخدم زر إمكانية الوصول في أسفل الشاشة للتكبير بسرعة.\n\n"<b>"للتكبير/التصغير"</b>"، انقر على زر إمكانية الوصول، ثم انقر في أي مكان على الشاشة.\n"<ul><li>"اسحب بإصبعين أو أكثر للتمرير"</li>\n<li>"اضغط بإصبعين أو أكثر على الشاشة لضبط التكبير/التصغير"</li></ul>\n\n<b>"للتكبير/التصغير مؤقتًا"</b>"، انقر على زر إمكانية الوصول، ثم المس أي موضع على الشاشة مع الاستمرار.\n"<ul><li>"اسحب للتنقل على الشاشة"</li>\n<li>"ارفع إصبعك للتصغير"</li></ul>\n\n"لا يمكنك استخدام التكبير عند استخدام لوحة المفاتيح وشريط التنقل."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"تم تعيين زر إمكانية الوصول لخدمة <xliff:g id="SERVICE">%1$s</xliff:g>. لاستخدام التكبير، المس زر إمكانية الوصول مع الاستمرار ثم اختر التكبير."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"اختصارات تسهيل الدخول"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"مفتاح الاختصار لمستوى الصوت"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"خدمة الاختصار"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"السماح من شاشة التأمين"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"عند تشغيل الاختصار، يمكنك الضغط على زري مستوى الصوت على حد سواء لمدة 3 ثوانٍ لبدء تشغيل ميزة إمكانية الوصول."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"عندما يكون مفتاح الاختصار قيد التفعيل، يمكنك الضغط على مفتاحي مستوى الصوت لمدة 3 ثوانٍ لبدء تشغيل إحدى ميزات إمكانية الوصول."</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">"التحديث التلقائي لتكبير الشاشة"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"تحديث تكبير الشاشة أثناء تنقلات التطبيق"</string>
@@ -1906,7 +1908,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"قد يؤثر في الأداء"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"النقر بعد توقف المؤشر عن الحركة"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"مهلة قبل النقر"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"تشغيل"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"إيقاف"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"إظهار في الإعدادات السريعة"</string>
@@ -2386,7 +2387,7 @@
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"تم تعطيل المزامنة"</string>
     <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"جارٍ المزامنة"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"خطأ في المزامنة"</string>
-    <string name="sync_failed" msgid="1696499856374109647">"أخفقت المزامنة"</string>
+    <string name="sync_failed" msgid="1696499856374109647">"تعذّرت المزامنة"</string>
     <string name="sync_active" msgid="8476943765960863040">"المزامنة نشطة"</string>
     <string name="account_sync_settings_title" msgid="5131314922423053588">"مزامنة"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"تواجه المزامنة حاليًا بعض المشاكل. وسوف تكون متاحة خلال وقت قصير."</string>
@@ -2446,6 +2447,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"إدارة الخطط"</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>
@@ -2531,6 +2533,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"شبكات الجوال"</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_metered_auto" msgid="1262028400911918865">"تلقائي"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"بقياس"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"بدون قياس"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"قد تختلف طريقة حساب بيانات مشغل شبكة الجوّال عن طريقة الحساب على جهازك."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"الاتصال بالطوارئ"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"العودة إلى المكالمة"</string>
@@ -2653,12 +2658,12 @@
     </plurals>
     <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="zero">الاطلاع على الشهادات</item>
-      <item quantity="two">الاطلاع على الشهادتين</item>
-      <item quantity="few">الاطلاع على الشهادات</item>
-      <item quantity="many">الاطلاع على الشهادات</item>
-      <item quantity="other">الاطلاع على الشهادات</item>
-      <item quantity="one">الاطلاع على الشهادة</item>
+      <item quantity="zero">الاطّلاع على الشهادات</item>
+      <item quantity="two">الاطّلاع على الشهادتين</item>
+      <item quantity="few">الاطّلاع على الشهادات</item>
+      <item quantity="many">الاطّلاع على الشهادات</item>
+      <item quantity="other">الاطّلاع على الشهادات</item>
+      <item quantity="one">الاطّلاع على الشهادة</item>
     </plurals>
     <string name="user_settings_title" msgid="6151874007858148344">"المستخدمون"</string>
     <string name="user_list_title" msgid="7937158411137563543">"المستخدمون والملفات الشخصية"</string>
@@ -2764,7 +2769,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"مدير المكالمات"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"عمليات البث في حالات الطوارئ"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"تنبيهات الطوارئ"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"مشغلو الشبكة"</string>
     <string name="access_point_names" msgid="1381602020438634481">"أسماء نقاط الدخول"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"‏وضع 4G LTE المحسّن"</string>
@@ -2833,6 +2838,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"‏شريحة SIM المفضلة لـ"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"طرح السؤال كل مرة"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"يلزم التحديد"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"‏اختيار شريحة SIM"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"الإعدادات"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="zero">‏عرض %d عنصر مخفي</item>
@@ -2992,18 +2998,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"إشعارات التطبيقات"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"فئة الإشعارات"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"الأهمية"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"ترك القرار للتطبيق"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"السماح بالصوت"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"عدم عرض الإشعارات"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"من دون تنبيه صوتي أو مرئي"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"بدون تنبيه صوتي"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"إصدار تنبيه صوتي"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"إصدار تنبيه صوتي والظهور بسرعة على الشاشة"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"تمييز على الشاشة"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"منخفض الأهميّة"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"أهميّة متوسّطة"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"شديد الأهميّة"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"طارئ"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"السماح بالصوت"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"لا يُسمح بإصدار تنبيه صوتي أو بالاهتزاز أو بعرض هذه الإشعارات بسرعة على الشاشة الحالية."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"السماح بالمقاطعات"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"السماح للتطبيق بإصدار صوت و/أو اهتزاز و/أو عرض إشعارات منبثقة على الشاشة"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"أهمية منخفضة"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"متوسط الأهمية"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"أهمية عالية"</string>
@@ -3038,7 +3045,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"صورة، شاشة، صورة داخل صورة"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"صورة داخل صورة"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"السماح بنافذة صورة داخل صورة"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"يمكنك السماح لهذا التطبيق بإنشاء نافذة صورة داخل صورة أثناء فتح التطبيق أو بعد مغادرته (على سبيل المثال، لمتابعة مشاهدة فيديو)، علمًا بأن هذه النافذة تظهر أمام التطبيقات الأخرى التي تستخدمها."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"يمكنك السماح لهذا التطبيق بإنشاء نافذة صورة داخل صورة أثناء فتح التطبيق أو بعد مغادرته (على سبيل المثال، لمتابعة مشاهدة فيديو)، علمًا بأن هذه النافذة تظهر أمام التطبيقات الأخرى التي تستخدمها."</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>
@@ -3381,6 +3388,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"نقل الملفات"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"‏نقل الصور (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"‏استخدام الجهاز باعتباره MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"‏النسخ المطابق لرسائل SMS"</string>
     <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>
@@ -3531,6 +3539,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="night_display_suggestion_title" msgid="6602129097059325291">"تعيين جدول زمني للإضاءة الليلية"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"تلوين الشاشة بلون كهرماني خفيف لكي تنام"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"تم تشغيل الإضاءة الليلية"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"الشاشة ملوّنة بلون كهرماني خفيف، وهذا قد يساعدك على النوم."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"الاقتراحات"</string>
@@ -3557,6 +3567,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"استخدم ألوان عرض هادئة"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"لتطبيق التغيير في اللون، أوقف الشاشة."</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"لتطبيق التغيير الذي تم إجراؤه على خدمة مراقبة الاتصالات الهاتفية، يُرجى إعادة تشغيل الجهاز"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Camera HAL HDR+‎"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"‏لتطبيق تغيير Camera HAL HDR+‎، يمكنك إعادة تشغيل الجهاز"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"مُستشعِر الليزر في الكاميرا"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"تحديثات النظام التلقائية"</string>
     <string name="usage" msgid="2977875522080448986">"الاستخدام"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"استخدام بيانات الجوّال"</string>
@@ -3586,7 +3599,7 @@
     <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="data_usage_template" msgid="2923744765873163859">"<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">
@@ -3663,7 +3676,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"مسح وتحويل"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"‏هل تريد إعادة تعيين تقييد المعدل في ShortcutManager؟"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"‏تمت إعادة تعيين تقييد المعدل في ShortcutManager."</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"التحكم في إشعارات شاشة التأمين"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"التحكم في المعلومات على شاشة التأمين"</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="8483187649355540109">"الدعم والنصائح"</string>
@@ -3671,7 +3684,7 @@
     <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="2456198532288640046">"غير مرئي للأجهزة الأخرى"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"قيد الإيقاف"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"متصل بـ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"متصل بأجهزة متعددة"</string>
     <string name="demo_mode" msgid="2798762752209330277">"وضع تجريبي لواجهة مستخدم النظام"</string>
@@ -3773,7 +3786,7 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"للاطّلاع على الإشعارات، مرّر سريعًا للأسفل على مستشعر بصمات الإصبع على الجزء الخلفي لهاتفك."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"للاطّلاع على الإشعارات، مرّر سريعًا للأسفل على مستشعر بصمات الإصبع على الجزء الخلفي من جهازك اللوحي."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"للاطّلاع على الإشعارات، مرّر سريعًا للأسفل على مستشعر بصمات الإصبع على الجزء الخلفي من جهازك."</string>
-    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"الاطلاع على الإشعارات بسرعة"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"الاطّلاع على الإشعارات بسرعة"</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"تمرير سريع لأسفل على مستشعر بصمات الإصبع"</string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"تشغيل"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"إيقاف"</string>
@@ -3785,7 +3798,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"التطبيقات الفورية"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"فتح الروابط في التطبيقات، حتى إذا لم تكن التطبيقات مثبّتة"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"التطبيقات الفورية"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"حساب التطبيقات الفورية"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"تفضيلات التطبيقات الفورية"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"التطبيقات المثبَّتة"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"تتم إدارة السعة التخزينية لجهازك الآن عن طريق مدير السعة التخزينية"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"حسابات <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3802,7 +3815,7 @@
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"تتولى مؤسستك إدارة التغييرات والإعدادات."</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"تتولى <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> إدارة التغييرات والإعدادات."</string>
     <string name="enterprise_privacy_header" msgid="7402406406883832509">"لتوفير إمكانية الوصول إلى بيانات العمل، يمكن لمؤسستك تغيير الإعدادات وتثبيت برنامج على جهازك.\n\nلمعرفة مزيد من التفاصيل، يمكنك الاتصال بمشرف المؤسسة."</string>
-    <string name="enterprise_privacy_exposure_category" msgid="7313392680107938517">"أنواع المعلومات التي يمكن لمؤسستك الاطلاع عليها"</string>
+    <string name="enterprise_privacy_exposure_category" msgid="7313392680107938517">"أنواع المعلومات التي يمكن لمؤسستك الاطّلاع عليها"</string>
     <string name="enterprise_privacy_exposure_changes_category" msgid="9079283547182933771">"التغييرات التي يجريها مشرف المؤسسة"</string>
     <string name="enterprise_privacy_device_access_category" msgid="5423434164248819058">"إمكانية وصولك إلى هذا الجهاز"</string>
     <string name="enterprise_privacy_enterprise_data" msgid="2773968662865848413">"البيانات المقترنة مع حساب العمل، مثل البريد الإلكتروني والتقويم"</string>
@@ -3840,7 +3853,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"‏تم تشغيل إعداد \"شبكة افتراضية خاصة (VPN) دائمة التشغيل\" في الملف الشخصي"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"‏تم تشغيل \"شبكة افتراضية خاصة (VPN) دائمة التشغيل\" في الملف الشخصي للعمل"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"‏تم تعيين الخادم الوكيل HTTP العام"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"بيانات اعتماد موثوقة"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"بيانات اعتماد موثوقة"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"بيانات اعتماد موثوقة في ملفك الشخصي"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"بيانات اعتماد موثوقة في ملفك الشخصي للعمل"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="zero">‏<xliff:g id="COUNT_1">%d</xliff:g> شهادة CA كحد أدنى</item>
       <item quantity="two">‏شهادتا CA (<xliff:g id="COUNT_1">%d</xliff:g>) كحد أدنى</item>
@@ -3923,7 +3938,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"معلومات توفير خدمة مشغل شبكة الجوال"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"بدء توفير خدمة مشغل شبكة الجوال"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"ما الميزات الجديدة والمثيرة للاهتمام؟"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"الاطلاع على أفضل 5 ميزات"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"الحصول على جولة في هاتفك الجديد"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"الحصول على جولة في جهازك اللوحي الجديد"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"الحصول على جولة في جهازك الجديد"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"لا تتوفر هذه الميزة على هذا الجهاز"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"‏حالة تسجيل IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"مُسجَّل"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"غير مُسجَّل"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 0727125..4b1e613 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s sizin mesajlarınıza giriş istəyir. %2$s adlı istifadəçi üçün girişə icazə verilsin?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM girişi sorğusu"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> SIM kartınıza giriş hüququ istəyir. SIM karta giriş hüququnun verilməsi bağlantı müddətində cihazınızda data bağlantını deaktiv edəcək. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> cihazına giriş hüququ verin"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Digər cihazlara \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" kimi görünür"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Digər cihazlara \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" kimi görünür"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Cihazlarınız"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Yeni cihazı qoşalaşdırın"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Vaxt və tarix"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Növbəti"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Barmaq izi ötürülsün?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Barmaq izinin ayarlanması bir-iki dəqiqə çəkəcək. Bu mərhələni ötürsəniz, barmaq izini sonradan ayarlarda əlavə edə bilərsiniz."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Ekran kilidi ötürülsün?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Cihaz qoruma funksiyası aktiv edilməyəcək. Planşet itərsə, oğurlanarsa və ya sıfırlanarsa, başqalarının bu planşetdən istifadəsinin qarşısını ala bilməyəcəksiniz."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Cihaz qoruma funksiyası aktiv edilməyəcək. Cihaz itərsə, oğurlanarsa və ya sıfırlanarsa, başqalarının bu cihazdan istifadəsinin qarşısını ala bilməyəcəksiniz."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Cihaz qoruma funksiyası aktiv edilməyəcək. Telefon itərsə, oğurlanarsa və ya sıfırlanarsa, başqalarının bu telefondan istifadəsinin qarşısını ala bilməyəcəksiniz."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Maksimum sayda barmaq izi əlavə etmisiniz"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Daha artıq barmaq izi əlavə edilə bilməz"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Bütün barmaq izləri silinsin?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"\"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" barmaq izini silin"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Bu barmaq izini silmək istəyirsiniz?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Telefonun kilidini açmaq, alışları təsdiqləmək və ya onunla tətbiqlərə daxil olmaq üçün barmaq izini istifadə edə bilməyəcəksiniz"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"İş profilini açmaq, alışları təsdiq etmək və ya iş tətbiqlərinə daxil olmaq üçün barmaq izindən istifadə edə bilməyəcəksiniz"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Bəli, silin"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Planşetinizi qoruyun"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Cihazınızı qoruyun"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Telefonunuzu qoruyun"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Əlavə edilmiş təhlükəsizlik üçün, arxa fon ekran kilidini quraşdırın."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Əlavə təhlükəsizlik üçün arxa fon ekran kilidi ayarlayın"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Cihazın qorunması xüsusiyyətlərini aktivləşdirməklə, icazəniz olmadan başqalarının bu planşetdən istifadəsinə mane olun. İsifadə etmək istədiyiniz ekran kilidini seçin."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Cihazın qorunması xüsusiyyətlərini aktivləşdirməklə, icazəniz olmadan başqalarının bu cihazdan istifadəsinə mane olun. İsifadə etmək istədiyiniz ekran kilidini seçin."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Cihazın qorunması xüsusiyyətlərini aktivləşdirməklə, icazəniz olmadan başqalarının bu telefondan istifadəsinə mane olun. İsifadə etmək istədiyiniz ekran kilidini seçin."</string>
@@ -497,37 +502,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Cihazın qorunması aradan qaldırılsın?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Profil qorunması silinsin?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Cihaz müdafiə funksiyaları model olmadan işləməyəcək."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Cihaz müdafiə funksiyaları model olmadan işləməyəcək.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Cihaz qoruma funksiyaları model olmadan işləməyəcək.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Yaddaşda olan barmaq iziniz də cihazdan silinəcək və onunla telefonunuzun kilidini aça, satışlara icazə verə və ya tətbiqlərdə qeydiyyatdan keçə bilməyəcəksiniz."</string>
+</xliff:g>Yadda saxlanılmış barmaq izi də cihazdan silinəcək və onunla telefonunuzun kilidini aça, satınalmalara icazə verə və ya tətbiqlərdə qeydiyyatdan keçə bilməyəcəksiniz."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Cihaz müdafiə funksiyaları PİN kodunuz olmadan işləməyəcək."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Cihaz müdafiə funksiyaları PİN kodunuz olmadan işləməyəcək.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Cihaz qoruma funksiyaları PIN kod olmadan işləməyəcək.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Yaddaşda olan barmaq iziniz də cihazdan silinəcək və onunla telefonunuzun kilidini aça, satışlara icazə verə və ya tətbiqlərdə qeydiyyatdan keçə bilməyəcəksiniz."</string>
+</xliff:g>Yadda saxlanılmış barmaq izi də cihazdan silinəcək və onunla telefonunuzun kilidini aça, satınalmalara icazə verə və ya tətbiqlərdə qeydiyyatdan keçə bilməyəcəksiniz."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Cihaz müdafiə funksiyaları parol olmadan işləməyəcək."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Cihaz müdafiə funksiyaları parol olmadan işləməyəcək. <xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Cihaz qoruma funksiyaları parol olmadan işləməyəcək.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Yaddaşda olan barmaq iziniz də cihazdan silinəcək və onunla telefonunuzun kilidini aça, satışlara icazə verə və ya tətbiqlərdə qeydiyyatdan keçə bilməyəcəksiniz."</string>
+</xliff:g>Yadda saxlanılmış barmaq izi də cihazdan silinəcək və onunla telefonunuzun kilidini aça, satınalmalara icazə verə və ya tətbiqlərdə qeydiyyatdan keçə bilməyəcəksiniz."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Cihaz müdafiə funksiyaları ekran kilidi olmadan işləməyəcək."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Cihaz müdafiə funksiyaları ekran kilidi olmadan işləməyəcək.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Cihaz qoruma funksiyaları ekran kilidi olmadan işləməyəcək.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Yaddaşda olan barmaq iziniz də cihazdan silinəcək və siz onunla telefonunuzun kilidini aça, satışlara icazə verə və ya tətbiqlərdə qeydiyyatdan keçə bilməyəcəksiniz."</string>
+</xliff:g>Yadda saxlanılmış barmaq izi də cihazdan silinəcək və onunla telefonunuzun kilidini aça, satınalmalara icazə verə və ya tətbiqlərdə qeydiyyatdan keçə bilməyəcəksiniz."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Profil müdafiə funksiyaları model olmadan işləməyəcək."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Profil müdafiə funksiyaları model olmadan işləməyəcək.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Profil qoruma funksiyaları model olmadan işləməyəcək.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Yaddaşda olan barmaq iziniz də profildən silinəcək və onunla profilinizin kilidini aça, satışlara icazə verə və ya tətbiqlərdə qeydiyyatdan keçə bilməyəcəksiniz.\""</string>
+</xliff:g>Yadda saxlanılmış barmaq izi də profildən silinəcək və onunla profilinizin kilidini aça, satınalmalara icazə verə və ya tətbiqlərdə qeydiyyatdan keçə bilməyəcəksiniz."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Profil müdafiə funksiyaları PİN kodunuz olmadan işləməyəcək."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Profil müdafiə funksiyaları PİN kodunuz olmadan işləməyəcək.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Profil qoruma funksiyaları PIN kod olmadan işləməyəcək.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Yaddaşda olan barmaq iziniz də profildən silinəcək və onunla profilinizin kilidini aça, satışlara icazə verə və ya tətbiqlərdə qeydiyyatdan keçə bilməyəcəksiniz.\""</string>
+</xliff:g>Yadda saxlanılmış barmaq izi də profildən silinəcək və onunla profilinizin kilidini aça, satınalmalara icazə verə və ya tətbiqlərdə qeydiyyatdan keçə bilməyəcəksiniz."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Profil müdafiə funksiyaları parolunuz olmadan işləməyəcək."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Profil müdafiə funksiyaları parol olmadan işləməyəcək.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Profil qoruma funksiyaları parol olmadan işləməyəcək.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Yaddaşda olan barmaq iziniz də profildən silinəcək və onunla profilinizin kilidini aça, satışlara icazə verə və ya tətbiqlərdə qeydiyyatdan keçə bilməyəcəksiniz.\""</string>
+</xliff:g>Yadda saxlanılmış barmaq izi də profildən silinəcək və onunla profilinizin kilidini aça, satınalmalara icazə verə və ya tətbiqlərdə qeydiyyatdan keçə bilməyəcəksiniz."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Cihaz qorunması xüsusiyyətləri ekran kilidi olmadan işləməyəcək."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Profil müdafiə funksiyaları ekran kilidi olmadan işləməyəcək.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Profil qoruma funksiyaları ekran kilidi olmadan işləməyəcək.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Yaddaşda olan barmaq iziniz də profildən silinəcək və siz onunla profilinizin kilidini aça, satışlara icazə verə və ya tətbiqlərdə qeydiyyatdan keçə bilməyəcəksiniz.\""</string>
+</xliff:g>Yadda saxlanılmış barmaq izi də profildən silinəcək və onunla profilinizin kilidini aça, satınalmalara icazə verə və ya tətbiqlərdə qeydiyyatdan keçə bilməyəcəksiniz."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Bəli, silin"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Kilidi açma modelini dəyişin"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Kilidi açma PIN\'ini dəyişin"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Artan, azalan və ya təkrarlanan rəqəm ardıcıllığı qadağandır"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Ləğv et"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Təmizləyin"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Ləğv et"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Növbəti"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Quraşdırma tamamlandı."</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Əlçatımlı WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS mövcuddur)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Şəbəkə parolunuzu daxil edin"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Operator Wi‑Fi şəbəkəsi"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> vasitəsilə qoşulun"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Yerləşmə dəqiqliyini təkmilləşdirmək və digər məqsədlər üçün Wi-Fi qapalı olsa da belə <xliff:g id="APP_NAME">%1$s</xliff:g> tətbiqi şəbəkə skanını yandırmaq istəyir. \n \n Skan etmək istəyən bütün tətbiqlərə icazə verilsin?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Bunu söndürmək üçün daşma menyuda Qabaqcıl bölməsinə daxil olun."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"İcazə verin"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Qoşul"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Şəbəkəyə qoşulmaq alınmadı"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Unut"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Dəyişdirin"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Şəbəkəni unutmaq alınmadı"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Yadda saxla"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Şəbəkəni yadda saxlamaq alınmadı"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Qabaqcıl Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC ünvanı"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP ünvanı"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Şəbəkə haqqında məlumat"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Alt şəbəkə maskası"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 ünvanları"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Dəvət ləğv olunsun?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g> ilə bağlantı dəvətini ləğv etmək istədiyinizə əminsiniz?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Bu qrup unudulsun?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Portativ Wi-Fi hotspot"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi hotspot"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"İnternet və ya kontent digər cihazlarla paylaşılmır"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Bu planşetin internet bağlantısı hotspot vasitəsilə paylaşılır"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Bu telefonun internet bağlantısı hotspot vasitəsilə paylaşılır"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Tətbiq kontenti paylaşır. İnternet bağlantısını paylaşmaq üçün hotspotu deaktiv, sonra aktiv edin"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi adı"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Hotspot adı"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> aktiv edilir..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Digər cihazlar <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> şəbəkəsinə qoşula bilər"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi parolu"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Hotspot parolu"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP Band"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Digər cihazlara Wi‑Fi şəbəkəsi yaratmaq üçün hotspot istifadə edin. Hotspot mobil data bağlantısından istifadə edərərk İnternet təmin edir. Əlavə mobil data xərcləri tətbiq edilə bilər."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Tətbiq yaxınlıqdakı cihazlarla kontenti paylaşmaq üçün hotspot yarada bilər."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Wi‑Fi istifadə edərək zəng etsəniz, ünvan fövqəladə xidmətlər tərəfindən Sizin məkanınız kimi istifadə ediləcək"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Göstər"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Səs"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Həcmlər"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Axtarış"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Axtarış parametrləri və tarixçəni idarə edin"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nəticə yoxdur"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Tarixçəni təmizləyin"</string>
     <string name="display_settings" msgid="7965901687241669598">"Göstər"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Avtodönüşlü ekran"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Canlı rənglər"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Defolt APN ayarları bərpa olunur."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Sıfırlayın"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Varsayılan APN ayarlarının sıfırlanması tamamlandı."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Sıfırlayın"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Şəbəkə ayarları sıfırlanması"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Seçimləri sıfırlayın"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Şəbəkə, tətbiqlər və ya cihazı sıfırlamaq mümkündür"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi, mobil və Bluetooth\'u sıfırlayın"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Bununla bütün şəbəkə ayarları sıfırlanacaq, bura daxildir:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobil data"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Ayarları sıfırlayın"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Bütün şəbəkə ayarları sıfırlansın? Bu əməliyyatı geri qaytara bilməzsiniz!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Sıfırlansın?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Şəbəkə sıfırlaması bu istifadəçi üçün əlçatan deyil"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Şəbəkə ayarları sıfırlandı"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Data zavod sıfırlaması"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> hesab sıfırlanacaq</item>
-      <item quantity="one">1 hesab sıfırlanacaq</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Daxili yaddaş və bütün data sıfırlanacaq"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Bütün datanı silin (fabrika sıfırlaması)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Bu, planşetinizdən bunları siləcək: "<b>"daxili yaddaş"</b>", həmçinin:\n\n"<li>"Google hesabınızı"</li>\n<li>"Sistem və tətbiq data və ayarlarını"</li>\n<li>"Endirilmiş tətbiqləri"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Bu telefonunuzun "<b>"daxili yaddaşından"</b>" bütün datanı siləcək, bura daxildir: \n\n"<li>"Google hesabınız"</li>\n<li>"Sistem və tətbiq məlumatları və parametrləri"</li>\n<li>"Endirilmiş tətbiqlər"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Hazırda bu hesablara daxil olmusunuz:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Təhlükəsizlik məlumatı"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Sizin data bağlantınız yoxdur. Bu informasiyanı indi görüntüləmək üçün, internetə qoşulu olan istənilən kompüterdən %s daxil olun."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Yüklənir…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Parolunuzu seçin"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ekran kilidi ayarlayın"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Təhlükəsizlik üçün parol ayarlayın"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Barmaq izi üçün parol seçin"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Modelinizi seçin"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Barmaq izi üçün nümunə seçin"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PİN seçin"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Təhlükəsizlik üçün PIN ayarlayın"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Barmaq izi üçün PIN ayarlayın"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Parolu təsdiq edin"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Parolu yenidən daxil edin."</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Modeli təsdiq edin"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PİN kodunuzu təsdiq edin"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"PIN\'i yenidən daxil edin"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Parollar uyğun gəlmir"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-lər üst-üstə düşmür"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Kilid açma seçimi"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Davam etmək üçün iş modelinizi istifadə edin"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Davam etmək üçün iş PİN kodunu daxil edin"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Davam etmək üçün iş parolunu daxil edin"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Davam etmək üçün cihazınızın kilid modelini daxil edin. Cihaz yeniden başladıqdan sonra tələb olunur."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Davam etmək üçün cihazınızın PİN kodunu daxil edin. Cihaz yeniden başladıqdan sonra tələb olunur."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Davam etmək üçün cihazınızın parolunu daxil edin. Cihaz yeniden başladıqdan sonra tələb olunur."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Davam etmək üçün iş kilidi modelini daxil edin. Cihaz yeniden başladıqdan sonra tələb olunur."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Davam etmək üçün iş PİN kodunu daxil edin. Cihaz yeniden başladıqdan sonra tələb olunur."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Davam etmək üçün iş parolunu daxil edin. Cihaz yeniden başladıqdan sonra tələb olunur."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Əlavə edilmiş təhlükəsizlik üçün cihaz modelini istifadə edin"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Əlavə edilmiş təhlükəsizlik üçün cihazın PIN kodunu daxil edin"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Əlavə edilmiş təhlükəsizlik üçün cihaz parolunu daxil edin"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Əlavə edilmiş təhlükəsizlik üçün iş modelini istifadə edin"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Əlavə edilmiş təhlükəsizlik üçün iş PIN kodunu daxil edin"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Əlavə edilmiş təhlükəsizlik üçün iş parolunu daxil edin"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Telefonunuz zavod ayarlarına sıfırlanıb. Telefondan istifadə etmək üçün əvvəlki nümunəni daxil edin."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Telefonunuz zavod ayarlarına sıfırlanıb. Telefondan istifadə etmək üçün əvvəlki PIN kodu daxil edin."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Telefonunuz zavod ayarlarına sıfırlanıb. Telefondan istifadə etmək üçün əvvəlki parolu daxil edin."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Nümunəni doğrulayın"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"PIN kodu doğrulayın"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Parolu doğrulayın"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN səhvdir"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Yanlış parol"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Yanlış model"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Widget yaradın və giriş icazəsi verin?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Vidcet yaratdığınızdan sonra, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> göstərdiyi bütün dataya daxil ola bilər."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> üçün widget yaratmaq və onların məlumatlarını əldə etməyə həmişə icazə verir"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>g <xliff:g id="HOURS">%2$d</xliff:g>s <xliff:g id="MINUTES">%3$d</xliff:g>d <xliff:g id="SECONDS">%4$d</xliff:g>sn"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>s <xliff:g id="MINUTES">%2$d</xliff:g>d <xliff:g id="SECONDS">%3$d</xliff:g>san"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> dq <xliff:g id="SECONDS">%2$d</xliff:g> sn"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>sn"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>g <xliff:g id="HOURS">%2$d</xliff:g>s <xliff:g id="MINUTES">%3$d</xliff:g>d"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>s <xliff:g id="MINUTES">%2$d</xliff:g>d"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>d"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"İstifadəçi statistikası"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"İstifadəçi statistikası"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sıralayın"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Ekran oxuyucuları, görüntü, bağlantı nəzarəti"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Görünüş Ayarları"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Bu cihazı ehtiyacınıza uyğun fərdiləşdirə bilərsiniz. Bu əlçatımlıq xüsusiyyətləri daha sonra Ayarlardan dəyişdirilə bilər."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Şrift ölçüsünü böyüdün"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Şriftin ölçüsünü dəyişin"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Ekran oxuyucuları"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio və ekran mətni"</string>
     <string name="display_category_title" msgid="685461049938269166">"Görüntü"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Yaxınlaşdırmaq üçün"</b>" ekrana 3 dəfə cəld klikləyin.\n"<ul><li>"Sürüşdürmək üçün 2 və ya daha çox barmağınızla çəkin"</li>\n<li>"Yaxınlaşdırmağı tənzimləmək üçün 2 və ya daha çox barmağınızla sürüşdürün"</li></ul>\n\n<b>"Müvəqqəti böyütmək üçün"</b>" ekrana 3 dəfə cəld vurun və üçüncü klikdə barmağınızı basıb saxlayın.\n"<ul><li>"Ekranda hərəkət etmək üçün çəkin"</li>\n<li>"Uzaqlaşdırmaq üçün barmağınızı qaldırın"</li></ul>\n\n"Klaviatura və naviqasiya panelində böyüdə bilməzsiniz."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Böyütmə aktiv olduqda cəld böyütmək üçün ekranın aşağısında olan Əlçatımlılıq düyməsini istifadə edin.\n\n"<b>"Yaxınlaşdırmaq üçün"</b>" Əlçatımlılıq düyməsinə klikləyin daha sonra ekranda istənilən yerə klikləyin.\n"<ul><li>"Sürüşdürmək üçün 2 və daha çox barmağınızı çəkin"</li>\n<li>"Yaxınlaşdırmanı tənzimləmək üçün 2 və ya daha çox barmaqla sürüşdürün"</li></ul>\n\n<b>"Müvəqqəti böyütmək üçün"</b>" Əlçatımlılıq düyməsinə klikləyin daha sonra ekranda istənilən bir yerə basıb saxlayın.\n"<ul><li>"Ekranda hərəkət etmək üçün çəkin"</li>\n<li>"Uzaqlaşdırmaq üçün barmağınızı qaldırın"</li></ul>\n\n"Klaviatura və naviqasiya panelində yaxınlaşdıra bilməzsiniz."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Əlçatımlılıq düyməsi <xliff:g id="SERVICE">%1$s</xliff:g> xidmətinə ayarlanıb. Böyütməni istifadə etmək üçün Əlçatımlılıq düyməsinə toxunaraq basıb saxlayın, daha sonra böyütmə seçin."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Əlçatımlıq qısayolu"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Səs düyməsi qısayolu"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Qısa yol xidməti"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Ekran kilidindən icazə verin"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Qısa yol aktiv olduqda əlçatımlılıq funksiyasına başlamaq üçün hər iki səs düyməsinə toxunaraq 3 saniyə basıb saxlaya bilərsiniz."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Qısayol aktiv olduqda əlçatımlılıq funksiyasına başlamaq üçün 3 saniyədə hər iki səs düyməsini basın."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Yüksək kontrastlı mətn"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Ekran böyüdücünü avtomatik güncəlləyin"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Tətbiq keçidlərində ekran böyüdücünü güncəlləyin"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Performansa təsir edə bilər"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Göstərici hərəkəti dayandırdıqdan sonra klikləyin"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Klikləmədən əvvəl gözləyin"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"AKTİV"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DEAKTİV"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Sürətli Ayarlarda Göstər"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> ədəddın <xliff:g id="TOTAL">%2$d</xliff:g> seçildi"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g> ədəddən <xliff:g id="NUMBER">%1$s</xliff:g> qədər"</string>
     <string name="select_all" msgid="1562774643280376715">"Hamısını seç"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Planları idarə edin"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Data istifadəsi"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Tətbiq data istifadəsi"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operator data hesablanması cihazınızdakından fərqli ola bilər."</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobil şəbəkələr"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Ölçülmüş Wi‑Fi şəbəkələri"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Ölçülmüş şəbəkələri seçmək üçün Wi‑Fi aktiv olmalıdır."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Avtomatik"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Ödənişli"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Ödənişsiz"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Operator data hesablanması cihazınızdakından fərqli ola bilər."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Təcili zəng"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Zəngə geri qayıt"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Çağrı Meneceri"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Təcili yayımlar"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Həyəcan siqnalı"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Şəbəkə operatorları"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Giriş nöqtəsi adları"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Genişlənmiş 4G LTE Rejimi"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Bunun üçün seçilmiş SIM:"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Hər dəfə soruşun"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Seçim tələb olunur"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"SIM seçimi"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Ayarlar"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">%d gizli element göstərin</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Tətbiq bildirişləri"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Bildiriş kateqoriyası"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Əhəmiyyət"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Tətbiqin öhdəsinə buraxın"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Səsə icazə verin"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Bildirişləri heç vaxt göstərməyin"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Səs və ya vizual kəsintisiz"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Səs yoxdur"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Səsli"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Səsli və ekranda pəncərə ilə"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Ekrana toxunun"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Aşağı"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Orta"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Yüksək"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Vacib"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Səsə icazə verin"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Səs, vibrasiyanı deaktiv edin və ya bu bildirişlərə cari ekranınızda baxın."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Kəsintilərə icazə verin"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Tətbiqin ekranda səs çıxarmasına, vibrasiya etməsinə və/və ya bildiriş göstərməsinə icazə verin"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Az əhəmiyyətli"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Orta əhəmiyyətli"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Çox əhəmiyyətli"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"şiş şəkil içində"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Şəkil-içində-şəkil"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Şəkil içində şəkil icazəsi"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Tətbiq açıq olanda və ya tətbiqdən çıxdıqdan sonra (məsələn, videoya baxmağa davam etmək üçün) bu tətbiqə şəkil içində şəkil pəncərəsi yaratmağa icazə verin. Bu pəncərə istifadə etdiyiniz digər tətbiqlərin üstündə görüntülənəcək."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Tətbiq açıq olanda və ya tətbiqdən çıxdıqdan sonra (məsələn, videoya baxmağa davam etmək üçün) bu tətbiqə şəkil içində şəkil pəncərəsi yaratmağa icazə verin. Bu pəncərə istifadə etdiyiniz digər tətbiqlərin üstündə görüntülənəcək."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"\"Narahat etməyin\" girişi"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Heç bir tətbiq \"Narahat etməyin\" girişi sorğusu göndərməyib"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Tətbiqlər endirilir..."</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Faylların köçürülməsi"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Fotoların köçürülməsi (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Cihazın MIDI kimi istifadəsi"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS Aynalama"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Arxa fon yoxlaması"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Tam arxa fon girişi"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Ekrandan mətn istifadə edin"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Gecə İşığı cədvəlini ayarlayın"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Solğun ekran kəhrabası"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Gecə İşığı aktivdir"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Ekran kəhrəba rəngi çalarındandır. Bu, yuxuya getməyinizə kömək edə bilər."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Təkliflər"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Serinləşdirici ekran rənglərini istifadə edin"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Rəng dəyişikliyini tətbiq etmək üçün ekranı söndürün"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telefoniya monitoruna dəyişikliyi tətbiq etmək üçün cihazı yenidən yükləyin"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Kamera HAL HDR+ dəyişikliyi əlavə etmək üçün cihazı yenidən işə salın"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kamera Lazer Sensoru"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Avtomatik sistem güncəlləmələri"</string>
     <string name="usage" msgid="2977875522080448986">"İstifadə"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobil data istifadəsi"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Data xəbərdarlığı"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Data limiti ayarlayın"</string>
     <string name="data_limit" msgid="1885406964934590552">"Data limiti"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> arasında <xliff:g id="ID_1">%1$s</xliff:g> istifadə edildi"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g> aralığında <xliff:g id="ID_1">%1$s</xliff:g> data istifadə edildi"</string>
     <string name="configure" msgid="1029654422228677273">"Konfiqurasiya edin"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Digər tətbiqlər istifadəyə əlavə edildi"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Silin və çevirin"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager reytinq limitini sıfırlayın"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager reytinq limit sıfırlandı"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Ekran kilidi bildirişlərinə nəzarət edin"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Kilid ekranında nəzarət məlumatı"</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="8483187649355540109">"Dəstək və məsləhət"</string>
@@ -3487,7 +3504,7 @@
     <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>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium SMS müəyyən məbləğ tuta bilər və mobil operator fakturasına əlavə oluna bilər. Tətbiq üçün icazəni aktiv etsəniz, həmin tətbiqdən istifadə edərək, Premium SMS göndərə biləcəksiniz."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Premium SMS girişi"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Digər cihazlara görünmür"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Deaktiv"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> cihazına qoşuldu"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Bir çox cihaza qoşuldu"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Sistem İİ demo rejimi"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Ani tətbiqlər"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Hətta quraşdırılmasa belə, linki tətbiqlərdə açın"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Ani tətbiqlər"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Ani tətbiq hesabı"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Ani Tətbiq seçimləri"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Quraşdırılmış tətbiqlər"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Yaddaşınız indi yaddaş meneceri tərəfindən idarə olunur"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> üçün hesablar"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Həmişə aktiv VPN şəxsi profilinizdə yandırıldı"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Həmişə aktiv VPN iş profilinizdə yandırıldı"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Qlobal HTTP proksi ayarlandı"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Etibarlı kredensiallar"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Etibarlı kredensiallar"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Şəxsi profilinizdəki etibarlı kredensiallar"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"İş profilinizdəki etibarlı kredensiallar"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Minimum <xliff:g id="COUNT_1">%d</xliff:g> Kanada sertifikatı</item>
       <item quantity="one">Minimum <xliff:g id="COUNT_0">%d</xliff:g> Kanada sertifikatı</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operator Təchizat Məlumatı"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Operator Təchizatlanmasını Tətikləyin"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Yeni və maraqlı olan nədir?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Ən çox istifadə olunan 5 funksiyanı yoxlayın"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Yeni telefonunuz ilə tanış olun"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Yeni planşetiniz ilə tanış olun"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Yeni cihazınız ilə tanış olun"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Bu funksiya artıq bu cihazda əlçatan deyil"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS qeydiyyat statusu"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Qeydiyyatlı"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Qeydiyyatsız"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 1f05712..43c5f31 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -23,6 +23,7 @@
     <string name="deny" msgid="6947806159746484865">"Odbij"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Zatvori"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Prebaci na"</string>
+    <string name="device_info_default" msgid="7847265875578739287">"Nepoznato"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Treba da obavite još <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> korak da biste postali programer.</item>
       <item quantity="few">Treba da obavite još <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> koraka da biste postali programer.</item>
@@ -108,26 +109,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Skeniraj za uređaje"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Preimenuj ovaj uređaj"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Preimenuj"</string>
-    <!-- no translation found for bluetooth_disconnect_title (7830252930348734303) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_all_profiles (8208712728668714199) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_all_profiles (6611038575213485336) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_all_profiles (3995834526315103965) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_dialog_ok (3308586619539119106) -->
-    <skip />
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Prekidate vezu sa uređajem?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Telefon će prekinuti vezu sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Tablet će prekinuti vezu sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Uređaj će prekinuti vezu sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Prekini vezu"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Nemate dozvolu za promenu podešavanja Bluetooth-a."</string>
-    <!-- no translation found for bluetooth_pairing_pref_title (7429413067477968637) -->
-    <skip />
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Upari novi uređaj"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> je vidljiv uređajima u blizini dok su Bluetooth podešavanja otvorena."</string>
-    <!-- no translation found for bluetooth_footer_mac_message (1109366350000220283) -->
-    <skip />
-    <!-- no translation found for bluetooth_footer_mac_message (6807634484499166486) -->
-    <skip />
-    <!-- no translation found for bluetooth_footer_mac_message (8413944740341742061) -->
-    <skip />
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Bluetooth adresa telefona: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Bluetooth adresa tableta: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Bluetooth adresa uređaja: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Želite li da prekinete vezu sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Emitovanje"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Želite li da onemogućite profil?"</string>
@@ -139,8 +131,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Zahtev za Bluetooth uparivanje"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Zahtev za uparivanje"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Dodirnite da biste uparili sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
-    <skip />
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Primljene datoteke"</string>
     <string name="device_picker" msgid="4978696506172252813">"Izaberite Bluetooth uređaj"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi da uključi Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi da isključi Bluetooth"</string>
@@ -176,11 +167,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s želi da pristupi porukama. Želite li da odobrite pristup za %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Zahtev za pristup SIM kartici"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> želi da pristupa SIM kartici. Odobravanje pristupa SIM kartici će onemogućiti vezu za prenos podataka na uređaju dok traje povezivanje. Dajte pristup uređaju <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
-    <skip />
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Drugim uređajima vidljiv kao „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Uređaji"</string>
-    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
-    <skip />
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Uparite novi uređaj"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum i vreme"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Izbor vremenske zone"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -380,55 +369,39 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Otključajte otiskom prsta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Koristite otisak prsta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"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."</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_message_unlock_disabled (1550756694054944874) -->
-    <skip />
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_message_setup (6817326798834882531) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"Otključavajte telefon ili odobravajte kupovine pomoću otiska prsta.\n\nNapomena: Ne možete da otključavate ovaj uređaj pomoću otiska prsta. Više informacija zatražite od administratora organizacije."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"Otključavajte telefon ili odobravajte kupovine pomoću otiska prsta.\n\nNapomena: Otisak prsta može da bude manje bezbedan od jakog šablona ili PIN-a."</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>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_continue_setup (1961957425135180242) -->
-    <skip />
-    <!-- no translation found for lock_screen_intro_skip_dialog_text_frp (1581834104051243425) -->
-    <skip />
-    <!-- no translation found for lock_screen_intro_skip_dialog_text_frp (4629503416877189572) -->
-    <skip />
-    <!-- no translation found for lock_screen_intro_skip_dialog_text_frp (2423428240245737909) -->
-    <skip />
-    <!-- no translation found for lock_screen_intro_skip_dialog_text (5219287483885558525) -->
-    <skip />
-    <!-- no translation found for lock_screen_intro_skip_dialog_text (1466238255429527112) -->
-    <skip />
-    <!-- no translation found for lock_screen_intro_skip_dialog_text (3008526710555416125) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Dalje"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Funkcije zaštite uređaja neće biti uključene. Nećete moći da sprečite druge ljude da koriste ovaj tablet ako bude izgubljen, ukraden ili resetovan."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Funkcije zaštite uređaja neće biti uključene. Nećete moći da sprečite druge ljude da koriste ovaj uređaj ako bude izgubljen, ukraden ili resetovan."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Funkcije zaštite uređaja neće biti uključene. Nećete moći da sprečite druge ljude da koriste ovaj telefon ako bude izgubljen, ukraden ili resetovan."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Funkcije zaštite uređaja neće biti uključene. Nećete moći da sprečite druge ljude da koriste ovaj tablet ako bude izgubljen ili ukraden."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Funkcije zaštite uređaja neće biti uključene. Nećete moći da sprečite druge ljude da koriste ovaj uređaj ako bude izgubljen ili ukraden."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Funkcije zaštite uređaja neće biti uključene. Nećete moći da sprečite druge ljude da koriste ovaj telefon ako bude izgubljen ili ukraden."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ipak preskoči"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Vrati se"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_find_sensor_title (3051496861358227199) -->
-    <skip />
-    <!-- no translation found for security_settings_fingerprint_enroll_find_sensor_message (8793966374365960368) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Dodirnite senzor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Nalazi se na zadnjoj strani telefona. Koristite kažiprst."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustracija sa uređajem i lokacijom senzora za otisak prsta"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Naziv"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Potvrdi"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Izbriši"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Dodirnite senzor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Stavite prst na senzor i podignite ga kada osetite vibraciju"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (2819679722403209778) -->
-    <skip />
-    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (6158989350522518586) -->
-    <skip />
-    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (7567276170287972230) -->
-    <skip />
-    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (4796715961273420536) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Podignite, pa opet dodirnite"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Nastavite da podižete prst da biste dodali različite delove otiska prsta"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Otisak prsta je dodat"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Kada vidite ovu ikonu, koristite otisak prsta radi identifikacije ili odobravanja kupovina."</string>
+    <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Uradiću to kasnije"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Preskočiti podešavanje otiska prsta?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Izabrali ste da koristite otisak prsta kao jedan način za otključavanje telefona. Ako sada preskočite, moraćete kasnije da obavite ovo podešavanje. Za podešavanje je potrebno samo oko minut vremena."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Podesi zaključavanje ekrana"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Gotovo"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ups, to nije senzor"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Dodirnite senzor na zadnjoj strani telefona. Koristite kažiprst."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registracija nije završena"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Vremensko ograničenje za registraciju otiska prsta je isteklo. Probajte ponovo."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Registracija otiska prsta nije uspela. Probajte ponovo ili koristite drugi prst."</string>
@@ -441,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Dodali ste maksimalan broj otisaka prstiju"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Ne možete da dodate još otisaka prstiju"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Ukloniti sve otiske prstiju?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Uklonite „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Želite li da izbrišete ovaj otisak prsta?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Nećete moći da otključavate telefon, odobravate kupovine niti da se prijavljujete u aplikacije pomoću otisaka prstiju"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Nećete moći da otključavate profil za Work, odobravate kupovine niti da se prijavljujete u aplikacije za Work pomoću otisaka prstiju"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Da, ukloni"</string>
@@ -527,53 +502,53 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Želite li da uklonite zaštitu uređaja?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Želite li da uklonite zaštitu profila?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Funkcije za zaštitu uređaja neće funkcionisati bez šablona."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Funkcije za zaštitu uređaja neće funkcionisati bez šablona.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Funkcije zaštite uređaja neće raditi bez šablona.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Sačuvani otisci prstiju će takođe biti uklonjeni sa ovog uređaja, a vi nećete moći da otključate telefon, ovlastite kupovine niti da se prijavite u aplikacije pomoću njih."</string>
+</xliff:g>Sačuvani otisci prstiju će takođe biti uklonjeni sa ovog uređaja, a vi nećete moći da otključavate telefon, da odobravate kupovine niti da se prijavljujete u aplikacije pomoću njih."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Funkcije za zaštitu uređaja neće funkcionisati bez PIN-a."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Funkcije za zaštitu uređaja neće funkcionisati bez PIN-a.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Funkcije zaštite uređaja neće raditi bez PIN-a.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Sačuvani otisci prstiju će takođe biti uklonjeni sa ovog uređaja, a vi nećete moći da otključate telefon, ovlastite kupovine niti da se prijavite u aplikacije pomoću njih."</string>
+</xliff:g>Sačuvani otisci prstiju će takođe biti uklonjeni sa ovog uređaja, a vi nećete moći da otključavate telefon, da odobravate kupovine niti da se prijavljujete u aplikacije pomoću njih."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Funkcije za zaštitu uređaja neće funkcionisati bez lozinke."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Funkcije za zaštitu uređaja neće funkcionisati bez lozinke.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Funkcije zaštite uređaja neće raditi bez lozinke.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Sačuvani otisci prstiju će takođe biti uklonjeni sa ovog uređaja, a vi nećete moći da otključate telefon, ovlastite kupovine niti da se prijavite u aplikacije pomoću njih."</string>
+</xliff:g>Sačuvani otisci prstiju će takođe biti uklonjeni sa ovog uređaja, a vi nećete moći da otključavate telefon, da odobravate kupovine niti da se prijavljujete u aplikacije pomoću njih."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Funkcije za zaštitu uređaja neće funkcionisati bez zaključavanja ekrana."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Funkcije za zaštitu uređaja neće funkcionisati bez zaključavanja ekrana.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Funkcije zaštite uređaja neće raditi bez zaključavanja ekrana.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Sačuvani otisci prstiju će takođe biti uklonjeni sa ovog uređaja, a vi nećete moći da otključate telefon, ovlastite kupovine niti da se prijavite u aplikacije pomoću njih."</string>
+</xliff:g>Sačuvani otisci prstiju će takođe biti uklonjeni sa ovog uređaja, a vi nećete moći da otključavate telefon, da odobravate kupovine niti da se prijavljujete u aplikacije pomoću njih."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Funkcije zaštite profila neće funkcionisati bez šablona."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Funkcije zaštite profila neće funkcionisati bez šablona.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Funkcije zaštite profila neće raditi bez šablona.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Sačuvani otisci prstiju će takođe biti uklonjeni sa ovog profila i nećete moći da otključavate profil, da odobravate kupovine niti da se prijavljujete u aplikacije pomoću njih."</string>
+</xliff:g>Sačuvani otisci prstiju će takođe biti uklonjeni sa ovog profila, a vi nećete moći da otključavate profil, da odobravate kupovine niti da se prijavljujete u aplikacije pomoću njih."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Funkcije zaštite profila neće funkcionisati bez PIN-a."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Funkcije zaštite profila neće funkcionisati bez PIN-a.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Funkcije zaštite profila neće raditi bez PIN-a.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Sačuvani otisci prstiju će takođe biti uklonjeni sa ovog profila i nećete moći da otključavate profil, da odobravate kupovine niti da se prijavljujete u aplikacije pomoću njih."</string>
+</xliff:g>Sačuvani otisci prstiju će takođe biti uklonjeni sa ovog profila, a vi nećete moći da otključavate profil, da odobravate kupovine niti da se prijavljujete u aplikacije pomoću njih."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Funkcije zaštite profila neće funkcionisati bez lozinke."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Funkcije zaštite profila neće funkcionisati bez lozinke.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Funkcije zaštite profila neće raditi bez lozinke.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Sačuvani otisci prstiju će takođe biti uklonjeni sa ovog profila i nećete moći da otključavate profil, da odobravate kupovine niti da se prijavljujete u aplikacije pomoću njih."</string>
+</xliff:g>Sačuvani otisci prstiju će takođe biti uklonjeni sa ovog profila, a vi nećete moći da otključavate profil, da odobravate kupovine niti da se prijavljujete u aplikacije pomoću njih."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Funkcije zaštite profila neće funkcionisati bez zaključavanja ekrana."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Funkcije zaštite profila neće funkcionisati bez zaključavanja ekrana.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Funkcije zaštite profila neće raditi bez zaključavanja ekrana.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Sačuvani otisci prstiju će takođe biti uklonjeni sa ovog profila i nećete moći da otključavate profil, da odobravate kupovine niti da se prijavljujete u aplikacije pomoću njih."</string>
+</xliff:g>Sačuvani otisci prstiju će takođe biti uklonjeni sa ovog profila, a vi nećete moći da otključavate profil, da odobravate kupovine niti da se prijavljujete u aplikacije pomoću njih."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Da, ukloni"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Promena šablona za otključavanje"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Promena PIN-a za otključavanje"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Promena lozinke za otključavanje"</string>
     <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Probajte ponovo. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>. pokušaj od <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
     <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Izbrisaćemo podatke"</string>
-    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Ako u sledećem pokušaju unesete netačan šablon, izbrisaćemo podatke sa ovog uređaja"</string>
-    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Ako u sledećem pokušaju unesete netačan PIN, izbrisaćemo podatke sa ovog uređaja"</string>
-    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Ako unesete netačnu lozinku pri sledećem pokušaju, izbrisaćemo podatke sa ovog uređaja"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="1688030823464420974">"Ako u sledećem pokušaju unesete netačan šablon, izbrisaćemo podatke sa ovog uređaja"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Ako u sledećem pokušaju unesete netačan PIN, izbrisaćemo podatke sa ovog uređaja"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"Ako unesete netačnu lozinku pri sledećem pokušaju, izbrisaćemo podatke sa ovog uređaja"</string>
     <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Ako u sledećem pokušaju unesete netačan šablon, izbrisaćemo ovog korisnika"</string>
     <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Ako u sledećem pokušaju unesete netačan PIN, izbrisaćemo ovog korisnika"</string>
     <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Ako u sledećem pokušaju unesete netačnu lozinku, izbrisaćemo ovog korisnika"</string>
     <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Ako u sledećem pokušaju unesete netačan šablon, izbrisaćemo profil za Work i njegove podatke"</string>
     <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Ako u sledećem pokušaju unesete netačan PIN, izbrisaćemo profil za Work i njegove podatke"</string>
     <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Ako u sledećem pokušaju unesete netačnu lozinku, izbrisaćemo profil za Work i njegove podatke"</string>
-    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Previše netačnih pokušaja. Izbrisaćemo podatke sa ovog uređaja."</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="5047439819181833824">"Previše netačnih pokušaja. Izbrisaćemo podatke sa ovog uređaja."</string>
     <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Previše netačnih pokušaja. Izbrisaćemo ovog korisnika."</string>
     <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Previše netačnih pokušaja. Izbrisaćemo ovaj profil za Work i njegove podatke."</string>
     <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Odbaci"</string>
@@ -685,22 +660,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Napredni Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Kada je Bluetooth uključen, uređaj može da komunicira sa drugim Bluetooth uređajima u blizini."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Da bi poboljšale tačnost lokacije, sistemske aplikacije i usluge će i dalje prepoznavati Bluetooth uređaje, čak i kada je Bluetooth isključen. Ovo možete da promenite u <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>podešavanjima skeniranja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
-    <!-- no translation found for bluetooth_connect_failed (4500234659813241053) -->
-    <skip />
-    <!-- no translation found for device_details_title (6576953269221085300) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_mac_address (2513724313558236181) -->
-    <skip />
-    <!-- no translation found for bluetooth_unpair_dialog_title (38467834196432400) -->
-    <skip />
-    <!-- no translation found for bluetooth_unpair_dialog_body (9087609557757135712) -->
-    <skip />
-    <!-- no translation found for bluetooth_unpair_dialog_body (7785695793007576501) -->
-    <skip />
-    <!-- no translation found for bluetooth_unpair_dialog_body (251257782642157557) -->
-    <skip />
-    <!-- no translation found for bluetooth_unpair_dialog_forget_confirm_button (3829370108973879006) -->
-    <skip />
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Povezivanje nije uspelo. Pokušajte ponovo."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Detalji o uređaju"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Bluetooth adresa uređaja: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Želite li da zaboravite uređaj?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Telefon neće više biti uparen sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Tablet neće više biti uparen sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Uređaj neće više biti uparen sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Zaboravi uređaj"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Povezivanje sa…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g>neće biti povezan na zvuka medija."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g> neće biti povezan na hendsfri zvuk."</string>
@@ -766,11 +733,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Automatski uključi Wi‑Fi"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi će se ponovo uključiti u blizini sačuvanih mreža visokog kvaliteta, kao što je kućna mreža"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Nedostupno je jer je isključeno Wi‑Fi skeniranje"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Da biste koristili funkciju, izaberite dobavljača ocene mreže"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Izbegavaj loše veze"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Ne koristi Wi-Fi mrežu ako nema dobru internet vezu"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Korišćenje samo onih mreža koje imaju dobru internet vezu"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Povezuj se sa otvorenim mrežama"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Automatski se povezuj sa javnim mrežama visokog kvaliteta"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Da biste koristili funkciju, izaberite dobavljača ocene mreže"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Da biste koristili funkciju, izaberite kompatibilnog dobavljača ocene mreže"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instaliraj sertifikate"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Da bi poboljšale tačnost lokacije, sistemske aplikacije i usluge će i dalje skenirati Wi‑Fi mreže. Ovo možete da promenite u <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>podešavanjima skeniranja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Da biste poboljšali preciznost lokacije, uključite Wi-Fi skeniranje u <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>podešavanjima skeniranja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -853,6 +823,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Ne pružaj"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Ne proveravaj"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Nije naveden nikakav sertifikat. Veza neće biti privatna."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Naziv mreže je predugačak."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Morate da navedete domen."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je dostupan"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je dostupan)"</string>
@@ -921,28 +892,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Želite li da zaboravite ovu grupu?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Prenosni Wi-Fi hotspot"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi hotspot"</string>
-    <!-- no translation found for wifi_hotspot_off_subtext (5466126533609394170) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_tethering_on_subtext (5752490509369962007) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_tethering_on_subtext (6461075246164300670) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_on_local_only_subtext (2068110388011294735) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_name_title (1341735529132128887) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_name_summary_connecting (3378299995508671967) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_name_summary_connected (3888672084861445362) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_password_title (1955592302902091281) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_ap_band_title (1165801173359290681) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_footer_info_regular (1203489406068036455) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_footer_info_local_only (857988412470694109) -->
-    <skip />
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Ni internet ni sadržaj se ne dele sa drugim uređajima"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Internet veza ovog tableta se deli preko hotspota"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Internet veza ovog telefona se deli preko hotspota"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplikacija deli sadržaj. Da biste delili internet vezu, isključite, pa uključite hotspot"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Naziv Wi‑Fi hotspota"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> se uključuje..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Drugi uređaji mogu da se povežu sa hotspotom <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Lozinka za Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Opseg pristupne tačke"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Koristite hotspot da biste napravili Wi‑Fi mrežu za druge uređaje. Hotspot pruža internet pomoću mreže za mobilne podatke. Možda će važiti dodatne tarife za mobilne podatke."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikacije mogu da prave hotspotove za deljenje sadržaja sa obližnjim uređajima."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Uključivanje hotspota…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Isključivanje hotspota..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktivan"</string>
@@ -1047,6 +1007,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nema rezultata"</string>
     <string name="display_settings" msgid="7965901687241669598">"Ekran"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Automatsko rotiranje ekrana"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Živopisne boje"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Promeni položaj automatski prilikom rotiranja tableta"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Automatska promena položaja prilikom rotacije telefona"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Promeni položaj automatski prilikom rotiranja tableta"</string>
@@ -1074,33 +1035,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimizujte nivo osvetljenosti prema svetlu. Možete privremeno da podesite osvetljenost i kad je ova opcija uključena."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Noćno svetlo"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Noćno svetlo daje ekranu žutonarandžastu nijansu. To vam omogućava da lakše pregledate sadržaj ekrana pri prigušenom svetlu i da lakše zaspite."</string>
-    <!-- no translation found for night_display_auto_mode_title (6574111412154833409) -->
-    <skip />
-    <!-- no translation found for night_display_auto_mode_never (2483761922928753400) -->
-    <skip />
-    <!-- no translation found for night_display_auto_mode_custom (2379394568898721765) -->
-    <skip />
-    <!-- no translation found for night_display_auto_mode_twilight (589042813708244059) -->
-    <skip />
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Zakažite"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Ništa"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Uključuje se u željeno vreme"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Uključuje se od sutona do svitanja"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Vreme početka"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Vreme završetka"</string>
-    <!-- no translation found for night_display_status_title (1784041143360286267) -->
-    <skip />
+    <string name="night_display_status_title" msgid="1784041143360286267">"Status"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intenzitet"</string>
     <string name="night_display_summary_off" msgid="1792750041697946539">"Isključeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <!-- no translation found for night_display_summary_off_auto_mode_never (3583590137322963513) -->
-    <skip />
-    <!-- no translation found for night_display_summary_off_auto_mode_custom (6365668239253173208) -->
-    <skip />
-    <!-- no translation found for night_display_summary_off_auto_mode_twilight (3596291693781757392) -->
-    <skip />
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Nikada se ne uključuje automatski"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Uključuje se automatski u <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Uključuje se automatski kada sunce zađe"</string>
     <string name="night_display_summary_on" msgid="1355713529996456744">"Uključeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <!-- no translation found for night_display_summary_on_auto_mode_never (9117830821363119835) -->
-    <skip />
-    <!-- no translation found for night_display_summary_on_auto_mode_custom (5510753572245577263) -->
-    <skip />
-    <!-- no translation found for night_display_summary_on_auto_mode_twilight (852270120144683507) -->
-    <skip />
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Nikada se ne isključuje automatski"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Isključuje se automatski u <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Isključuje se automatski kada sunce izađe"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Spavanje"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekran se isključuje"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Posle <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivnosti"</string>
@@ -1124,19 +1074,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Podešavanja"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatski nivo osvetljenosti"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Podigni za aktivaciju"</string>
-    <!-- no translation found for ambient_display_screen_title (4252755516328775766) -->
-    <skip />
-    <!-- no translation found for ambient_display_screen_summary_always_on (7974004969481877214) -->
-    <skip />
-    <!-- no translation found for ambient_display_screen_summary_notifications (1449570742600868654) -->
-    <skip />
-    <!-- no translation found for ambient_display_category_triggers (4359289754456268573) -->
-    <skip />
-    <!-- no translation found for doze_title (2375510714460456687) -->
-    <skip />
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambijentalni ekran"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Uvek uključeno/veća potrošnja baterije"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nova obaveštenja"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kada da se prikazuje"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Nova obaveštenja"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Probudite ekran kada primite obaveštenja"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Uvek uključeno"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Prikazuje vreme, ikone obaveštenja i druge informacije"</string>
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"Prikazuje vreme, ikone obaveštenja i druge informacije. Veća potrošnja baterije."</string>
     <string name="title_font_size" msgid="4405544325522105222">"Veličina fonta"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Omogućava da tekst bude veći ili manji"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Zaključavanje SIM kartice"</string>
@@ -1393,8 +1338,8 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Vraćanje podrazumevanih podešavanja naziva pristupne tačke."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Resetuj podrazumevano"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Ponovno postavljanje podrazumevanih podešavanja naziva pristupne tačke je završeno"</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Resetuj"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Resetovanje podešavanja mreže"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Opcije za resetovanje"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Resetuj Wi-Fi, mobilnu mrežu i Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Ovim resetujete sva podešavanja mreže, uključujući:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobilne podatke"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Resetuj podešavanja"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Želite li da resetujete sva podešavanja mreže? Ova radnja ne može da se opozove!"</string>
@@ -1402,7 +1347,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Želite da resetujete?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Resetovanje mreže nije dostupno za ovog korisnika"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Podešavanja mreže su resetovana"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Resetovanje na fabrička podešavanja"</string>
+    <string name="master_clear_title" msgid="6617679904229218425">"Izbriši sve podatke (resetovanje na fabrička podešavanja)"</string>
     <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
       <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> nalog će biti resetovan</item>
       <item quantity="few"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> naloga će biti resetovana</item>
@@ -1445,20 +1390,15 @@
     <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>
-    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
-    <skip />
-    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
-    <skip />
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Deljenje internet veze telefona preko USB-a"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Deljenje internet veze tableta preko USB-a"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth privezivanje"</string>
-    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
-    <skip />
-    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
-    <skip />
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Delite internet vezu tableta preko Bluetooth-a"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Delite internet vezu telefona preko Bluetooth-a"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Internet veza uređaja <xliff:g id="DEVICE_NAME">%1$d</xliff:g> se deli preko Bluetooth-a"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Privezivanje na više od <xliff:g id="MAXCONNECTION">%1$d</xliff:g> uređaja nije moguće."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Internet veza sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> će biti prekinuta."</string>
-    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
-    <skip />
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Koristite hotspot i privezivanje da biste obezbedili internet drugim uređajima pomoću veze za mobilne podatke. Aplikacije mogu da prave hotspotove i za deljenje sadržaja sa obližnjim uređajima."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoć"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobilna mreža"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Tarifni paket za mobilni uređaj"</string>
@@ -1536,8 +1476,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nemate vezu za prenos podataka. Da biste odmah pogledali ove informacije, idite na %s sa bilo kog računara koji je povezan sa internetom."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Učitava se…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Odaberite lozinku"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Podesite lozinku da biste koristili otisak"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Izaberite šablon"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Podesite šablon da biste koristili otisak"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Odaberite PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Podesite PIN da biste koristili otisak"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Potvrdite lozinku"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrdite šablon"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Potvrdite PIN"</string>
@@ -1553,12 +1496,12 @@
     <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_strong_auth_required_device_pattern" msgid="530802132223800623">"Radi veće bezbednosti koristite šablon za uređaj"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Radi veće bezbednosti unesite PIN za uređaj"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Radi veće bezbednosti unesite lozinku za uređaj"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Radi veće bezbednosti koristite šablon za Work"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Radi veće bezbednosti unesite PIN za Work"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Radi veće bezbednosti unesite lozinku za Work"</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>
@@ -1606,12 +1549,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Podešavanja aplikacije"</string>
     <string name="install_applications" msgid="4872012136210802181">"Nepoznati izvori"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Dozvoli sve izvore aplikacija"</string>
-    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
-    <skip />
-    <!-- no translation found for see_all_apps_title (1459400183763114135) -->
-    <skip />
-    <!-- no translation found for recent_app_summary (3366446669844932300) -->
-    <skip />
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Nedavno otvarane aplikacije"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Prikaži sve aplikacije: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"pre <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tablet i lični podaci su podložniji napadu nepoznatih aplikacija. Instaliranjem aplikacija iz ovog izvora prihvatate da ste odgovorni za oštećenja telefona ili gubitak podataka do kojih može da dođe zbog njihovog korišćenja."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefon i lični podaci su podložniji napadu nepoznatih aplikacija. Instaliranjem aplikacija iz ovog izvora prihvatate da ste odgovorni za oštećenja telefona ili gubitak podataka do kojih može da dođe zbog njihovog korišćenja."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Napredna podešavanja"</string>
@@ -1672,7 +1612,6 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Pokretanje"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB memorija"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na SD kartici"</string>
-    <string name="disabled" msgid="9206776641295849915">"Onemogućeno"</string>
     <string name="not_installed" msgid="2797554494953450291">"Nije instal. za ovog korisnika"</string>
     <string name="installed" msgid="3070865169422600098">"Instalirana"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nema aplikacija."</string>
@@ -1782,8 +1721,7 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Želite da zaustavite sistemsku uslugu?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Ako zaustavite ovu uslugu, neke funkcije tableta će možda prestati ispravno da funkcionišu dok ne isključite i 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 ispravno da funkcionišu dok ne isključite i ponovo uključite telefon."</string>
-    <!-- no translation found for language_input_gesture_title (8749227808244881255) -->
-    <skip />
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Jezici, unos i pokreti"</string>
     <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
     <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
     <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
@@ -1867,13 +1805,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Želite li da napravite vidžet i dozvolite pristup?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Kada napravite vidžet, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> može da pristupa svim podacima koje prikazuje."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Uvek dozvoli da <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> pravi vidžete i pristupa njihovim podacima"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>d, <xliff:g id="HOURS">%2$d</xliff:g>s, <xliff:g id="MINUTES">%3$d</xliff:g>min, <xliff:g id="SECONDS">%4$d</xliff:g>sek"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>s, <xliff:g id="MINUTES">%2$d</xliff:g>min, <xliff:g id="SECONDS">%3$d</xliff:g>sek"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>min, <xliff:g id="SECONDS">%2$d</xliff:g>sek"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> sek"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> s <xliff:g id="MINUTES">%3$d</xliff:g> min"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> s <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Statistika korišćenja"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Statistika korišćenja"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sortiraj prema:"</string>
@@ -1885,6 +1816,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Čitači ekrana, ekran, kontrole interakcije"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Podešavanja za vid"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Možete da prilagodite ovaj uređaj prema potrebama. Te funkcije pristupačnosti možete kasnije da promenite u Podešavanjima."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Povećaj veličinu fonta"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Čitači ekrana"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Zvuk i tekst na ekranu"</string>
     <string name="display_category_title" msgid="685461049938269166">"Prikaz"</string>
@@ -1905,10 +1837,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Da biste zumirali"</b>", brzo dodirnite ekran 3 puta.\n"<ul><li>"Prevucite pomoću 2 ili više prstiju da biste pomerali prikaz"</li>\n<li>"Skupite 2 ili više prstiju da biste prilagodili zumiranje"</li></ul>\n\n<b>"Za privremeno zumiranje"</b>" brzo dodirnite ekran 3 puta i zadržite prst pri trećem dodiru.\n"<ul><li>"Prevlačite prstom da biste se kretali po ekranu"</li>\n<li>"Podignite prst da biste umanjili prikaz"</li></ul>\n\n"Ne možete da zumirate tastaturu ni traku za navigaciju."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Kada je uvećanje uključeno, koristite dugme za pristupačnost u dnu ekrana da biste brzo uvećali prikaz.\n\n"<b>"Da biste zumirali"</b>", dodirnite dugme za pristupačnost, pa pritisnite bilo koji deo ekrana.\n"<ul><li>"Prevlačite pomoću 2 ili više prstiju da biste pomerali prikaz"</li>\n<li>"Skupite 2 ili više prstiju da biste prilagodili zumiranje"</li></ul>\n\n<b>"Za privremeno zumiranje"</b>" dodirnite dugme za pristupačnost, pa dodirnite i zadržite bilo koji deo ekrana.\n"<ul><li>"Prevlačite da biste se kretali po ekranu"</li>\n<li>"Podignite prst da biste umanjili prikaz"</li></ul>\n\n"Ne možete da uvećavate tastaturu ili traku za navigaciju."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Dugme za pristupačnost je podešeno na <xliff:g id="SERVICE">%1$s</xliff:g>. Da biste koristili uvećanje, dodirnite i zadržite dugme za pristupačnost, pa izaberite uvećanje."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Prečica za pristupačnost"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Prečica za taster za jačinu zvuka"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Usluga prečice"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Omogući na zaključanom ekranu"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Kada je prečica uključena, možete da pritisnete oba dugmeta za jačinu zvuka i zadržite ih 3 sekunde da biste pokrenuli funkciju pristupačnosti."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Kada je prečica uključena, možete da pritisnete oba tastera za jačinu zvuka i zadržite ih 3 sekunde da biste pokrenuli funkciju pristupačnosti."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Tekst visokog kontrasta"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Automatski ažuriraj uvelič. ekrana"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Ažurira uveličavanje ekrana pri prelazu aplikacija"</string>
@@ -1921,7 +1853,7 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Može da utiče na kvalitet rada"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klik kada pokazivač prestane da se kreće"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Odlaganje pre klika"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
+    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"UKLJUČENO"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ISKLJUČENO"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Prikaži u Brzim podešavanjima"</string>
@@ -2078,46 +2010,29 @@
     <string name="details_subtitle" msgid="32593908269911734">"Korišćenje detalja"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Prilagođavanje korišćenja napajanja"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Sadržani paketi"</string>
-    <!-- no translation found for battery_abnormal_details_title (5469019021857291216) -->
-    <skip />
-    <!-- no translation found for battery_abnormal_wakelock_summary (4326186999058828831) -->
-    <skip />
-    <!-- no translation found for battery_abnormal_wakeup_alarm_summary (644657277875785240) -->
-    <skip />
-    <!-- no translation found for battery_abnormal_location_summary (6552797246798806002) -->
-    <skip />
-    <!-- no translation found for battery_abnormal_apps_summary (792553273248686972) -->
-    <skip />
-    <!-- no translation found for dialog_stop_title (6395127715596746479) -->
-    <skip />
-    <!-- no translation found for dialog_stop_message (9149534230295983971) -->
-    <skip />
-    <!-- no translation found for dialog_stop_message (5702924180465982412) -->
-    <skip />
-    <!-- no translation found for dialog_stop_message (9201053069493107713) -->
-    <skip />
-    <!-- no translation found for dialog_stop_ok (2319777211264004900) -->
-    <skip />
-    <!-- no translation found for dialog_background_check_title (1525936543485084879) -->
-    <skip />
-    <!-- no translation found for dialog_background_check_message (5539009263025812279) -->
-    <skip />
-    <!-- no translation found for dialog_background_check_message (4001747292234087612) -->
-    <skip />
-    <!-- no translation found for dialog_background_check_message (585341224642457664) -->
-    <skip />
-    <!-- no translation found for dialog_background_check_ok (412876934682899659) -->
-    <skip />
-    <!-- no translation found for dialog_location_title (5888917530725874727) -->
-    <skip />
-    <!-- no translation found for dialog_location_message (7684240588903005427) -->
-    <skip />
-    <!-- no translation found for dialog_location_message (7439311770795993356) -->
-    <skip />
-    <!-- no translation found for dialog_location_message (6285773079775018012) -->
-    <skip />
-    <!-- no translation found for dialog_location_ok (4572391197601313986) -->
-    <skip />
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplikacije mnogo troše bateriju"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Ne dozvoljavamo da uređaj pređe u stanje spavanja"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Budimo uređaj u pozadini"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Često traži lokaciju"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Neke aplikacije (<xliff:g id="NUMBER">%1$d</xliff:g>) se čudno ponašaju"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Zaustavljate aplikaciju?"</string>
+    <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Telefon ne može da upravlja baterijom na uobičajen način jer mu <xliff:g id="APP">%1$s</xliff:g> ne dozvoljava da pređe u stanje spavanja.\n\nDa biste rešili ovaj problem, možete da zaustavite tu aplikaciju.\n\nAko se ovo dešava i dalje, možda treba da deinstalirate aplikaciju da biste poboljšali performanse baterije."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Tablet ne može da upravlja baterijom na uobičajen način jer mu <xliff:g id="APP">%1$s</xliff:g> ne dozvoljava da pređe u stanje spavanja.\n\nDa biste rešili ovaj problem, možete da zaustavite tu aplikaciju.\n\nAko se ovo dešava i dalje, možda treba da deinstalirate aplikaciju da biste poboljšali performanse baterije."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Uređaj ne može da upravlja baterijom na uobičajen način jer mu <xliff:g id="APP">%1$s</xliff:g> ne dozvoljava da pređe u stanje spavanja.\n\nDa biste rešili ovaj problem, možete da zaustavite tu aplikaciju.\n\nAko se ovo dešava i dalje, možda treba da deinstalirate aplikaciju da biste poboljšali performanse baterije."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Telefon ne može da upravlja baterijom na uobičajen način jer ga <xliff:g id="APP_0">%1$s</xliff:g> stalno budi.\n\nDa biste rešili ovaj problem, možete da zaustavite aplikaciju <xliff:g id="APP_1">%1$s</xliff:g>.\n\nAko se ovo dešava i dalje, možda treba da deinstalirate aplikaciju da biste poboljšali performanse baterije."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Tablet ne može da upravlja baterijom na uobičajen način jer ga <xliff:g id="APP_0">%1$s</xliff:g> stalno budi.\n\nDa biste rešili ovaj problem, možete da zaustavite aplikaciju <xliff:g id="APP_1">%1$s</xliff:g>.\n\nAko se ovo dešava i dalje, možda treba da deinstalirate aplikaciju da biste poboljšali performanse baterije."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Uređaj ne može da upravlja baterijom na uobičajen način jer ga <xliff:g id="APP_0">%1$s</xliff:g> stalno budi.\n\nDa biste rešili ovaj problem, možete da zaustavite aplikaciju <xliff:g id="APP_1">%1$s</xliff:g>.\n\nAko se ovo dešava i dalje, možda treba da deinstalirate aplikaciju da biste poboljšali performanse baterije."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Zaustavi aplikaciju"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Želite li da isključite korišćenje u pozadini?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Telefon ne može da upravlja baterijom na uobičajen način jer ga <xliff:g id="APP_0">%1$s</xliff:g> stalno budi.\n\nDa biste rešili ovaj problem, možete da zaustavite aplikaciju <xliff:g id="APP_1">%1$s</xliff:g> i sprečite je da radi u pozadini."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Tablet ne može da upravlja baterijom na uobičajen način jer ga <xliff:g id="APP_0">%1$s</xliff:g> stalno budi.\n\nDa biste rešili ovaj problem, možete da zaustavite aplikaciju <xliff:g id="APP_1">%1$s</xliff:g> i sprečite je da radi u pozadini."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Uređaj ne može da upravlja baterijom na uobičajen način jer ga <xliff:g id="APP_0">%1$s</xliff:g> stalno budi.\n\nDa biste rešili ovaj problem, možete da zaustavite aplikaciju <xliff:g id="APP_1">%1$s</xliff:g> i sprečite je da radi u pozadini."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Isključi"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Želite li da isključite lokaciju?"</string>
+    <string name="dialog_location_message" product="default" msgid="7774807745601479888">"Telefon ne može da upravlja baterijom na uobičajen način jer aplikacija <xliff:g id="APP">%1$s</xliff:g> stalno traži lokaciju čak i kada ne koristite tu aplikaciju.\n\nDa biste rešili ovaj problem, možete da isključite lokaciju za ovu aplikaciju."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Tablet ne može da upravlja baterijom na uobičajen način jer aplikacija <xliff:g id="APP">%1$s</xliff:g> stalno traži lokaciju čak i kada ne koristite tu aplikaciju.\n\nDa biste rešili ovaj problem, možete da isključite lokaciju za ovu aplikaciju."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Uređaj ne može da upravlja baterijom na uobičajen način jer aplikacija <xliff:g id="APP">%1$s</xliff:g> stalno traži lokaciju čak i kada ne koristite tu aplikaciju.\n\nDa biste rešili ovaj problem, možete da isključite lokaciju za ovu aplikaciju."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Isključi"</string>
     <string name="power_screen" msgid="3023346080675904613">"Ekran"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Lampa"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -2132,8 +2047,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Aplikacije"</string>
     <string name="power_service" msgid="1599661212370831780">"Usluge"</string>
     <string name="power_system" msgid="8290455327965307383">"Sistem"</string>
-    <!-- no translation found for power_user (3706143225319881667) -->
-    <skip />
+    <string name="power_user" msgid="3706143225319881667">"Ostali korisnici"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Ukupno korišćenje procesora"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Procesor u prednjem planu"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Zadrži van stanja spavanja"</string>
@@ -2185,14 +2099,13 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Prekomerno izračunata potrošnja energije"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Koristi se <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_active_for (2964359540508103032) -->
-    <skip />
+    <string name="battery_active_for" msgid="2964359540508103032">"Aktivna <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Korišćenje ekrana: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> koristi <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ukupnog kapaciteta baterije"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Pregled od poslednjeg potpunog punjenja"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Poslednje potpuno punjenje"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Preostalo trajanje baterije je približno i može da se menja u zavisnosti od načina korišćenja"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Podaci o korišćenju baterije su približni i mogu da se menjaju u zavisnosti od načina korišćenja"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"U aktivnoj upotrebi"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"U pozadini"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Potrošnja baterije"</string>
@@ -2750,7 +2663,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Promeni PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Prikazuj obaveštenja"</string>
     <string name="help_label" msgid="6886837949306318591">"Pomoć i povratne inf."</string>
-    <string name="support_summary" msgid="8276116616493882830">"Članci pomoći, podrška telefonom i ćaskanjem"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Članci pomoći, podrška telefonom i ćaskanjem, početni koraci"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Nalog za sadržaj"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID slike"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Ekstremne opasnosti"</string>
@@ -2765,7 +2678,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Menadžer poziva"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Hitni prenosi"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Obaveštenja o hitnim slučajevima"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Mrežni operateri"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Nazivi pristupnih tačaka"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Poboljšani 4G LTE režim"</string>
@@ -2854,7 +2767,7 @@
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Jezici, vreme, rezervne kopije, ažuriranja"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Podešavanja"</string>
     <string name="search_menu" msgid="6283419262313758339">"Pretražite podešavanja"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Podešavanja pretrage"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Pretražite podešavanja"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"WiFi, Wi-Fi, mrežna veza"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"SMS, slanje SMS-ova, poruke, slanje poruka"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilna mreža, mobilni podaci, mobilni operater, bežično, podaci, 4g, 3g, 2g, lte"</string>
@@ -2896,15 +2809,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"prevlačenje za otključavanje, lozinka, šablon, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"work izazov, work, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"profil za Work, profil kojim se upravlja, objedini, objedinjavanje, Work, profil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"pokret"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"pokreti"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"platite, dodirnite, plaćanja"</string>
     <string name="keywords_backup" msgid="470070289135403022">"rezervna kopija, praviti rezervnu kopiju"</string>
-    <!-- no translation found for keywords_squeeze_to_launch_gesture (4459283333825902485) -->
-    <skip />
-    <!-- no translation found for keywords_wake_squeeze_gesture (6923058534235267845) -->
-    <skip />
-    <!-- no translation found for keywords_alarm_silence_gesture (8507935972184597252) -->
-    <skip />
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"pokret"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Podesite Wi-Fi NFC oznaku"</string>
     <string name="write_tag" msgid="8571858602896222537">"Napiši"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Dodirnite oznaku da biste pisali..."</string>
@@ -2988,7 +2896,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Ne prikazuj nikakva obaveštenja o profilu za Work"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Kada je uređaj zaključan, kako želite da se prikazuju obaveštenja o profilu?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Obaveštenja o profilu"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Obaveštenja"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Obaveštenja"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Obaveštenja aplikacija"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategorija obaveštenja"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Važnost"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Neka aplikacija odluči"</string>
@@ -3001,8 +2910,12 @@
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Srednji"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Visok"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Hitan"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Dozvoli zvuk"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Nema nikakvog zvuka ni vibracije niti se ova obaveštenja nakratko prikazuju na aktuelnom ekranu."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Dozvoli prekide"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Dozvolite aplikaciji da aktivira zvuk, vibraciju i/ili da prikazuje iskačuća obaveštenja na ekranu"</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Važnost: niska"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Važnost: srednja"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Važnost: velika"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Važnost: hitno"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Pomoćnik za obaveštenja"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Pristup obaveštenjima"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Pristup obaveštenjima profila za Work je blokiran"</string>
@@ -3030,7 +2943,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"sus slika u"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Slika u slici"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Dozvoli sliku u slici"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Dozvolite ovoj aplikaciji da pravi prozor slike u slici dok je otvorena ili kada izađete iz nje (na primer, da biste nastavili da gledate neki video). Ovaj prozor se prikazuje preko drugih aplikacija koje koristite."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Dozvolite ovoj aplikaciji da pravi prozor slike u slici dok je otvorena ili kada izađete iz nje (na primer, da biste nastavili da gledate neki video). Ovaj prozor se prikazuje preko drugih aplikacija koje koristite."</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>
@@ -3300,7 +3213,11 @@
       <item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacije se ponašaju na neuobičajen način</item>
       <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacija se ponaša na neuobičajen način</item>
     </plurals>
-    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">Aplikacije mnogo troše bateriju</item>
+      <item quantity="few">Aplikacije mnogo troše bateriju</item>
+      <item quantity="other">Aplikacije mnogo troše bateriju</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Bez optimizacije"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Bez optimizacije"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimizacija korišćenja baterije"</string>
@@ -3396,7 +3313,6 @@
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikacije sa dozvolom"</string>
     <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Dozvoljeno"</string>
     <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Nije dozvoljeno"</string>
-    <string name="install_other_apps" msgid="6986686991775883017">"Instalirajte nepozn. apl."</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"instaliranje aplikacije nepoznati izvori"</string>
     <string name="write_settings" msgid="4797457275727195681">"Menjanje podešavanja sistema"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"upisivati menjati sistem podešavanja"</string>
@@ -3408,6 +3324,8 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Dozvola za menjanje podešavanja sistema za aplikaciju"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Dozvoli menjanje podešavanja sistema"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Ova dozvola dozvoljava aplikaciji da menja podešavanja sistema."</string>
+    <string name="write_settings_on" msgid="8230580416068832239">"Da"</string>
+    <string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Dozvoli iz ovog izvora"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Dvaput zaokrenite za kameru"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Otvorite aplikaciju Kamera tako što ćete dvaput zaokrenuti ručni zglob"</string>
@@ -3481,15 +3399,30 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Pozadinski podaci su dostupni samo preko Wi-Fi-ja. To može da utiče na neke aplikacije ili usluge kada Wi-Fi nije dostupan."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Profil za Work je isključen"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Aplikacije, sinhronizacija u pozadini i druge funkcije povezane sa profilom za Work su isključene."</string>
+    <string name="night_display_suggestion_title" msgid="6602129097059325291">"Podesite raspored za noćno svetlo"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Podesite žutonarandžast ekran da lakše zaspite"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Noćno svetlo je uključeno"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Ekran ima žutonarandžastu nijansu. To može da vam pomogne da zaspite."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Predlozi"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"i još <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> predlog</item>
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> predloga</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> predloga</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="one">i još <xliff:g id="COUNT">%1$d</xliff:g> predlog</item>
+      <item quantity="few">i još <xliff:g id="COUNT">%1$d</xliff:g> predloga</item>
+      <item quantity="other">i još <xliff:g id="COUNT">%1$d</xliff:g> predloga</item>
+    </plurals>
     <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">"Koristi hladnije boje ekrana"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Da biste primenili promenu boje, isključite ekran"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Restartujte uređaj da biste primenili promenu TelephonyMonitor-a"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Da biste primenili promenu na kameru HAL HDR+, restartujte uređaj"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatska ažuriranja sistema"</string>
     <string name="usage" msgid="2977875522080448986">"Potrošnja"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Potrošnja mobil. podataka"</string>
@@ -3590,7 +3523,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrolišite obaveštenja na zaklj. ekranu"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Pregledajte ili sakrijte sadržaj obaveštenja"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Sve"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Podrška"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Podrška i saveti"</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>
@@ -3658,58 +3591,38 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatska"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Ručna"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Oslobodi prostor"</string>
-    <string name="gesture_preference_title" msgid="4033736910560673690">"Prečice pokretima"</string>
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Pokreti"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Brzi pokreti za kontrolu telefona"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Brzi pokreti za kontrolu tableta"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Brzi pokreti za kontrolu uređaja"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Prelazak na kameru"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Da biste brzo otvorili kameru, dvaput pritisnite dugme za napajanje. Ovo funkcioniše na svakom ekranu."</string>
-    <!-- no translation found for double_tap_power_for_camera_suggestion_title (6500405261202883589) -->
-    <skip />
-    <!-- no translation found for double_tap_power_for_camera_suggestion_summary (7010153544554016996) -->
-    <skip />
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Brzo otvorite kameru"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Pritisnite dugme za napajanje dvaput da biste otvorili kameru"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Okretanje kamere"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
-    <!-- no translation found for double_twist_for_camera_suggestion_title (4689410222517954869) -->
-    <skip />
-    <!-- no translation found for double_twist_for_camera_suggestion_summary (447403641027147153) -->
-    <skip />
-    <!-- no translation found for double_twist_for_camera_suggestion_summary (1724660290703318739) -->
-    <skip />
-    <!-- no translation found for double_twist_for_camera_suggestion_summary (5980398380988039489) -->
-    <skip />
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Brže snimajte selfije"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Dvaput zaokrenite telefon za režim za selfije"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Dvaput zaokrenite tablet za režim za selfije"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Dvaput zaokrenite uređaj za režim za selfije"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Dvaput dodirnite telefon da biste ga proverili"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Dvaput dodirnite tablet da biste ga proverili"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Dvaput dodirnite uređaj da biste ga proverili"</string>
-    <!-- no translation found for ambient_display_summary (525662960806416373) -->
-    <skip />
-    <!-- no translation found for ambient_display_suggestion_summary (5987443721392571847) -->
-    <skip />
+    <string name="ambient_display_summary" msgid="525662960806416373">"Da biste proverili vreme, ikone obaveštenja i druge informacije, dvaput dodirnite ekran."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Proveravajte obaveštenja kada je ekran isključen"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Podignite telefon da ga proverite"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Podignite tablet da biste ga proverili"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Podignite uređaj da biste ga proverili"</string>
-    <!-- no translation found for ambient_display_pickup_summary (4567020486787561873) -->
-    <skip />
-    <!-- no translation found for ambient_display_pickup_summary (5435283849947236648) -->
-    <skip />
-    <!-- no translation found for ambient_display_pickup_summary (8256669101643381568) -->
-    <skip />
-    <!-- no translation found for ambient_display_pickup_suggestion_summary (7014700589991761035) -->
-    <skip />
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Da biste proverili vreme, ikone obaveštenja i druge informacije, uzmite telefon."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Da biste proverili vreme, ikone obaveštenja i druge informacije, uzmite tablet."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Da biste proverili vreme, ikone obaveštenja i druge informacije, uzmite uređaj."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Proveravajte obaveštenja kada je ekran isključen"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Prevucite prstom za obaveštenja"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Da biste proverili obaveštenja, prevucite prstom nadole po senzoru za otisak prsta na zadnjoj strani telefona."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Da biste proverili obaveštenja, prevucite prstom nadole po senzoru za otisak prsta na zadnjoj strani tableta."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Da biste proverili obaveštenja, prevucite prstom nadole po senzoru za otisak prsta na zadnjoj strani uređaja."</string>
-    <!-- no translation found for fingerprint_swipe_for_notifications_suggestion_title (1677291167470357802) -->
-    <skip />
-    <!-- no translation found for fingerprint_swipe_for_notifications_suggestion_summary (127592803294414082) -->
-    <skip />
-    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Podignite telefon da biste otvorili kameru"</string>
-    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Da biste automatski otvorili kameru, postavite telefon u položaj za slikanje (pejzaž ili portret). Funkcioniše kada je telefon u stanju spavanja ili je zaključan."</string>
-    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Slikajte kada je telefon u stanju spavanja ili je zaključan"</string>
-    <string name="assist_gesture_title" msgid="7746563137898655539">"Pokret za pomoć"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Osetljivost"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Brzo pregledajte obaveštenja"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Prevucite nadole na senzoru za otisak 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">"Alatka za pokretanje operativnog sistema je već otključana"</string>
@@ -3730,6 +3643,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Automatske sinhronizuj poslovne podatke"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Omogući aplikacijama da automatski osvežavaju podatke"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Sinhronizacija naloga"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Sinhronizacija je uključena za određene stavke (<xliff:g id="ID_1">%1$d</xliff:g> od <xliff:g id="ID_2">%2$d</xliff:g>)"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Sinhronizacija je uključena za sve stavke"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Sinhronizacija je isključena za sve stavke"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Informacije o uređaju kojim se upravlja"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Promene i podešavanja kojima upravlja organizacija"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Promene i podešavanja kojima upravlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3833,8 +3749,7 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplikacije za filmove i TV"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informacije o dodeli mobilnog operatera"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Pokretanje dodele mobilnog operatera"</string>
-    <!-- no translation found for new_device_suggestion_title (8346563796032837800) -->
-    <skip />
-    <!-- no translation found for new_device_suggestion_summary (7172709269203435870) -->
-    <skip />
+    <string name="new_device_suggestion_title" msgid="698847081680980774">"Šta je novo i uzbudljivo?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Pogledajte 5 najpopularnijih funkcija"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ova funkcija nije dostupna na ovom uređaju."</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index fa0cd07..f44e779 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -23,6 +23,7 @@
     <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>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Зараз вы ў <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> кроку ад таго, каб стаць распрацоўшчыкам.</item>
       <item quantity="few">Зараз вы ў <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> кроках ад таго, каб стаць распрацоўшчыкам.</item>
@@ -109,26 +110,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Шукаць прылады"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Перайменаваць прыладу"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Перайменаваць"</string>
-    <!-- no translation found for bluetooth_disconnect_title (7830252930348734303) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_all_profiles (8208712728668714199) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_all_profiles (6611038575213485336) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_all_profiles (3995834526315103965) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_dialog_ok (3308586619539119106) -->
-    <skip />
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Адключыць прыладу?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Ваш тэлефон адключыцца ад прылады <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Ваш планшэт адключыцца ад прылады <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Ваша прылада адключыцца ад прылады <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Адключыцца"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"У вас няма дазволу на змяненне налад Bluetooth."</string>
-    <!-- no translation found for bluetooth_pairing_pref_title (7429413067477968637) -->
-    <skip />
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Спалучыце новую прыладу"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Пакуль Bluetooth уключаны, <xliff:g id="DEVICE_NAME">%1$s</xliff:g> бачная для прылад, якія знаходзяцца побач."</string>
-    <!-- no translation found for bluetooth_footer_mac_message (1109366350000220283) -->
-    <skip />
-    <!-- no translation found for bluetooth_footer_mac_message (6807634484499166486) -->
-    <skip />
-    <!-- no translation found for bluetooth_footer_mac_message (8413944740341742061) -->
-    <skip />
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Адрас Bluetooth тэлефона: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Адрас Bluetooth планшэта: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Адрас Bluetooth прылады: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Адлучыць <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Перадача даных"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Адключыць профіль?"</string>
@@ -140,8 +132,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Запыт спарвання Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Запыт на спарванне"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Кранiце, каб спалучыцца з прыладай <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
-    <skip />
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Атрыманыя файлы"</string>
     <string name="device_picker" msgid="4978696506172252813">"Выберыце прыладу Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> хоча ўключыць Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> хоча адключыць Bluetooth"</string>
@@ -177,11 +168,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s спрабуе атрымаць доступ да вашых паведамленняў. Дазволіць доступ да %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Запыт доступу да SIM"</string>
     <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>
-    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
-    <skip />
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Бачная для іншых прылад як прылада \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\""</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Вашы прылады"</string>
-    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
-    <skip />
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Спалучыце новую прыладу"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Дата і час"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Вылучыце гадзінны пояс"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -383,55 +372,39 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Разблакірав. адбіткам пальца"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Выкарыстоўв. адбітак пальца"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Проста дакранайцеся да датчыка адбіткаў пальцаў, каб разблакіраваць свой тэлефон, аўтарызаваць куплі або ўваходзіць у праграмы. Уважліва сачыце за тым, чые адбіткі пальцаў вы дадаяце. Любое з гэтых дзеянняў будзе даступнае для ўладальніка нават аднаго з адбіткаў пальцаў.\n\nЗаўвага. Выкарыстанне адбітка пальца можа быць менш бяспечным, чым складаны ўзор або PIN-код."</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_message_unlock_disabled (1550756694054944874) -->
-    <skip />
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_message_setup (6817326798834882531) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"Для ўхвалення куплі ці разблакіроўкі тэлефона можна карыстацца адбіткам пальца.\n\nЗаўвага. Вы не можаце выкарыстоўваць адбітак пальца для разблакіроўкі гэтай прылады. Для атрымання дадатковай інфармацыі звяжыцеся з адміністратарам арганізацыі."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"Для ўхвалення куплі ці разблакіроўкі тэлефона можна карыстацца адбіткам пальца.\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>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_continue_setup (1961957425135180242) -->
-    <skip />
-    <!-- no translation found for lock_screen_intro_skip_dialog_text_frp (1581834104051243425) -->
-    <skip />
-    <!-- no translation found for lock_screen_intro_skip_dialog_text_frp (4629503416877189572) -->
-    <skip />
-    <!-- no translation found for lock_screen_intro_skip_dialog_text_frp (2423428240245737909) -->
-    <skip />
-    <!-- no translation found for lock_screen_intro_skip_dialog_text (5219287483885558525) -->
-    <skip />
-    <!-- no translation found for lock_screen_intro_skip_dialog_text (1466238255429527112) -->
-    <skip />
-    <!-- no translation found for lock_screen_intro_skip_dialog_text (3008526710555416125) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Далей"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Функцыі абароны прылады не будуць уключаны. Вы не зможаце забараніць іншым карыстацца гэтым планшэтам у выпадку згубы, крадзяжу ці скіду налад."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Функцыі абароны прылады не будуць уключаны. Вы не зможаце забараніць іншым карыстацца гэтай прыладай у выпадку згубы, крадзяжу ці скіду налад."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Функцыі абароны прылады не будуць уключаны. Вы не зможаце забараніць іншым карыстацца гэтым тэлефонам у выпадку згубы, крадзяжу ці скіду налад."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Функцыі абароны прылады не будуць уключаны. Вы не зможаце забараніць іншым карыстацца гэтым планшэтам у выпадку згубы ці крадзяжу."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Функцыі абароны прылады не будуць уключаны. Вы не зможаце забараніць іншым карыстацца гэтай прыладай у выпадку згубы ці крадзяжу."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Функцыі абароны прылады не будуць уключаны. Вы не зможаце забараніць іншым карыстацца гэтым тэлефонам у выпадку згубы ці крадзяжу."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Усё роўна прапусціць"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Назад"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_find_sensor_title (3051496861358227199) -->
-    <skip />
-    <!-- no translation found for security_settings_fingerprint_enroll_find_sensor_message (8793966374365960368) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Дакраніцеся да сэнсара"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Ён на задняй панэлі тэлефона. Карыстайцеся ўказальным пальцам."</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>
-    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Дакраніцеся да сэнсара"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Прыкладзіце палец да сэнсара і ўтрымлівайце яго, пакуль не адчуеце вібрацыю"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (2819679722403209778) -->
-    <skip />
-    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (6158989350522518586) -->
-    <skip />
-    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (7567276170287972230) -->
-    <skip />
-    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (4796715961273420536) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Падыміце і дакраніцеся зноў"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Дакраніцеся некалькі разоў, каб дадаць усе часткі адбітка вашага пальца"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Адбітак пальца дададзены"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Калі вы бачыце гэты значок, вы можаце выкарыстоўваць адбіткі пальцаў для ідэнтыфікацыі або ўхвалення куплі."</string>
+    <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Пазней"</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>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Гатова"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ой, гэта не датчык"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Указальным пальцам дакраніцеся да сэнсара на задняй панэлі тэлефона."</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>
@@ -444,6 +417,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Вы дадалі максімальную колькасць адбіткаў пальцаў"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Немагчыма дадаць больш адбіткаў пальцаў"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Выдаліць усе адбіткі пальцаў?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Выдаліць \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\""</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Хочаце выдаліць гэты адбітак пальца?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Вы не зможаце выкарыстоўваць адбіткі пальцаў для разблакіроўкі тэлефона, аўтарызацыі куплі і ўваходу ў праграмы"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Вы не зможаце выкарыстоўваць адбіткі пальцаў для разблакіроўкі свайго працоўнага профілю, аўтарызацыі куплі і ўваходу ў працоўныя праграмы"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Так, выдаліць"</string>
@@ -530,53 +505,45 @@
     <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_fingerprint" msgid="8212242533942400457">"Абарона прылады не функцыянуе без вашага графічнага ключа.<xliff:g id="EMPTY_LINE">
-
-</xliff:g>Вашы захаваныя адбіткі пальцаў таксама будуць выдаленыя з гэтай прылады, і вы не зможаце выкарыстоўваць іх для разблакіроўкі свайго тэлефона, аўтарызацыі пакупак і ўваходу ў дадаткі.\""</string>
+    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint (2986105377420905314) -->
+    <skip />
     <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>
+    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint (3370462835533123695) -->
+    <skip />
     <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>
+    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint (3595476296430536798) -->
+    <skip />
     <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>
+    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint (3679351662094349506) -->
+    <skip />
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Абарона профілю не функцыянуе без вашага графічнага ключа."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Абарона профілю не функцыянуе без вашага графічнага ключа. <xliff:g id="EMPTY_LINE">
-
-</xliff:g>Вашы захаваныя адбіткі пальцаў таксама будуць выдалены з гэтай прылады, і вы не зможаце выкарыстоўваць іх для разблакіроўкі свайго профілю, аўтарызацыі купляў і ўваходу ў праграмы.\""</string>
+    <!-- no translation found for unlock_disable_frp_warning_content_pattern_fingerprint_profile (6718155854303231675) -->
+    <skip />
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Абарона профілю не функцыянуе без вашага PIN-кода."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Абарона профілю не функцыянуе без вашага PIN-кода. <xliff:g id="EMPTY_LINE">
-
-</xliff:g>Вашы захаваныя адбіткі пальцаў таксама будуць выдалены з гэтай прылады, і вы не зможаце выкарыстоўваць іх для разблакіроўкі свайго профілю, аўтарызацыі купляў і ўваходу ў праграмы.\""</string>
+    <!-- no translation found for unlock_disable_frp_warning_content_pin_fingerprint_profile (4209564603132870532) -->
+    <skip />
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Абарона профілю не функцыянуе без вашага пароля."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Абарона профілю не функцыянуе без вашага пароля.<xliff:g id="EMPTY_LINE">
-
-</xliff:g>Вашы захаваныя адбіткі пальцаў таксама будуць выдалены з гэтай прылады, і вы не зможаце выкарыстоўваць іх для разблакіроўкі свайго профілю, аўтарызацыі купляў і ўваходу ў праграмы.\""</string>
+    <!-- no translation found for unlock_disable_frp_warning_content_password_fingerprint_profile (2994300676764706047) -->
+    <skip />
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Абарона профілю не функцыянуе без вашага спосабу разблакіроўкі экрана."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Абарона профілю не функцыянуе без вашага спосабу разблакіроўкі экрана. <xliff:g id="EMPTY_LINE">
-
-</xliff:g>Вашы захаваныя адбіткі пальцаў таксама будуць выдалены з гэтай прылады, і вы не зможаце выкарыстоўваць іх для разблакіроўкі свайго профілю, аўтарызацыі купляў і ўваходу ў праграмы.\""</string>
+    <!-- no translation found for unlock_disable_frp_warning_content_unknown_fingerprint_profile (4994062501123299418) -->
+    <skip />
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Так, выдаліць"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Змяніць шаблон разблакоўкі"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Змяніць PIN-код разблакавання"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Змяніць пароль разблакоўкі"</string>
     <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Паўтарыце спробу. Спроба <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> з дапушчальных <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
     <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Вашы даныя будуць выдалены"</string>
-    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Калі вы яшчэ раз уведзяце няправільны графічны ключ, даныя з гэтай прылады будуць выдалены"</string>
-    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Калі вы яшчэ раз уведзяце няправільны PIN-код, даныя з гэтай прылады будуць выдалены"</string>
-    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Калі вы яшчэ раз уведзяце няправільны пароль, даныя з гэтай прылады будуць выдалены"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="1688030823464420974">"Калі вы ўведзяце няправільны графічны ключ яшчэ раз, даныя з гэтай прылады будуць выдалены"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Калі вы ўведзяце няправільны PIN-код яшчэ раз, даныя з гэтай прылады будуць выдалены"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"Калі вы ўведзяце няправільны пароль яшчэ раз, даныя з гэтай прылады будуць выдалены"</string>
     <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Калі вы яшчэ раз уведзяце няправільны графічны ключ, гэты карыстальнік будзе выдалены"</string>
     <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Калі вы яшчэ раз уведзяце няправільны PIN-код, гэты карыстальнік будзе выдалены"</string>
     <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Калі вы яшчэ раз уведзяце няправільны пароль, гэты карыстальнік будзе выдалены"</string>
     <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Калі вы яшчэ раз уведзяце няправільны графічны ключ, ваш рабочы профіль і звязаныя з ім даныя будуць выдалены"</string>
     <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Калі вы яшчэ раз уведзяце няправільны PIN-код, ваш рабочы профіль і звязаныя з ім даныя будуць выдалены"</string>
     <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Калі вы яшчэ раз уведзяце няправільны пароль, ваш рабочы профіль і звязаныя з ім даныя будуць выдалены"</string>
-    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Занадта шмат няўдалых спроб. Даныя з гэтай прылады будуць выдалены."</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="5047439819181833824">"Занадта шмат няўдалых спроб. Даныя з гэтай прылады будуць выдалены."</string>
     <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Занадта шмат няўдалых спроб. Гэты карыстальнік будзе выдалены."</string>
     <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Занадта шмат няўдалых спроб. Гэты рабочы профіль і звязаныя з ім даныя будуць выдалены."</string>
     <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Адхіліць"</string>
@@ -696,22 +663,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Пашыраны Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Калі Bluetooth уключаны, ваша прылада можа звязвацца з іншымі прыладамі з Bluetooth, якія знаходзяцца побач."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Для паляпшэння дакладнасці вызначэння месцазнаходжання сістэмныя праграмы і службы могуць знаходзіць прылады Bluetooth. Вы можаце змяніць гэта ў <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>наладах сканіравання<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
-    <!-- no translation found for bluetooth_connect_failed (4500234659813241053) -->
-    <skip />
-    <!-- no translation found for device_details_title (6576953269221085300) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_mac_address (2513724313558236181) -->
-    <skip />
-    <!-- no translation found for bluetooth_unpair_dialog_title (38467834196432400) -->
-    <skip />
-    <!-- no translation found for bluetooth_unpair_dialog_body (9087609557757135712) -->
-    <skip />
-    <!-- no translation found for bluetooth_unpair_dialog_body (7785695793007576501) -->
-    <skip />
-    <!-- no translation found for bluetooth_unpair_dialog_body (251257782642157557) -->
-    <skip />
-    <!-- no translation found for bluetooth_unpair_dialog_forget_confirm_button (3829370108973879006) -->
-    <skip />
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Не атрымалася ўсталяваць злучэнне. Паўтарыце спробу."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Звесткі пра прыладу"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Адрас Bluetooth прылады: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Выдаліць прыладу?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Ваш тэлефон больш не будзе злучаны з прыладай <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Ваш планшэт больш не будзе злучаны з прыладай <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Ваша прылада больш не будзе злучана з прыладай <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Выдаліць прыладу"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Злучыцца з..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Прылада <xliff:g id="DEVICE_NAME">%1$s</xliff:g> будзе адключаная ад аўдыёфайлаў."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Прылада <xliff:g id="DEVICE_NAME">%1$s</xliff:g> будзе адключаная ад аудыёгарнітуры."</string>
@@ -777,11 +736,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Уключаць Wi‑Fi аўтаматычна"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi будзе ўключацца аўтаматычна побач з захаванымі высакаякаснымі сеткамі, напрыклад вашай дамашняй сеткай"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Недаступна, паколькі выключана сканіраванне Wi‑Fi"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Для выкарыстання функцыі выберыце пастаўшчыка паслугі ацэнкі сеткі"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Пазбягаць дрэнных злучэнняў"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Не выкарыстоўваць сетку Wi-Fi, пакуль не будзе якаснага падлучэння да Інтэрнэту"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Выкарыстоўваць толькі сеткі з добрым падлуч. да Інтэрнэту"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Падключацца да адкрытых сетак"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Аўтаматычна падключацца да высакаякасных сетак агульнага карыстання"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Для выкарыстання функцыі выберыце пастаўшчыка паслугі ацэнкі сеткі"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Для выкарыстання функцыі выберыце сумяшчальнага пастаўшчыка паслугі ацэнкі сеткі"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Усталёўка сертыфікатаў"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Для павышэння дакладнасці вызначэння месцазнаходжання сістэмныя дадаткі і службы могуць шукаць сеткі Wi-Fi. Вы можаце змяніць гэта ў <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>наладах сканіравання<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Для павышэння дакладнасці вызначэння месцазнаходжання ўключыце сканіраванне Wi-Fi у <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>наладах сканіравання<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -864,6 +826,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Не даваць"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Не правяраць"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Сертыфікат не пазначаны. Ваша падлучэнне не будзе прыватным."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Імя сеткі занадта доўгае."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Неабходна ўказаць дамен."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS даступная"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS даступная)"</string>
@@ -933,28 +896,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Iгнараваць гэту групу?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Кропка доступу Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Пункт доступу Wi-Fi"</string>
-    <!-- no translation found for wifi_hotspot_off_subtext (5466126533609394170) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_tethering_on_subtext (5752490509369962007) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_tethering_on_subtext (6461075246164300670) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_on_local_only_subtext (2068110388011294735) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_name_title (1341735529132128887) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_name_summary_connecting (3378299995508671967) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_name_summary_connected (3888672084861445362) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_password_title (1955592302902091281) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_ap_band_title (1165801173359290681) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_footer_info_regular (1203489406068036455) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_footer_info_local_only (857988412470694109) -->
-    <skip />
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Не ідзе абагульванне змесціва ці падключэння да інтэрнэту з іншымі прыладамі"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Абагульванне падключэння да інтэрнэту гэтага планшэта праз хот-спот"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Абагульванне падключэння да інтэрнэту гэтага тэлефона праз хот-спот"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Праграма абагульвае змесціва. Каб абагульваць падключэнне да інтэрнэту, адключыце, а потым зноў уключыце хот-спот"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Назва Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Ідзе ўключэнне <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Іншыя прылады могуць падключацца да <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Пароль Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Дыяпазон для пунктаў доступу"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Выкарыстоўвайце хот-спот для стварэння сеткі Wi‑Fi для іншых прылад. Хот-спот дае доступ да інтэрнэту праз падключэнне да мабільнай перадачы даных. Мабільны аператар можа спаганяць дадатковую плату."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Праграмы могуць ствараць хот-спот для абагульвання змесціва з прыладамі паблізу."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Уключэнне кропкi доступу..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Выключэнне кропкi доступу..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"Сетка <xliff:g id="NETWORK_SSID">%1$s</xliff:g> актыўная"</string>
@@ -1060,6 +1012,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Вынікаў няма"</string>
     <string name="display_settings" msgid="7965901687241669598">"Дысплэй"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Аўтаматычны паварот экрана"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Насычаныя колеры"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Аўтаматычна змяняць арыентацыю экрана пры павароце планшэта"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Аўтаматычна змяняць арыентацыю экрана пры павароце тэлефона"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Аўтаматычна змяняць арыентацыю экрана пры павароце планшэта"</string>
@@ -1087,33 +1040,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Аптымізуйце ўзровень яркасці ў залежнасці ад асвятлення. Калі гэта функцыя ўключана, вы па-ранейшаму можаце часова задаваць яркасць."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Начная падсветка"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Функцыя \"Начная падсветка\" дадае вашаму экрану бурштынавае адценне. Глядзець на экран або чытаць пры слабым святле становіцца лягчэй, і гэта можа дапамагчы вам хутчэй засынаць."</string>
-    <!-- no translation found for night_display_auto_mode_title (6574111412154833409) -->
-    <skip />
-    <!-- no translation found for night_display_auto_mode_never (2483761922928753400) -->
-    <skip />
-    <!-- no translation found for night_display_auto_mode_custom (2379394568898721765) -->
-    <skip />
-    <!-- no translation found for night_display_auto_mode_twilight (589042813708244059) -->
-    <skip />
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Расклад"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Ніколі"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Уключаецца ў вызначаны час"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Уключаецца ад захаду да ўсходу"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Час пачатку"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Час заканчэння"</string>
-    <!-- no translation found for night_display_status_title (1784041143360286267) -->
-    <skip />
+    <string name="night_display_status_title" msgid="1784041143360286267">"Стан"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Інтэнсіўнасць"</string>
     <string name="night_display_summary_off" msgid="1792750041697946539">"Выкл. / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <!-- no translation found for night_display_summary_off_auto_mode_never (3583590137322963513) -->
-    <skip />
-    <!-- no translation found for night_display_summary_off_auto_mode_custom (6365668239253173208) -->
-    <skip />
-    <!-- no translation found for night_display_summary_off_auto_mode_twilight (3596291693781757392) -->
-    <skip />
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Ніколі не ўключыцца аўтаматычна"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Уключыцца аўтаматычна ў <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Уключыцца аўтаматычна на захадзе сонца"</string>
     <string name="night_display_summary_on" msgid="1355713529996456744">"Укл. / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <!-- no translation found for night_display_summary_on_auto_mode_never (9117830821363119835) -->
-    <skip />
-    <!-- no translation found for night_display_summary_on_auto_mode_custom (5510753572245577263) -->
-    <skip />
-    <!-- no translation found for night_display_summary_on_auto_mode_twilight (852270120144683507) -->
-    <skip />
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Ніколі не выключыцца аўтаматычна"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Выключыцца аўтаматычна ў <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Выключыцца аўтаматычна на ўсходзе сонца"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Рэжым сну"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Экран выключаецца"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Пасля бяздзейнасці: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1137,19 +1079,16 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Налады"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Аўтаматычная яркасць"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Абуджэнне пры падняцці"</string>
-    <!-- no translation found for ambient_display_screen_title (4252755516328775766) -->
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Неактыўны рэжым экрана"</string>
+    <!-- no translation found for ambient_display_screen_summary_always_on (7337555569694794132) -->
     <skip />
-    <!-- no translation found for ambient_display_screen_summary_always_on (7974004969481877214) -->
-    <skip />
-    <!-- no translation found for ambient_display_screen_summary_notifications (1449570742600868654) -->
-    <skip />
-    <!-- no translation found for ambient_display_category_triggers (4359289754456268573) -->
-    <skip />
-    <!-- no translation found for doze_title (2375510714460456687) -->
-    <skip />
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Новыя апавяшчэнні"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Калі паказваць"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Новыя апавяшчэнні"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Абуджаць экран, калі вы атрымліваеце апавяшчэнні"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Заўсёды ўключана"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Паказваць значкі часу, памедамленняў і іншыя даныя"</string>
+    <!-- no translation found for doze_always_on_summary (6978257596231155345) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Памер шрыфта"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Павялічыць або паменшыць тэкст"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Налады блакіроўкі SIM-карты"</string>
@@ -1407,8 +1346,8 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Аднаўленне параметраў APN па змаўчанні"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Аднавіць налады па змаўчанні"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Скід налад кропкі доступу па змаўчанні завершаны."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Выканаць скід"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Скід налад сеткі"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Параметры скіду"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Скінуць налады Wi-Fi, мабільнай перадачы даных і Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Гэта прывядзе да скіду ўсіх налад сеткі, у тым ліку\n\n"<li>"Wi‑Fi"</li>\n<li>"мабільнай перадачы даных"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Скід налад"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Скінуць усе налады сеткі? Гэта дзеянне нельга адмяніць!"</string>
@@ -1416,7 +1355,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Скінуць?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Скід налад сеткі недаступны для гэтага карыстальніка"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Налады сеткі былі скінутыя"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Скід да завадскіх налад"</string>
+    <string name="master_clear_title" msgid="6617679904229218425">"Сцерці ўсе даныя (cкід да заводскіх налад)"</string>
     <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
       <item quantity="one">Для <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> уліковага запісу будзе выкананы скід</item>
       <item quantity="few">Для <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> уліковых запісаў будзе выкананы скід</item>
@@ -1460,20 +1399,15 @@
     <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>
-    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
-    <skip />
-    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
-    <skip />
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Абагуліць падключэнне да інтэрнэту гэтага тэлефона праз USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Абагуліць падключэнне да інтэрнэту гэтага планшэта праз USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth-мадэм"</string>
-    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
-    <skip />
-    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
-    <skip />
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Абагуліць падключэнне да інтэрнэту планшэта праз Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Абагуліць падключэнне да інтэрнэту тэлефона праз Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Абагульв. падключ. да інтэрн. прыл. <xliff:g id="DEVICE_NAME">%1$d</xliff:g> па Bluetooth"</string>
     <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>
-    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
-    <skip />
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Выкарыстоўвайце хот-спот і рэжым мадэма для падключэння да інтэрнэту іншых прылад праз мабільную перадачу даных. Праграмы таксама могуць ствараць хот-спот для абагульвання змесціва з прыладамі паблізу."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Даведка"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Мабільная сетка"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Тарыфны план"</string>
@@ -1551,8 +1485,11 @@
     <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_password_header_for_fingerprint" msgid="6624409510609085450">"Перш чым карыстацца адбіткам пальца, задайце пароль"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Выберыце ўзор разблакіроўкі"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Перш чым карыстацца адбіткам пальца, задайце ўзор разблакіроўкі"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Выберыце PIN-код"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Каб карыст. адбіт. пальца, задайце 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>
@@ -1568,12 +1505,18 @@
     <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>
+    <!-- no translation found for lockpassword_strong_auth_required_device_pattern (530802132223800623) -->
+    <skip />
+    <!-- no translation found for lockpassword_strong_auth_required_device_pin (7829294830078036417) -->
+    <skip />
+    <!-- no translation found for lockpassword_strong_auth_required_device_password (3552644641574796973) -->
+    <skip />
+    <!-- no translation found for lockpassword_strong_auth_required_work_pattern (3003781907040522053) -->
+    <skip />
+    <!-- no translation found for lockpassword_strong_auth_required_work_pin (3367491332598821552) -->
+    <skip />
+    <!-- no translation found for lockpassword_strong_auth_required_work_password (8159775129968582940) -->
+    <skip />
     <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>
@@ -1621,12 +1564,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Налады прыкладання"</string>
     <string name="install_applications" msgid="4872012136210802181">"Невядомыя крыніцы"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Дазволіць усе крыніцы дадаткаў"</string>
-    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
-    <skip />
-    <!-- no translation found for see_all_apps_title (1459400183763114135) -->
-    <skip />
-    <!-- no translation found for recent_app_summary (3366446669844932300) -->
-    <skip />
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Нядаўна адкрытыя праграмы"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Паказаць усе праграмы (<xliff:g id="COUNT">%1$d</xliff:g> шт.)"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> таму"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Ваш планшэт і асабістыя даныя больш уразлівыя для нападаў невядомых праграм. Пры ўсталёўцы праграм з гэтай крыніцы вы згаджаецеся, што несяце адказнасць за любыя пашкоджанні планшэта ці страту даных, якія могуць адбыцца ў выніку выкарыстання гэтых праграм."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Ваш тэлефон і асабістыя даныя больш уразлівыя для нападаў невядомых праграм. Пры ўсталёўцы праграм з гэтай крыніцы вы згаджаецеся, што несяце адказнасць за любыя пашкоджанні тэлефона ці страту даных, якія могуць адбыцца ў выніку выкарыстання гэтых праграм."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Пашыраныя налады"</string>
@@ -1688,7 +1628,6 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Выконваецца"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-назапашвальнік"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"На SD-карце"</string>
-    <string name="disabled" msgid="9206776641295849915">"Адключанае"</string>
     <string name="not_installed" msgid="2797554494953450291">"Не ўсталяв. для гэтага карыст."</string>
     <string name="installed" msgid="3070865169422600098">"Усталявана"</string>
     <string name="no_applications" msgid="7336588977497084921">"Няма праграм."</string>
@@ -1798,8 +1737,7 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Спыніць абслугоўванне сістэмы?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Калі вы спыніце гэту сiстэмную службу, некаторыя функцыi планшэта могуць працаваць няправільна, пакуль вы не выключыце i зноў не ўключыце яе."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Калі вы спыніце гэтую службу, некаторыя функцыі тэлефона могуць перастаць працаваць правільна, пакуль вы не выключыце і зноў не ўключыце яго."</string>
-    <!-- no translation found for language_input_gesture_title (8749227808244881255) -->
-    <skip />
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Мовы, увод і жэсты"</string>
     <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
     <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
     <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
@@ -1883,13 +1821,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Стварыць віджэт і дазволіць доступ?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Пасля стварэння віджэту <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> зможа атрымаць доступ да ўсіх дадзеных, якія ён адлюстроўвае."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Заўсёды дазваляць <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ствараць віджэты і атрымліваць доступ да іх дадзеных"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> д. <xliff:g id="HOURS">%2$d</xliff:g> гадз. <xliff:g id="MINUTES">%3$d</xliff:g> хв. <xliff:g id="SECONDS">%4$d</xliff:g> с."</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> гадз. <xliff:g id="MINUTES">%2$d</xliff:g> хв. <xliff:g id="SECONDS">%3$d</xliff:g> с."</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>хв. <xliff:g id="SECONDS">%2$d</xliff:g>с."</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> с."</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"Статыстыка выкарыстання"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Статыстыка выкарыстання"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Упарадкаваць па:"</string>
@@ -1901,6 +1832,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Праграмы чытання з экрана, элементы кіравання дысплэем і ўзаемадзеяннем"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Налады для слабых зрокам"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Вы можаце наладзіць гэту прыладу так, каб яна адпавядала вашым патрэбам. Гэтыя спецыяльныя функцыі можна змяніць у Наладах."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Павялiчыць памер шрыфта"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Праграмы чытання з экрана"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Аўдыя і тэкст на экране"</string>
     <string name="display_category_title" msgid="685461049938269166">"Дысплэй"</string>
@@ -1921,10 +1853,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><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_screen_magnification_navbar_summary" msgid="1996584694050087161">"Калі функцыя павелічэння ўключана, вы можаце выкарыстоўваць кнопку \"Спецыяльныя магчымасці\" ўнізе экрана для хуткага павелічэння.\n\n"<b>"Для павелічэння маштабу"</b>" дакраніцеся да кнопкі \"Спецыяльныя магчымасці\", а потым дакраніцеся да любога месца на экране.\n"<ul><li>"Правядзіце 2 ці некалькімі пальцамі па экране, каб выканаць пракрутку"</li>\n<li>"Звядзіце 2 ці некалькі пальцаў, каб адрэгуляваць маштаб"</li></ul>\n\n<b>"Каб павялічыць маштаб часова"</b>", дакраніцеся да кнопкі \"Спецыяльныя магчымасці\", а потым краніце і ўтрымлівайце любое месца на экране.\n"<ul><li>"Праводзьце пальцам, каб перамяшчацца па экране"</li>\n<li>"Падніміце палец, каб паменшыць маштаб"</li></ul>\n\n"На клавіятуры ці панэлі навігацыі павялічваць маштаб нельга."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Для кнопкі \"Спецыяльныя магчымасці\" зададзена наступнае: <xliff:g id="SERVICE">%1$s</xliff:g>. Каб павялічваць маштаб з яе дапамогай, краніце і ўтрымлівайце кнопку \"Спецыяльныя магчымасці\", а потым выберыце функцыю павелічэння."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Хуткі доступ"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Спалучэнне з клавішамі гучнасці"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Служба хуткага доступу"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Дазволіць з экрана блакіроўкі"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Каб выкарыстоўваць функцыю спецыяльных магчымасцей, калі яна ўключаная, націсніце і ўтрымлівайце на працягу 3 секунд абедзве кнопкі гучнасці."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Каб выкарыстоўваць функцыю спецыяльных магчымасцей, калі яна ўключана, націсніце і ўтрымлівайце на працягу 3 секунд абедзве клавішы гучнасці."</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>
@@ -1937,7 +1869,7 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Можа паўплываць на прадукцыйнасць"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Націсканне пасля спынення руху указальніка"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Затрымка перад націсканнем"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
+    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"УКЛЮЧАНА"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"АДКЛЮЧАНА"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Паказваць у Хуткіх наладах"</string>
@@ -2101,46 +2033,29 @@
     <string name="details_subtitle" msgid="32593908269911734">"Падрабязнасці выкарыстання"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Адрэгуляваць спажыванне энергіі"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Уключаныя пакеты"</string>
-    <!-- no translation found for battery_abnormal_details_title (5469019021857291216) -->
-    <skip />
-    <!-- no translation found for battery_abnormal_wakelock_summary (4326186999058828831) -->
-    <skip />
-    <!-- no translation found for battery_abnormal_wakeup_alarm_summary (644657277875785240) -->
-    <skip />
-    <!-- no translation found for battery_abnormal_location_summary (6552797246798806002) -->
-    <skip />
-    <!-- no translation found for battery_abnormal_apps_summary (792553273248686972) -->
-    <skip />
-    <!-- no translation found for dialog_stop_title (6395127715596746479) -->
-    <skip />
-    <!-- no translation found for dialog_stop_message (9149534230295983971) -->
-    <skip />
-    <!-- no translation found for dialog_stop_message (5702924180465982412) -->
-    <skip />
-    <!-- no translation found for dialog_stop_message (9201053069493107713) -->
-    <skip />
-    <!-- no translation found for dialog_stop_ok (2319777211264004900) -->
-    <skip />
-    <!-- no translation found for dialog_background_check_title (1525936543485084879) -->
-    <skip />
-    <!-- no translation found for dialog_background_check_message (5539009263025812279) -->
-    <skip />
-    <!-- no translation found for dialog_background_check_message (4001747292234087612) -->
-    <skip />
-    <!-- no translation found for dialog_background_check_message (585341224642457664) -->
-    <skip />
-    <!-- no translation found for dialog_background_check_ok (412876934682899659) -->
-    <skip />
-    <!-- no translation found for dialog_location_title (5888917530725874727) -->
-    <skip />
-    <!-- no translation found for dialog_location_message (7684240588903005427) -->
-    <skip />
-    <!-- no translation found for dialog_location_message (7439311770795993356) -->
-    <skip />
-    <!-- no translation found for dialog_location_message (6285773079775018012) -->
-    <skip />
-    <!-- no translation found for dialog_location_ok (4572391197601313986) -->
-    <skip />
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Праграмы, якія разраджаюць акумулятар"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Падтрымлівае прыладу ў актыўным рэжыме"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Выводзіць прыладу з рэжыму сну ў фонавым рэжыме"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Запытвае месцазнаходжанне занадта часта"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> праграм паводзяць сябе незвычайна"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Спыніць праграму?"</string>
+    <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Ваш тэлефон не можа нармальна кіраваць зарадам акумулятара, бо <xliff:g id="APP">%1$s</xliff:g> трымае тэлефон у актыўным рэжыме.\n\nВырашыць гэту праблему можна, прымусова спыніўшы праграму.\n\nКалі гэта не дапамагло, трэба выдаліць праграму, каб павысіць прадукцыйнасць акумулятара."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Ваш планшэт не можа нармальна кіраваць зарадам акумулятара, бо <xliff:g id="APP">%1$s</xliff:g> трымае планшэт у актыўным рэжыме.\n\nВырашыць гэту праблему можна, прымусова спыніўшы праграму.\n\nКалі гэта не дапамагло, трэба выдаліць праграму, каб павысіць прадукцыйнасць акумулятара."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Ваша прылада не можа нармальна кіраваць зарадам акумулятара, бо <xliff:g id="APP">%1$s</xliff:g> трымае прыладу ў актыўным рэжыме.\n\nВырашыць гэту праблему можна, прымусова спыніўшы праграму.\n\nКалі гэта не дапамагло, трэба выдаліць праграму, каб павысіць прадукцыйнасць акумулятара."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Ваш тэлефон не можа нармальна кіраваць зарадам акумулятара, бо <xliff:g id="APP_0">%1$s</xliff:g> пастаянна выводзіць яго з рэжыму сну.\n\nКаб вырашыць гэту праблему, вы можаце паспрабаваць адключыць праграму <xliff:g id="APP_1">%1$s</xliff:g>.\n\nКалі гэта не дапамагло, трэба выдаліць праграму, каб павысіць прадукцыйнасць акумулятара."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Ваш планшэт не можа нармальна кіраваць зарадам акумулятара, бо <xliff:g id="APP_0">%1$s</xliff:g> пастаянна выводзіць яго з рэжыму сну.\n\nКаб вырашыць гэту праблему, вы можаце паспрабаваць адключыць праграму <xliff:g id="APP_1">%1$s</xliff:g>.\n\nКалі гэта не дапамагло, трэба выдаліць праграму, каб павысіць прадукцыйнасць акумулятара."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Ваша прылада не можа нармальна кіраваць зарадам акумулятара, бо <xliff:g id="APP_0">%1$s</xliff:g> пастаянна выводзіць яе з рэжыму сну.\n\nКаб вырашыць гэту праблему, вы можаце паспрабаваць адключыць праграму <xliff:g id="APP_1">%1$s</xliff:g>.\n\nКалі гэта не дапамагло, трэба выдаліць праграму, каб павысіць прадукцыйнасць акумулятара."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Спыніць праграму"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Спыніць працу ў фонавым рэжыме і адключыць праграму?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Ваш тэлефон не можа нармальна кіраваць зарадам акумулятара, бо <xliff:g id="APP_0">%1$s</xliff:g> пастаянна выводзіць яго з рэжыму сну.\n\nКаб вырашыць гэту праблему, вы можаце паспрабаваць адключыць праграму <xliff:g id="APP_1">%1$s</xliff:g>, каб яна не працавала ў фонавым рэжыме."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Ваш планшэт не можа нармальна кіраваць зарадам акумулятара, бо <xliff:g id="APP_0">%1$s</xliff:g> пастаянна выводзіць яго з рэжыму сну.\n\nКаб вырашыць гэту праблему, вы можаце паспрабаваць адключыць праграму <xliff:g id="APP_1">%1$s</xliff:g>, каб яна не працавала ў фонавым рэжыме."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Ваша прылада не можа нармальна кіраваць зарадам акумулятара, бо <xliff:g id="APP_0">%1$s</xliff:g> пастаянна выводзіць яе з рэжыму сну.\n\nКаб вырашыць гэту праблему, вы можаце паспрабаваць адключыць праграму <xliff:g id="APP_1">%1$s</xliff:g>, каб яна не працавала ў фонавым рэжыме."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Адключыць"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Адключыць функцыю вызначэння месцазнаходжання?"</string>
+    <string name="dialog_location_message" product="default" msgid="7774807745601479888">"Ваш тэлефон не можа нармальна кіраваць зарадам акумулятара, бо <xliff:g id="APP">%1$s</xliff:g> пастаянна запытвае звесткі пра ваша месцазнаходжанне, калі вы не карыстаецеся праграмай.\n\nВырашыць гэту праблему можна, адключыўшы функцыю вызначэння месцазнаходжання для гэтай праграмы."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Ваш планшэт не можа нармальна кіраваць зарадам акумулятара, бо <xliff:g id="APP">%1$s</xliff:g> пастаянна запытвае звесткі пра ваша месцазнаходжанне, калі вы не карыстаецеся праграмай.\n\nВырашыць гэту праблему можна, адключыўшы функцыю вызначэння месцазнаходжання для гэтай праграмы."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Ваша прылада не можа нармальна кіраваць зарадам акумулятара, бо <xliff:g id="APP">%1$s</xliff:g> пастаянна запытвае звесткі пра ваша месцазнаходжанне, калі вы не карыстаецеся праграмай.\n\nВырашыць гэту праблему можна, адключыўшы функцыю вызначэння месцазнаходжання для гэтай праграмы."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Адключыць"</string>
     <string name="power_screen" msgid="3023346080675904613">"Экран"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Ліхтарык"</string>
     <string name="power_camera" msgid="4976286950934622605">"Камера"</string>
@@ -2155,8 +2070,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Праграмы"</string>
     <string name="power_service" msgid="1599661212370831780">"Сэрвісы"</string>
     <string name="power_system" msgid="8290455327965307383">"Сістэма"</string>
-    <!-- no translation found for power_user (3706143225319881667) -->
-    <skip />
+    <string name="power_user" msgid="3706143225319881667">"Іншыя карыстальнікі"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"ЦП – усяго"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Асноўнае выкарыстанне працэсару"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Не ўвах. у рэжым сна"</string>
@@ -2208,14 +2122,13 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Няўлічанае спажыванне энергіі"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мАг"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Выкарыстана на працягу <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_active_for (2964359540508103032) -->
-    <skip />
+    <string name="battery_active_for" msgid="2964359540508103032">"Актыўны на працягу <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Выкарыстанне экрана: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> выкарыстана праграмай <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ад усяго зараду"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Разбіўка з моманту апошняй поўнай зарадкі"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Апошняя поўная зарадка"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Час працы да поўнай разрадкі акумулятара прыводзіцца прыблізна і можа мяняцца ў залежнасці ад умоў выкарыстання"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Даныя аб выкарыстанні батарэі — прыблізныя і могуць змяняцца ў залежнасці ад выкарыстання"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Падчас актыўнага выкарыстання"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"У фонавым рэжыме"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Спажыванне зараду"</string>
@@ -2777,7 +2690,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Змяніць PIN-код"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Паказваць паведамленні"</string>
     <string name="help_label" msgid="6886837949306318591">"Даведка і водгукі"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Артыкулы даведкі, тэлефон і падтрымка ў чаце"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Артыкулы даведкі, падтрымка па тэлефоне і ў чаце, інструкцыі па пачатку працы"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Уліковы запіс для змесціва"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Iдэнтыфiкатар фота"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Надзвычайныя пагрозы"</string>
@@ -2792,7 +2705,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Call Manager (Менеджар выклікаў)"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Экстраныя трансляцыі"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Надзвычайныя абвесткі"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Сеткавыя аператары"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Назвы пунктаў доступу"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Рэжым пашыранага 4G LTE"</string>
@@ -2881,8 +2794,8 @@
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Стандартныя праграмы"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Мовы, час, рэзервовае капіраванне, абнаўленні"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Налады"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Налады пошуку"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Налады пошуку"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Пошук налад"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Пошук налад"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, падключэнне да сеткі"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"тэкставае паведамленне, SMS, паведамленні, абмен паведамленнямі"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"сотавы, мабільны, сотавы аператар, бесправадны, даныя, 4g, 3g, 2g, lte"</string>
@@ -2924,14 +2837,10 @@
     <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="keywords_gesture" msgid="3526905012224714078">"жэсты"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"плаціць, дакранацца, плацяжы"</string>
     <string name="keywords_backup" msgid="470070289135403022">"рэзервовае капіраванне, стварыць рэзервовую копію"</string>
-    <!-- no translation found for keywords_squeeze_to_launch_gesture (4459283333825902485) -->
-    <skip />
-    <!-- no translation found for keywords_wake_squeeze_gesture (6923058534235267845) -->
-    <skip />
-    <!-- no translation found for keywords_alarm_silence_gesture (8507935972184597252) -->
+    <!-- no translation found for keywords_assist_gesture_launch (813968759791342591) -->
     <skip />
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Усталяваць Wi-Fi NFC-метку"</string>
     <string name="write_tag" msgid="8571858602896222537">"Запісаць"</string>
@@ -3017,7 +2926,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Увогуле не паказваць апавяшчэнні працоўнага профілю"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Як павінны паказвацца апавяшчэнні профілю, калі прылада заблакіравана?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Апавяшчэнні профілю"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Апавяшчэнні"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Апавяшчэнні"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Апавяшчэнні дадаткаў"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Катэгорыя апавяшчэнняў"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Важнасць"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Дазволіць праграме прымаць рашэнне"</string>
@@ -3030,8 +2940,12 @@
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Сярэдняя"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Высокая"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Тэрміновая"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Дазволіць прайграванне гуку"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Не прайграваць гук, не вібрыраваць і не паказваць гэтыя апавяшчэнні хутка ў полі зроку на бягучым экране."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Дазволіць перарыванні"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Дазволіць праграме выкарыстоўваць гук, вібрацыю і/або ўсплываючыя апавяшчэнні на экране"</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Нізкая важнасць"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Сярэдняя важнасць"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Высокая важнасць"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Надзвычайная важнасць"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Памочнік па апавяшчэннях"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Доступ да апавяшчэнняў"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Доступ да апавяшчэнняў працоўнага профілю заблакіраваны"</string>
@@ -3060,7 +2974,8 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip, відарыс у"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Відарыс у відарысе"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Дазволіць відарыс у відарысе"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Дазволіць гэтай праграме ствараць акно відарыса ў відарысе, калі праграма адкрыта або пасля таго, як вы выйдзеце з яе (напрыклад, каб працягнуць прагляд відэа). Гэта акно паказваецца паверх іншых праграм, якія вы выкарыстоўваеце."</string>
+    <!-- no translation found for picture_in_picture_app_detail_summary (1264019085827708920) -->
+    <skip />
     <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>
@@ -3335,12 +3250,17 @@
     <string name="hide_extra_apps" msgid="5016497281322459633">"Паказаць спажыванне праграмамі"</string>
     <string name="power_high_usage_title" msgid="6027369425057347826">"Высокае спажыванне"</string>
     <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
-      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> праграма паводзіць сябе незвычайна</item>
-      <item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> праграмы паводзяць сябе незвычайна</item>
-      <item quantity="many"><xliff:g id="NUMBER">%2$d</xliff:g> праграм паводзяць сябе незвычайна</item>
-      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> праграмы паводзяць сябе незвычайна</item>
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> праграма працуе няправільна</item>
+      <item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> праграмы працуюць няправільна</item>
+      <item quantity="many"><xliff:g id="NUMBER">%2$d</xliff:g> праграм працуюць няправільна</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> праграмы працуюць няправільна</item>
     </plurals>
-    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">Праграм разраджаюць акумулятар</item>
+      <item quantity="few">Праграмы разраджаюць акумулятар</item>
+      <item quantity="many">Праграм разраджаюць акумулятар</item>
+      <item quantity="other">Праграмы разраджаюць акумулятар</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Не аптымізаваныя"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Не аптымізавана"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Аптымізацыя выкарыстання акумулятара"</string>
@@ -3437,7 +3357,6 @@
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Дадаткі з дазволам"</string>
     <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Дазволена"</string>
     <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Забаронена"</string>
-    <string name="install_other_apps" msgid="6986686991775883017">"Усталёўваць невядомыя праграмы"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"усталёўваць праграмы з невядомых крыніц"</string>
     <string name="write_settings" msgid="4797457275727195681">"Змена сістэмных налад"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"напісаць, змяніць сістэмныя налады"</string>
@@ -3449,6 +3368,8 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Дазвол змены сістэмных налад для дадатку"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Дазволіць змяняць сістэмныя налады"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Гэта дазваляе дадатку змяняць сістэмныя налады."</string>
+    <string name="write_settings_on" msgid="8230580416068832239">"Так"</string>
+    <string name="write_settings_off" msgid="5156104383386336233">"Не"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Дазволіць з гэтай крыніцы"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Павярніце двойчы, каб адкрыць камеру"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Адкрыйце дадатак камеры, двойчы павярнуўшы сваё запясце"</string>
@@ -3523,15 +3444,32 @@
     <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="night_display_suggestion_title" msgid="6602129097059325291">"Глядзець графік \"Начной падсветкі\""</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Бурштынавы экран, каб дапамагчы вам заснуць"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Начная падсветка ўключана"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Экран мае адценне бурштынавага колеру. Гэта можа дапамагчы вам заснуць."</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="suggestions_more_title" msgid="8223690393059519879">"яшчэ +<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> прапанова</item>
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> прапановы</item>
+      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> прапаноў</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> прапановы</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <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="suggestion_remove" msgid="904627293892092439">"Выдаліць"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Халодная каляровая тэмпература"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Выкарыстоўваць больш халодныя колеры экрана"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Каб прымяніць змяненне колеру, адключыце экран"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Каб змены ў сродку адсочвання тэлефаніі былі прыменены, трэба перазагрузіць прыладу"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HDR+ для камеры HAL"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Каб уключыць HDR+ для камеры HAL, перазагрузіце прыладу"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Аўтаматычныя абнаўленні сістэмы"</string>
     <string name="usage" msgid="2977875522080448986">"Выкарыстанне"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Выкарыстанне мабільнага трафіку"</string>
@@ -3635,7 +3573,7 @@
     <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="page_tab_title_support" msgid="8483187649355540109">"Падтрымка і парады"</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>
@@ -3706,58 +3644,38 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Аўтаматычна"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Уручную"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Вызваліць месца"</string>
-    <string name="gesture_preference_title" msgid="4033736910560673690">"Ярлыкі жэстаў"</string>
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Жэсты"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Хуткія жэсты для кіравання вашым тэлефонам"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Хуткія жэсты для кіравання вашым планшэтам"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Хуткія жэсты для кіравання вашай прыладай"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Перайсці да камеры"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Каб хутка адкрыць камеру, двойчы націсніце кнопку сілкавання. Працуе на любым экране."</string>
-    <!-- no translation found for double_tap_power_for_camera_suggestion_title (6500405261202883589) -->
-    <skip />
-    <!-- no translation found for double_tap_power_for_camera_suggestion_summary (7010153544554016996) -->
-    <skip />
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Хуткае адкрыццё камеры"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Каб адкрыць камеру, двойчы націсніце на кнопку сілкавання"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Змена камеры"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
-    <!-- no translation found for double_twist_for_camera_suggestion_title (4689410222517954869) -->
-    <skip />
-    <!-- no translation found for double_twist_for_camera_suggestion_summary (447403641027147153) -->
-    <skip />
-    <!-- no translation found for double_twist_for_camera_suggestion_summary (1724660290703318739) -->
-    <skip />
-    <!-- no translation found for double_twist_for_camera_suggestion_summary (5980398380988039489) -->
-    <skip />
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Рабіце сэлфі хутчэй"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Каб перакл. на франтальную камеру, двойчы павярніце тэлефон"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Каб перакл. на франтальную камеру, двойчы павярніце планшэт"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Каб перакл. на франтальную камеру, двойчы павярніце прыладу"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Двойчы дакраніцеся, каб праверыць тэлефон"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Двойчы дакраніцеся, каб праверыць планшэт"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Двойчы дакраніцеся, каб праверыць прыладу"</string>
-    <!-- no translation found for ambient_display_summary (525662960806416373) -->
-    <skip />
-    <!-- no translation found for ambient_display_suggestion_summary (5987443721392571847) -->
-    <skip />
+    <string name="ambient_display_summary" msgid="525662960806416373">"Каб праверыць час, значкі паведамленняў і іншыя даныя, двойчы націсніце на экран."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Правяраць апавяшчэнні, калі экран выключаны"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Падняць тэлефон, каб праверыць яго"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Падніміце планшэт, каб праверыць яго"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Падніміце прыладу, каб праверыць яе"</string>
-    <!-- no translation found for ambient_display_pickup_summary (4567020486787561873) -->
-    <skip />
-    <!-- no translation found for ambient_display_pickup_summary (5435283849947236648) -->
-    <skip />
-    <!-- no translation found for ambient_display_pickup_summary (8256669101643381568) -->
-    <skip />
-    <!-- no translation found for ambient_display_pickup_suggestion_summary (7014700589991761035) -->
-    <skip />
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Каб праверыць час, значкі паведамленняў і іншыя даныя, вазьміце свой тэлефон у рукі."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Каб праверыць час, значкі паведамленняў і іншыя даныя, вазьміце свой планшэт у рукі."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Каб праверыць час, значкі паведамленняў і іншыя даныя, вазьміце сваю прыладу ў рукі."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Правяраць апавяшчэнні, калі экран выключаны"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Правядзіце пальцам, каб убачыць апавяшчэнні"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Каб праверыць апавяшчэнні, правядзіце пальцам уніз па сканеры адбіткаў пальцаў на заднім боку тэлефона."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Каб праверыць апавяшчэнні, правядзіце пальцам уніз па сканеры адбіткаў пальцаў на заднім боку планшэта."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Каб праверыць апавяшчэнні, правядзіце пальцам уніз па сканеры адбіткаў пальцаў на заднім боку прылады."</string>
-    <!-- no translation found for fingerprint_swipe_for_notifications_suggestion_title (1677291167470357802) -->
-    <skip />
-    <!-- no translation found for fingerprint_swipe_for_notifications_suggestion_summary (127592803294414082) -->
-    <skip />
-    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Падыміце, каб адкрыць камеру"</string>
-    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Каб аўтаматычна адкрыць камеру, размясціце тэлефон у пазіцыі для здымкі (пейзажу ці партрэта). Працуе, калі тэлефон знаходзіцца ў рэжыме сну ці заблакіраваны."</string>
-    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Рабіце фота, калі тэлефон заблакіраваны або ў рэжыме сну"</string>
-    <string name="assist_gesture_title" msgid="7746563137898655539">"Жэст для Памочніка"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Адчувальнасць"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Хуткі прагляд апавяшчэнняў"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Правядзіце пальцам уніз па сканеры адбіткаў пальцаў"</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>
@@ -3778,6 +3696,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Аўтаматычна сінхранізаваць працоўныя даныя"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Дазволіць праграмам абнаўляць даныя аўтаматычна"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Сінхранізацыя ўліковага запісу"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Сінхранізацыя ўключана для <xliff:g id="ID_1">%1$d</xliff:g> з <xliff:g id="ID_2">%2$d</xliff:g> элементаў"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Сінхранізацыя ўключана для ўсіх элементаў"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Сінхранізацыя выключана для ўсіх элементаў"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Інфармацыя пра прыладу пад кіраваннем"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Змяненні і налады знаходзяцца пад кіраваннем вашай арганізацыі"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Змяненні і налады знаходзяцца пад кіраваннем <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3888,8 +3809,7 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Праграмы для фільмаў і ТБ"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Інфармацыя аператара"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Уключыць/выключыць забеспячэнне аператарам"</string>
-    <!-- no translation found for new_device_suggestion_title (8346563796032837800) -->
-    <skip />
-    <!-- no translation found for new_device_suggestion_summary (7172709269203435870) -->
-    <skip />
+    <string name="new_device_suggestion_title" msgid="698847081680980774">"Што новага і цікавага?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Азнаёмцеся з 5 лепшымі функцыямі"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Гэта функцыя недаступная на гэтай прыладзе"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 8e1385f..448171d 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s иска достъп до съобщенията ви. Ще предоставите ли достъп до %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Заявка за достъп до SIM картата"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> иска да получи достъп до SIM картата ви. Предоставянето му ще деактивира мобилните данни на устройството ви за продължителността на връзката. Разрешаване на достъпа до <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Видимо като „<xliff:g id="DEVICE_NAME">^1</xliff:g>“ за другите устройства"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Видимо като „<xliff:g id="DEVICE_NAME">^1</xliff:g>“ за другите устройства"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Вашите устройства"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Сдвояване на ново устройство"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Дата и час"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"Напред"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Да се пропусне ли отпечатъкът?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Настройването на отпечатък отнема само една или две минути. Ако пропуснете тази стъпка, можете да добавите отпечатъка си по-късно от настройките."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Пропуск. на опцията за закл.?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Функциите за защита на таблета няма да бъдат включени. Няма да можете да предотвратите използването му от други хора, ако бъде загубен, откраднат или нулиран."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Функциите за защита на устройството няма да бъдат включени. Няма да можете да предотвратите използването му от други хора, ако бъде загубено, откраднато или нулирано."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Функциите за защита на телефона няма да бъдат включени. Няма да можете да предотвратите използването му от други хора, ако бъде загубен, откраднат или нулиран."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Добавихте максималния брой отпечатъци"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Не могат да се добавят още отпечатъци"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Да се премахнат ли вс. отпечатъци?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Премахване на „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Искате ли да изтриете този отпечатък?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Няма да можете да използвате отпечатъците си, за да отключвате телефона си, да оторизирате покупки или да влизате в приложения"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Няма да можете да използвате отпечатъците си, за да отключвате служебния си потребителски профил, да оторизирате покупки или да влизате в служебни приложения"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Да, да се премахнат"</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"За допълнителна сигурност настройте резервна опция за заключване на екрана."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"За допълнителна сигурност настройте резервна опция за заключване на екрана."</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>
@@ -497,37 +502,37 @@
     <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_fingerprint" msgid="8212242533942400457">"Функциите за защита на устройството няма да работят без фигурата ви.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Функциите за защита на устройството няма да работят без фигурата ви.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Запазените ви отпечатъци също ще бъдат премахнати от това устройство и няма да можете да ги използвате за отключване на телефона си, оторизиране на покупки или влизане в приложения."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Функциите за защита на устройството няма да работят без ПИН кода ви."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Функциите за защита на устройството няма да работят без ПИН кода ви.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Функциите за защита на устройството няма да работят без ПИН кода ви.<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_fingerprint" msgid="2228159168587170445">"Функциите за защита на устройството няма да работят без паролата ви.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Функциите за защита на устройството няма да работят без паролата ви.<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_fingerprint" msgid="6363091330281670692">"Функциите за защита на устройството няма да работят без опцията ви за заключване на екрана.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Функциите за защита на устройството няма да работят без опцията ви за заключване на екрана.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Запазените ви отпечатъци също ще бъдат премахнати от това устройство и няма да можете да ги използвате за отключване на телефона си, оторизиране на покупки или влизане в приложения."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Функциите за защита на потребителския профил няма да работят без фигурата ви."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Функциите за защита на потребителския профил няма да работят без фигурата ви.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Функциите за защита на потребителския профил няма да работят без фигурата ви.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Запазените ви отпечатъци също ще бъдат премахнати от този потребителски профил и няма да можете да ги използвате, за да го отключвате, да оторизирате покупки или да влизате в приложения.\""</string>
+</xliff:g>Запазените ви отпечатъци също ще бъдат премахнати от този потребителски профил и няма да можете да ги използвате, за да го отключвате, да оторизирате покупки или да влизате в приложения."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Функциите за защита на потребителския профил няма да работят без ПИН кода ви."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Функциите за защита на потребителския профил няма да работят без ПИН кода ви.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Функциите за защита на потребителския профил няма да работят без ПИН кода ви.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Запазените ви отпечатъци също ще бъдат премахнати от този потребителски профил и няма да можете да ги използвате, за да го отключвате, да оторизирате покупки или да влизате в приложения.\""</string>
+</xliff:g>Запазените ви отпечатъци също ще бъдат премахнати от този потребителски профил и няма да можете да ги използвате, за да го отключвате, да оторизирате покупки или да влизате в приложения."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Функциите за защита на потребителския профил няма да работят без паролата ви."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Функциите за защита на потребителския профил няма да работят без паролата ви.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Функциите за защита на потребителския профил няма да работят без паролата ви.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Запазените ви отпечатъци също ще бъдат премахнати от този потребителски профил и няма да можете да ги използвате, за да го отключвате, да оторизирате покупки или да влизате в приложения.\""</string>
+</xliff:g>Запазените ви отпечатъци също ще бъдат премахнати от този потребителски профил и няма да можете да ги използвате, за да го отключвате, да оторизирате покупки или да влизате в приложения."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Функциите за защита на потребителския профил няма да работят без опцията ви за заключване на екрана."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Функциите за защита на потребителския профил няма да работят без опцията ви за заключване на екрана.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Функциите за защита на потребителския профил няма да работят без опцията ви за заключване на екрана.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Запазените ви отпечатъци също ще бъдат премахнати от този потребителски профил и няма да можете да ги използвате, за да го отключвате, да оторизирате покупки или да влизате в приложения.\""</string>
+</xliff:g>Запазените ви отпечатъци също ще бъдат премахнати от този потребителски профил и няма да можете да ги използвате, за да го отключвате, да оторизирате покупки или да влизате в приложения."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Да, да се премахне"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Промяна на фигурата за отключване"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Промяна на PIN кода за отключване"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Възходящите, низходящите и повтарящите се поредици от цифри не са разрешени"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Отказ"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Изчистване"</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>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Налице е WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Налице е WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Въведете паролата за мрежата"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Wi‑Fi мрежа на оператор"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Свържете се през <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"За да подобри точността на местоположението и за други цели, <xliff:g id="APP_NAME">%1$s</xliff:g> иска да включи сканирането за мрежи дори когато Wi-Fi е изключен.\n\nИскате ли да разрешите това за всички приложения, които искат да сканират?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"За да изключите тази настройка, отворете „Разширени“ от менюто при препълване."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Разрешаване"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Свързване"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Свързването с мрежата не бе успешно"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Забравяне"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Промяна"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Забравянето на мрежата не бе успешно"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Запазване"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Запазването на мрежата не бе успешно"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi‑Fi: разширени настр."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC адрес"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP адрес"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Информация за мрежата"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Подмрежова маска"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 адреси"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Да се анулира ли поканата?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Искате ли да анулирате поканата за свързване с/ъс <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Да се забрави ли тази група?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Преносима точка за достъп до Wi‑Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Точка за достъп до Wi‑Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Не споделяте с други устройства нито връзката с интернет, нито съдържание"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Връзката с интернет на този таблет се споделя през точка за достъп"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Връзката с интернет на този телефон се споделя през точка за достъп"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Приложението споделя съдържание. За да споделите връзката с интернет, изключете точката за достъп и я включете отново"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Име на точката за Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Име на точката за достъп"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"„<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>“ се включва..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Други устройства могат да се свързват към „<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>“"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Парола за точката за Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Парола за точката за достъп"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Честота на точката за достъп"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Използвайте точка за достъп, за да създадете Wi‑Fi мрежа за другите си устройства. Точката осигурява достъп до интернет посредством мобилната ви връзка за данни. Може да бъдете таксувани допълнително за пренос на мобилни данни."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Приложенията могат да създават точки за достъп, за да споделят съдържание с устройства в близост."</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Когато функцията за обаждания през Wi-Fi е включена, телефонът ви може да маршрутизира обажданията през Wi-Fi мрежи или мрежата на оператора ви в зависимост от предпочитанието ви и от това, кой сигнал е по-силен. Преди да включите тази функция, потърсете от оператора си информация относно таксите и други подробности."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Актуализиране на адреса за спешни случаи"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"Адресът, който спешните служби ще използват като ваше местоположение, ако се обадите на 112 посредством Wi-Fi"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"Адресът, който спешните служби ще използват като ваше местоположение, ако извършите спешно обаждане посредством Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Сила на звука"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Търсене"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Управление на настройки и история на търсене"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Няма резултати"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Изчистване на историята"</string>
     <string name="display_settings" msgid="7965901687241669598">"Дисплей"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Авт. завъртане на екрана"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Ярки цветове"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Стандартните настройки за името на точката за достъп (APN) се възстановяват."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Възстановяване на стандартни"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Възстановяването на стандартните настройките за името на точката за достъп (APN) завърши."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Нулиране"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Нулиране на настройките на мрежата"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Опции за нулиране"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Мрежата, приложенията или устройството могат да бъдат нулирани"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Нулиране на настройките за Wi-Fi, мобилни данни и Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Така ще нулирате всички мрежови настройки, включително тези за:\n\n"<li>"Wi‑Fi;"</li>\n<li>"мобилни данни;"</li>\n<li>"Bluetooth."</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Нулиране на настройките"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Да се нулират ли всички мрежови настройки? Не можете да отмените това действие!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Нулиране?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Този потребител не може да нулира мрежовите настройки"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Мрежовите настройки са нулирани"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Възст. на фабричните настройки"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> профила ще бъдат нулирани</item>
-      <item quantity="one">1 профил ще бъде нулиран</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Вътрешното хранилище ще се нулира и всички данни ще бъдат изчистени"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Изтриване на всички данни (възстановяване на фабричните настройки)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на таблета ви, включително:\n\n"<li>"профила ви в Google;"</li>\n<li>"данни и настройки от системата и приложенията;"</li>\n<li>"изтеглени приложения."</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на телефона ви, включително:\n\n"<li>"профила ви в Google"</li>\n<li>"данни и настройки от системата и приложенията"</li>\n<li>"изтеглени приложения"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Понастоящем сте влезли в следните профили:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Информация за безопасност"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Нямате връзка за данни. За да видите тази информация сега, отворете %s от всеки компютър, свързан с интернет."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Зарежда се…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Изберете паролата си"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Задайте опция за заключване на екрана"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"От съображения за сигурност задайте парола"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Задайте парола, за да ползвате отпечатък"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Изберете фигурата си"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Задайте фигура, за да ползвате отпечатък"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Изберете своя ПИН"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"От съображения за сигурност задайте ПИН код"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Задайте ПИН, за да ползвате отпечатък"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Потвърдете паролата си"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Въведете отново паролата си"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Потвърдете фигурата си"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Потвърдете ПИН кода си"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Въведете отново ПИН кода си"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Паролите не си съответстват"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"ПИН кодовете не са идентични"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Избор на отключване"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Използвайте служебната си фигура, за да продължите"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Въведете служебния си ПИН код, за да продължите"</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">"След рестартирането на устройството трябва да въведете ПИН кода за него, за да продължите."</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">"След рестартирането на устройството трябва да въведете служебния си ПИН код, за да продължите."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"След рестартирането на устройството трябва да въведете служебната си парола, за да продължите."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"За допълнителна сигурност използвайте фигурата за устройството си"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"За допълнителна сигурност въведете ПИН кода за устройството си"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"За допълнителна сигурност въведете паролата за устройството си"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"За допълнителна сигурност използвайте служебната си фигура"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"За допълнителна сигурност въведете служебния си ПИН код"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"За допълнителна сигурност въведете служебната си парола"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Фабр. настройки на телефона са били възстановени. За да го ползвате, въведете предишната си фигура."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Фабр. настройки на телефона са били възстановени. За да го ползвате, въведете предишния си ПИН код."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Фабр. настройки на телефона са били възстановени. За да го ползвате, въведете предишната си парола."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Потвърждаване на фигурата"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Потвърждаване на ПИН кода"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Потвърждаване на паролата"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Грешен ПИН код"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Грешна парола"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Грешна фигура"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Да се създаде ли приспособлението и да се разреши ли достъп?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"След като създадете приспособлението, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> има достъп до всички показвани от него данни."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Да се разреши на <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> винаги да създава приспособления и да осъществява достъп до данните им"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>д <xliff:g id="HOURS">%2$d</xliff:g>ч <xliff:g id="MINUTES">%3$d</xliff:g>м <xliff:g id="SECONDS">%4$d</xliff:g>с"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>ч <xliff:g id="MINUTES">%2$d</xliff:g>м <xliff:g id="SECONDS">%3$d</xliff:g>с"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>м <xliff:g id="SECONDS">%2$d</xliff:g>с"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>с"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"Статистически данни за употребата"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Статистически данни за употребата"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Сортиране по:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Екранни четци, дисплей, контроли за взаимодействие"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Настройки при зрителни проблеми"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Можете да персонализирате устройството така, че да отговаря на нуждите ви. Тези функции за достъпност могат да бъдат променени по-късно от „Настройки“."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Увеличаване на размера на шрифта"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Промяна на размера на шрифта"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Екранни четци"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Аудио и екранен текст"</string>
     <string name="display_category_title" msgid="685461049938269166">"Дисплей"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><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_screen_magnification_navbar_summary" msgid="1996584694050087161">"Когато функцията за увеличение е включена, можете бързо да увеличавате мащаба посредством бутона за достъпност в долната част на екрана.\n\n"<b>"За да промените мащаба"</b>", натиснете бутона за достъпност, след което докоснете произволно място на екрана.\n"<ul><li>"Плъзнете 2 или повече пръсти, за да превъртите."</li>\n<li>"Съберете или разтворете 2 или повече пръсти, за да коригирате мащаба."</li></ul>\n\n<b>"За да промените временно мащаба"</b>", натиснете бутона за достъпност, след което докоснете и задръжте произволно място на екрана.\n"<ul><li>"Плъзнете пръста си, за да се придвижите на екрана."</li>\n<li>"Вдигнете пръста си, за да намалите мащаба."</li></ul>\n\n"Не можете да увеличавате мащаба на клавиатурата или лентата за навигация."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Бутонът за достъпност е настроен за <xliff:g id="SERVICE">%1$s</xliff:g>. За да използвате функцията за увеличение, докоснете и задръжте бутона за достъпност, след което я изберете."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Пряк път за достъпност"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Бутони за силата на звука: Пряк път"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Услуга за прекия път"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Разрешаване за заключения екран"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Когато прекият път е включен, можете да стартирате дадена функция за достъпност, като натиснете двата бутона за силата на звука и ги задържите за 3 секунди."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Когато прекият път е включен, можете да стартирате дадена функция за достъпност, като натиснете двата бутона за силата на звука и ги задържите за 3 секунди."</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">"Ниво на мащаба на екрана: Автоакт."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Ниво на мащаба на екрана при преходи на прилож.: Актуал."</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Може да засегне ефективността"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Кликване след спиране на курсора"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Забавяне преди кликване"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ВКЛЮЧЕНО"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ИЗКЛЮЧЕНО"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Показване в „Бързи настройки“"</string>
@@ -2358,6 +2363,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Управление на плановете"</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>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мобилни мрежи"</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_metered_auto" msgid="1262028400911918865">"Автоматично"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"С отчитане"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Без отчитане"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Отчетените от оператора данни може да се различават от показаните на у-вото ви."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Спешно обаждане"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Назад към обаждането"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Мениджър на обажданията"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Спешни излъчвания"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Сигнали при спешни случаи"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Мрежови оператори"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Имена на точките за достъп"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Подобрен режим за 4G LTE"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Предпочитана SIM карта за"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Извеждане на запитване всеки път"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Изборът е задължителен"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Избиране на SIM карта"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Настройки"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">Показване на %d скрити елемента</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Известия за прилож."</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Категория с известия"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Важност"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Нека приложението да реши"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Разрешаване на звуковия сигнал"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Без показване на известия"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Без звук или визуално прекъсване"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Без звук"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Възпроизвеждане на звук"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Възпроизвеждане на звук и показване на изскачащ прозорец на екрана"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Показване на изскачащ прозорец на екрана"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Малка важност"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Средна важност"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Голяма важност"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Неотложна важност"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Разрешаване на звуковия сигнал"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Без издаване на звук, вибриране или показване на тези известия на текущия екран."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Разрешаване на прекъсвания"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Разрешаване на приложението да издава звук, да вибрира и/или да показва изскачащи прозорци с известия на екрана"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Малка важност"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Средна важност"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Голяма важност"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"картина в картината"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Картина в картината"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Разрешаване на режима „Картина в картината“"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Разрешете на това приложение да създава прозорец в режима „Картина в картината“, докато е отворено или след излизане от него (например, за да продължите да гледате видеоклип). Съответният прозорец ще се показва върху другите приложения, които използвате."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Разрешаване на това приложение да създава прозорец в режима „Картина в картината“, докато е отворено или след като излезете от него (например за да продължите да гледате видеоклип). Съответният прозорец ще се показва върху другите приложения, които използвате."</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>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Прехвърляне на файлове"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Прехвърляне на снимки (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Използване на устройството като MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Отразяване на SMS"</string>
     <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>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Задаване на график за Нощно осветление"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Заспивайте по-лесно с кехлибарения нюанс"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Нощно осветление: Включено"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Екранът е с кехлибареножълт нюанс. Това може да ви помогне да заспите."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Предложения"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Използване на по-студени цветове за дисплея"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"За да приложите промяната на цветовете, изключете екрана"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"За да приложите промяната във функцията за наблюдение на телефонията, рестартирайте устройството"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HDR+ с Camera HAL"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"За да приложите промяната, свързана с режима „HDR+ с Camera HAL“, рестартирайте устройството"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Сензор на лазера на камерата"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматични системни актуализации"</string>
     <string name="usage" msgid="2977875522080448986">"Пренос на данни"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Пренос на мобилни данни"</string>
@@ -3410,7 +3427,7 @@
     <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="data_usage_template" msgid="2923744765873163859">"Използвани <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">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Изтриване на данните и преобразуване"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Нулиране на ограничаването на скоростта в ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Ограничаването на скоростта в ShortcutManager е нулирано"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Известия на заключения екран: Управление"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Управление на информацията на заключения екран"</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="8483187649355540109">"Поддръжка и съвети"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Няма инсталирани приложения, които са заявили достъп до SMS съобщения, за които се таксува получателят"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"SMS съобщенията, за които се таксува получателят, може да ви въвлекат в разходи и ще увеличат сметката към оператора ви. Ако дадете разрешението на дадено приложение, ще можете да изпращате такива съобщения чрез него."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Достъп до SMS, за които получателят заплаща"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Устройството не е видимо за други устройства"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Изкл."</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Установена е връзка с/ъс <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Установена е връзка с няколко устройства"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Демонстрационен режим на системния ПИ"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Мигновени приложения"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Отваряйте връзките в приложения дори ако те не са инсталирани"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Мигновени приложения"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Профил за мигновените приложения"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Предпочитания за мигновените приложения"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Инсталирани приложения"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Хранилището ви вече се управлява от съответния мениджър"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Профили за <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Режимът за винаги включена виртуална частна мрежа (VPN) е активиран в личния ви потребителски профил"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Режимът за винаги включена виртуална частна мрежа (VPN) е активиран в служебния ви потребителски профил"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Зададен е общ HTTP прокси сървър"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Надеждни идентификационни данни"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Надеждни идентификационни данни"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Надеждни идентификационни данни в личния ви потребителски профил"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Надеждни идентификационни данни в служебния ви потребителски профил"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Поне <xliff:g id="COUNT_1">%d</xliff:g> сертификата от сертифициращ орган</item>
       <item quantity="one">Поне <xliff:g id="COUNT_0">%d</xliff:g> сертификат от сертифициращ орган</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Carrier Provisioning Info"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Задействане на обезпечаването от оператора"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Нови и вълнуващи неща"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Вижте водещите 5 функции"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Запознайте се с новия си телефон"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Запознайте се с новия си таблет"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Запознайте се с новото си устройство"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Тази функция не е налице на устройството"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Състояние на регистрацията за незабавни съобщения"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Регистрирано"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Не е регистрирано"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index ca8e495..6c61c07 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s আপনার বার্তাগুলি অ্যাক্সেস করতে ইচ্ছুক। %2$s এ অ্যাক্সেস দেবেন?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"সিম অ্যাক্সেস করার অনুরোধ"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> আপনার সিম কার্ড অ্যাক্সেস করতে চায়। এই সিম কার্ড অ্যাক্সেসের অনুমোদন দিলে তা সংযোগের সময়ে আপনার ডিভাইসে ডেটা সংযোগ অক্ষম করবে। <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> -এ অ্যাক্সেস দিন"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"অন্য ডিভাইসে <xliff:g id="DEVICE_NAME">^1</xliff:g> নামে দেখা যাবে"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"অন্য ডিভাইসে “<xliff:g id="DEVICE_NAME">^1</xliff:g>” নামে দেখা যাবে"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"আপনার ডিভাইসগুলি"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"নতুন ডিভাইস যুক্ত করুন"</string>
     <string name="date_and_time" msgid="9062980487860757694">"দিন ও তারিখ"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"পরবর্তী"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"আঙ্গুলের ছাপ এড়িয়ে যেতে চান?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"ফিঙ্গারপ্রিন্ট সেট-আপ করতে এক বা দুই সময় মিনিট লাগবে। আপনি যদি এড়িয়ে যেতে চান তবে পরে সেটিংসে গিয়ে পরিবর্তন করতে পারবেন।"</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"স্ক্রিন লক এড়িয়ে যেতে চান?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"ডিভাইসের সুরক্ষা বৈশিষ্ট্যগুলি চালু করা হবে না। এই ট্যাবলেটটি হারিয়ে গেলে, চুরি হয়ে গেলে অথবা রিসেট করা হলে সেটি অন্যদের ব্যবহার করতে আপনি আটকাতে পারবেন না।"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"ডিভাইসের সুরক্ষা বৈশিষ্ট্যগুলি চালু করা হবে না। এই ডিভাইসটি হারিয়ে গেলে, চুরি হয়ে গেলে অথবা রিসেট করা হলে সেটি অন্যদের ব্যবহার করতে আপনি আটকাতে পারবেন না।"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"ডিভাইসের সুরক্ষা বৈশিষ্ট্যগুলি চালু করা হবে না। এই ফোনটি হারিয়ে গেলে, চুরি হয়ে গেলে অথবা রিসেট করা হলে সেটি অন্যদের ব্যবহার করতে আপনি আটকাতে পারবেন না।"</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"আপনি অনুমোদিত সর্বোচ্চ সংখ্যক আঙ্গুলের ছাপ যোগ করেছেন"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"এর বেশি আঙ্গুলের ছাপ যোগ করা যাবে না"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"সমস্ত আঙ্গুলের ছাপ সরাবেন?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' সরান"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"আপনি কি এই আঙুলের ছাপটি মুছে ফেলতে চান?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"আপনি আপনার আঙ্গুলের ছাপ দিয়ে আপনার ফোন আনলক করতে, কেনাকাটাগুলি অনুমোদন করতে, বা অ্যাপগুলিতে প্রবেশ করতে পারবেন না"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"আপনি আপনার আঙ্গুলের ছাপগুলি ব্যবহার করে আপনার কর্মস্থলের প্রোফাইল আনলক করতে, কেনাকাটাগুলি অনুমোদন করতে বা কাজের অ্যাপগুলিতে প্রবেশ করতে পারবেন না"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"হ্যাঁ, সরান"</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"অতিরিক্ত নিরাপত্তার জন্য একটি ব্যাকআপ স্ক্রিন লক সেট-আপ করুন৷"</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"অতিরিক্ত নিরাপত্তার জন্য, একটি ব্যাক-আপ স্ক্রিন লক সেট-আপ করুন৷"</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>
@@ -497,37 +502,37 @@
     <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_fingerprint" msgid="8212242533942400457">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি আপনার প্যাটার্ন ছাড়া কাজ করবে না৷<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"ডিভাইসের সুরক্ষা বৈশিষ্ট্যগুলি আপনার প্যাটার্ন ছাড়া কাজ করবে না।<xliff:g id="EMPTY_LINE">
 
-</xliff:g>এছাড়াও আপনার সংরক্ষিত আঙ্গুলের ছাপগুলিকে এই ডিভাইস থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার ফোন আনলক করতে, কেনাকাটা অনুমোদন, বা অ্যাপ্লিকেশানগুলিতে প্রবেশ করতে পারবেন না৷\""</string>
+</xliff:g>এছাড়াও আপনার সেভ করা আঙ্গুলের ছাপগুলিকে এই ডিভাইস থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার ফোন আনলক, কেনাকাটা অনুমোদন, বা অ্যাপগুলিতে সাইন-ইন করতে পারবেন না।"</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি আপনার পিন ছাড়া কাজ করবে না৷"</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি আপনার পিন ছাড়া কাজ করবে না৷<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"ডিভাইসের সুরক্ষা বৈশিষ্ট্যগুলি আপনার পিন ছাড়া কাজ করবে না।<xliff:g id="EMPTY_LINE">
 
-</xliff:g>এছাড়াও আপনার সংরক্ষিত আঙ্গুলের ছাপগুলিকে এই ডিভাইস থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার ফোন আনলক করতে, কেনাকাটা অনুমোদন, বা অ্যাপ্লিকেশনগুলিতে সাইন-ইন করতে পারবেন না৷\""</string>
+</xliff:g>এছাড়াও আপনার সেভ করা আঙ্গুলের ছাপগুলিকে এই ডিভাইস থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার ফোন আনলক, কেনাকাটা অনুমোদন, বা অ্যাপগুলিতে সাইন-ইন করতে পারবেন না।"</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"ডিভাইসের সুরক্ষা বৈশিষ্ট্যগুলি আপনার পাসওয়ার্ড ছাড়া কাজ করবে না।<xliff:g id="EMPTY_LINE">
 
-</xliff:g>এছাড়াও আপনার সংরক্ষিত আঙ্গুলের ছাপগুলিকে এই ডিভাইস থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার ফোন আনলক করতে, কেনাকাটা অনুমোদন, বা অ্যাপ্লিকেশানগুলিতে প্রবেশ করতে পারবেন না৷\""</string>
+</xliff:g>এছাড়াও আপনার সেভ করা ছাপগুলিকে এই ডিভাইস থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার ফোন আনলক, কেনাকাটা অনুমোদন, বা অ্যাপগুলিতে সাইন-ইন করতে পারবেন না।"</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"ডিভাইসের সুরক্ষা বৈশিষ্ট্যগুলি আপনার স্ক্রিন লক ছাড়া কাজ করবে না।<xliff:g id="EMPTY_LINE">
 
-</xliff:g>এছাড়াও আপনার সেভ করা আঙ্গুলের ছাপগুলিকে এই ডিভাইস থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার ফোন আনলক করতে, কেনাকাটা অনুমোদন, বা অ্যাপ্লিকেশনগুলিতে সাইন-ইন করতে পারবেন না৷\""</string>
+</xliff:g>এছাড়াও আপনার সেভ করা আঙ্গুলের ছাপগুলিকে এই ডিভাইস থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার ফোন আনলক, কেনাকাটা অনুমোদন, বা অ্যাপগুলিতে সাইন-ইন করতে পারবেন না।"</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"প্রোফাইল সুরক্ষার বৈশিষ্ট্যগুলি আপনার প্যাটার্ন ছাড়া কাজ করবে না৷"</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"প্রোফাইল সুরক্ষার বৈশিষ্ট্যগুলি আপনার প্যাটার্ন ছাড়া কাজ করবে না৷<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"প্রোফাইলের সুরক্ষা বৈশিষ্ট্যগুলি আপনার প্যাটার্ন ছাড়া কাজ করবে না।<xliff:g id="EMPTY_LINE">
 
-</xliff:g>এছাড়াও আপনার সংরক্ষিত আঙ্গুলের ছাপগুলিকে এই প্রোফাইল থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার প্রোফাইল আনলক করতে, কেনাকাটিতে অনুমোদন দিতে, বা অ্যাপ্লিকেশানগুলিতে প্রবেশ করতে পারবেন না৷\""</string>
+</xliff:g>এছাড়াও আপনার সেভ করা আঙ্গুলের ছাপগুলিকে এই প্রোফাইল থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার প্রোফাইল আনলক, কেনাকাটা অনুমোদন, বা অ্যাপগুলিতে সাইন-ইন করতে পারবেন না।"</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"প্রোফাইল সুরক্ষার বৈশিষ্ট্যগুলি আপনার পিন ছাড়া কাজ করবে না৷"</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"প্রোফাইল সুরক্ষার বৈশিষ্ট্যগুলি আপনার পিন ছাড়া কাজ করবে না৷<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"প্রোফাইলের সুরক্ষা বৈশিষ্ট্যগুলি আপনার পিন ছাড়া কাজ করবে না।<xliff:g id="EMPTY_LINE">
 
-</xliff:g>এছাড়াও আপনার সংরক্ষিত আঙ্গুলের ছাপগুলিকে এই প্রোফাইল থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার প্রোফাইল আনলক করতে, কেনাকাটিতে অনুমোদন দিতে, বা অ্যাপ্লিকেশনগুলিতে সাইন-ইন করতে পারবেন না৷\""</string>
+</xliff:g>এছাড়াও আপনার সেভ করা আঙ্গুলের ছাপগুলিকে এই প্রোফাইল থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার প্রোফাইল আনলক, কেনাকাটা অনুমোদন, বা অ্যাপগুলিতে সাইন-ইন করতে পারবেন না।"</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"প্রোফাইল সুরক্ষার বৈশিষ্ট্যগুলি আপনার পাসওয়ার্ড ছাড়া কাজ করবে না৷"</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"প্রোফাইল সুরক্ষার বৈশিষ্ট্যগুলি আপনার পাসওয়ার্ড ছাড়া কাজ করবে না৷<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"প্রোফাইলের সুরক্ষা বৈশিষ্ট্যগুলি আপনার পাসওয়ার্ড ছাড়া কাজ করবে না।<xliff:g id="EMPTY_LINE">
 
-</xliff:g>এছাড়াও আপনার সংরক্ষিত আঙ্গুলের ছাপগুলিকে এই প্রোফাইল থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার প্রোফাইল আনলক করতে, কেনাকাটিতে অনুমোদন দিতে, বা অ্যাপ্লিকেশানগুলিতে প্রবেশ করতে পারবেন না৷\""</string>
+</xliff:g>এছাড়াও আপনার সেভ করা আঙ্গুলের ছাপগুলিকে এই প্রোফাইল থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার প্রোফাইল আনলক, কেনাকাটা অনুমোদন, বা অ্যাপগুলিতে সাইন-ইন করতে পারবেন না।"</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"আপনার স্ক্রিন লক ছাড়া প্রোফাইল সুরক্ষার বৈশিষ্ট্যগুলি কাজ করবে না৷"</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"আপনার স্ক্রিন লক ছাড়া প্রোফাইল সুরক্ষার বৈশিষ্ট্যগুলি কাজ করবে না৷<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"প্রোফাইলের সুরক্ষা বৈশিষ্ট্যগুলি আপনার স্ক্রিন লক ছাড়া কাজ করবে না।<xliff:g id="EMPTY_LINE">
 
-</xliff:g>এছাড়াও আপনার সেভ করা আঙ্গুলের ছাপগুলিকে এই প্রোফাইল থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার প্রোফাইল আনলক করতে, কেনাকাটিতে অনুমোদন দিতে, বা অ্যাপ্লিকেশনগুলিতে সাইন-ইন করতে পারবেন না৷\""</string>
+</xliff:g>এছাড়াও আপনার সেভ করা আঙ্গুলের ছাপগুলিকে এই প্রোফাইল থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার প্রোফাইল আনলক, কেনাকাটা অনুমোদন, বা অ্যাপগুলিতে সাইন-ইন করতে পারবেন না।"</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"হ্যাঁ, সরান"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"আনলক প্যাটার্ন পরিবর্তন করুন"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"আনলক পিন পরিবর্তন করুন"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"সংখ্যাগুলি ছোট থেকে বড় ক্রমে, বড় থেকে ছোট ক্রমে বা একই সংখ্যাকে বার বার লেখা যাবে না"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ঠিক আছে"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"বাতিল"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"খালি করুন"</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>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS উপলব্ধ"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS উপলব্ধ)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"আপনার নেটওয়ার্ক পাসওয়ার্ডটি লিখুন"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"পরিষেবা প্রদানকারীর ওয়াই-ফাই নেটওয়ার্ক"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> এর মাধ্যমে সংযুক্ত করুন"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"অবস্থান নির্ভুলতা উন্নতি ও অন্যান্য উদ্দ্যেশ্যের জন্য <xliff:g id="APP_NAME">%1$s</xliff:g> নেটওয়ার্ক স্ক্যান চালু করতে চাইছে, এমনকি ওয়াই-ফাই বন্ধ থাকা সত্ত্বেও।\n\nযে সব অ্যাপ্লিকেশানগুলি স্ক্যান করতে চাই তাদের জন্য এটির অনুমতি দেবেন?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"এটি বন্ধ করতে, ওভারফ্লো মেনুতে ‘উন্নত’ লেখায় যান"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"অনুমতি দিন"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"সংযুক্ত করুন"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"নেটওয়ার্কের সাথে সংযোগ করতে ব্যর্থ হয়েছে"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"ভুলে যান"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"বদলান"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"নেটওয়ার্ক ভুলে যেতে করতে ব্যর্থ হয়েছে"</string>
     <string name="wifi_save" msgid="3331121567988522826">"সেভ করুন"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"নেটওয়ার্ক সংরক্ষণ করতে ব্যর্থ হয়েছে"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"উন্নত ওয়াই-ফাই"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC ঠিকানা"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP ঠিকানা"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"নেটওয়ার্কের তথ্য"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"সাবনেট মাস্ক"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 অ্যাড্রেসগুলি"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"আমন্ত্রণ বাতিল করবেন?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g> এর সঙ্গে সংযোগ করতে আপনি কি আমন্ত্রণ বাতিল করতে চান?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"এই গোষ্ঠীটি ভুলে যান?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"পোর্টেবল  ওয়াই-ফাই হটস্পট"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"ওয়াই-ফাই হটস্পট"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"অন্য ডিভাইসের সাথে ইন্টারনেট অথবা কন্টেন্ট শেয়ার করা হচ্ছে না"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"হটস্পটের মাধ্যমে এই ট্যাবলেটের ইন্টারনেট সংযোগ শেয়ার করা হচ্ছে"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"হটস্পটের মাধ্যমে এই ফোনের ইন্টারনেট সংযোগ শেয়ার করা হচ্ছে"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"অ্যাপ কন্টেন্ট শেয়ার করছে। ইন্টারনেট সংযোগ শেয়ার করতে হটস্পট বন্ধ করে তারপর আবার চালু করুন"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"ওয়াই-ফাই এর নাম"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"হটস্পটের নাম"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> চালু করা হচ্ছে..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> এর সাথে অন্য ডিভাইস সংযুক্ত হতে পারে"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"ওয়াই-ফাই পাসওয়ার্ড"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"হটস্পটের পাসওয়ার্ড"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP Band"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"আপনার অন্য ডিভাইসের জন্য একটি ওয়াই-ফাই নেটওয়ার্ক তৈরি করার জন্য হটস্পট ব্যবহার করুন। হটস্পট আপনার মোবাইলের ডেটা ব্যবহার করে ইন্টারনেট সংযোগ প্রদান করে। মোবাইলের ডেটার জন্য অতিরিক্ত চার্জ লাগতে পারে।"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"অ্যাপগুলি আশেপাশের ডিভাইসের সাথে কন্টেন্ট শেয়ার করার জন্য হটস্পট তৈরি করতে পারে।"</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"ওয়াই-ফাই কলিং চালু থাকার সময়ে, আপনার পছন্দ এবং কোন সিগন্যাল বেশি শক্তিশালী তার উপর নির্ভর করে আপনার ফোন ওয়াই-ফাই নেটওয়ার্ক বা আপনার পরিষেবা প্রদানকারীর নেটওয়ার্কের মাধ্যমে আপনার কলের রুট তৈরি করে। এই বৈশিষ্ট্যটি চালু করার আগে, আপনার পরিষেবা প্রদানকারীর কাছে ফি-গুলি এবং অন্যান্য বিশদ বিবরণ সম্বন্ধে পরীক্ষা করুন।"</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"জরুরী ঠিকানা আপডেট করুন"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"আপনি যদি ওয়াই ফাই ব্যবহার করে ৯১১ এ কল করেন তাহলে জরুরি পরিষেবাগুলি  আপনার অবস্থান হিসেবে আপনার ঠিকানাকে ব্যবহার করে৷"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"আপনি ওয়াই-ফাই এর মাধ্যমে জরুরি কল করলে জরুরি পরিষেবাগুলি আপনার অবস্থান হিসেবে এই ঠিকানাটি ব্যবহার করবে"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"প্রদর্শন"</string>
     <string name="sound_settings" msgid="5534671337768745343">"সাউন্ড"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ভলিউম"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"খুঁজুন"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"অনুসন্ধান সেটিংস এবং ইতিহাস পরিচালনা করুন"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"কোনো ফলাফল নেই"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"ইতিহাস সাফ করুন"</string>
     <string name="display_settings" msgid="7965901687241669598">"প্রদর্শন"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"স্বতঃ ঘূর্ণায়মান স্ক্রিন"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"উজ্জ্বল রঙ"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"ডিফল্ট APN সেটিংস পুনরুদ্ধার করা হচ্ছে।"</string>
     <string name="menu_restore" msgid="8260067415075573273">"ডিফল্টে আবার সেট করুন"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"ডিফল্ট APN সেটিংস আবার সেট করা সম্পন্ন হয়েছে।"</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"রিসেট করুন"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"নেটওয়ার্ক সেটিংস আবার সেট করা"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"রিসেটের বিকল্পগুলি"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"নেটওয়ার্ক, অ্যাপ, অথবা ডিভাইস রিসেট করা যায়"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"ওয়াই-ফাই, মোবাইল এবং ব্লুটুথ রিসেট করুন"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"এগুলি সহ সমস্ত নেটওয়ার্ক সেটিংস আবার সেট করবে:\n\n"<li>"ওয়াই ফাই "</li>\n<li>"সেলুলার ডাটা "</li>\n<li>"ব্লুটুথ"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"সেটিংস আবার সেট করুন"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"সমস্ত নেটওয়ার্ক সেটিংস আবার সেট করবেন? আপনি এই প্রক্রিয়াটি পূর্বাবস্থায় ফেরাতে পারবেন না!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"আবার সেট করবেন?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"এই ব্যবহারকারীদের জন্য নেটওয়ার্ক আবার সেট করুন উপলব্ধ নয়"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"নেটওয়ার্ক সেটিংস আবার সেট করা হয়েছে"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"ফ্যাক্টরি ডেটা আবার সেট করুন"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g>টি অ্যাকাউন্ট রিসেট করা হবে</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g>টি অ্যাকাউন্ট রিসেট করা হবে</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"অভ্যন্তরীণ স্টোরেজ এবং সমস্ত ডেটা রিসেট করা হবে"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"সমস্ত ডেটা মুছুন (ফ্যাক্টরি রিসেট)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"এটি আপনার ট্যাবলেটের "<b>"ইন্টারনাল স্টোরেজ"</b>", থেকে সমস্ত ডেটা মুছে দেবে, এগুলি সহ:\n\n"<li>"আপনার Google অ্যাকাউন্ট"</li>\n<li>"সিস্টেম এবং অ্যাপ্লিকেশন ডেটা এবং সেটিংস"</li>\n<li>"ডাউনলোড করা অ্যাপ্লিকেশনগুলি"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"এটি আপনার ফোনের "<b>"ইন্টারনাল স্টোরেজ"</b>", থেকে সমস্ত ডেটা মুছে দেবে, এগুলি সহ:\n\n"<li>"আপনার Google অ্যাকাউন্ট"</li>\n<li>"সিস্টেম এবং অ্যাপ্লিকেশন ডেটা এবং সেটিংস"</li>\n<li>"ডাউনলোড করা অ্যাপ্লিকেশনগুলি"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"আপনি বর্তমানে নিম্নলিখিত অ্যাকাউন্টে প্রবেশ করে আছেন:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"নিরাপত্তা তথ্য"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"আপনার কোনো ডেটা সংযোগ নেই। এখন এই তথ্য দেখতে, ইন্টারনেটের সাথে সংযুক্ত যে কোনো কম্পিউটার থেকে %s এ যান।"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"লোড হচ্ছে..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"আপনার পাসওয়ার্ড বাছুন"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"একটি স্ক্রিন লক সেট করুন"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"নিরাপত্তার জন্য একটি পাসওয়ার্ড সেট করুন"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"আঙ্গুলের ছাপ ব্যবহার করার জন্য পাসওয়ার্ড সেট করুন"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"আপনার প্যাটার্ন বেছে নিন"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"আঙ্গুলের ছাপ ব্যবহার করার জন্য প্যাটার্ন সেট করুন"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"আপনার পিন বাছুন"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"নিরাপত্তার জন্য একটি পিন সেট করুন"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"আঙ্গুলের ছাপ ব্যবহার করার জন্য পিন সেট করুন"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"আপনার পাসওয়ার্ড নিশ্চিত করুন"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"আপনার পাসওয়ার্ডটি আবার লিখুন"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"আপনার প্যাটার্ন নিশ্চিত করুন"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"আপনার পিন নিশ্চিত করুন"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"আপনার পিনটি আবার লিখুন"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"পাসওয়ার্ডগুলি মিলছে না"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"পিন মিলছে না"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"আনলক বেছে নিন"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"চালিয়ে যেতে আপনার কর্মস্থলের প্যাটার্ন ব্যবহার করুন"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"চালিয়ে যেতে আপনার অফিসের পিন লিখুন"</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">"চালিয়ে যেতে আপনার ডিভাইসের পিন লিখুন৷ ডিভাইস রিস্টার্ট হওয়ার পর আবশ্যক৷"</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">"চালিয়ে যেতে আপনার অফিসের পিন লিখুন৷ ডিভাইস রিস্টার্ট হওয়ার পর আবশ্যক৷"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"চালিয়ে যেতে আপনার কর্মস্থলের পাসওয়ার্ড লিখুন৷ ডিভাইস পুনঃসূচনা হওয়ার পর আবশ্যক৷"</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"অতিরিক্ত নিরাপত্তার জন্য, আপনার ডিভাইসের প্যাটার্ন ব্যবহার করুন"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"অতিরিক্ত নিরাপত্তার জন্য, আপনার ডিভাইসের পিন লিখুন"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"অতিরিক্ত নিরাপত্তার জন্য, আপনার ডিভাইসের পাসওয়ার্ড লিখুন"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"অতিরিক্ত নিরাপত্তার জন্য, আপনার অফিসের প্যাটার্ন ব্যবহার করুন"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"অতিরিক্ত নিরাপত্তার জন্য, আপনার অফিসের পিন লিখুন"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"অতিরিক্ত নিরাপত্তার জন্য, আপনার অফিসের পাসওয়ার্ড লিখুন"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"আপনার ফোন ফ্যাক্টরি সেটিংসে রিসেট করা হয়েছে। এই ফোনটি ব্যবহার করতে হলে, আপনার আগের প্যাটার্নটি দিন।"</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"আপনার ফোন ফ্যাক্টরি সেটিংসে রিসেট করা হয়েছে। এই ফোনটি ব্যবহার করতে হলে আপনার আগের পিনটি লিখুন।"</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"আপনার ফোন ফ্যাক্টরি সেটিংসে রিসেট করা হয়েছে। এই ফোনটি ব্যবহার করতে হলে, আপনার আগের পাসওয়ার্ডটি লিখুন।"</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"প্যাটার্ন যাচাই করুন"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"পিন যাচাই করুন"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"পাসওয়ার্ড যাচাই করুন"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"ভুল পিন"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"ভুল পাসওয়ার্ড"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"ভুল প্যাটার্ন"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"উইজেট তৈরি করে ব্যবহারের অনুমতি দেবেন?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"উইজেট তৈরি করার পরে, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> যে ডেটাগুলি প্রদর্শন করে তা অ্যাক্সেস করতে পারবে।"</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"উইজেট তৈরি করতে এবং তাদের ডেটা অ্যাক্সেস করতে <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> কে সর্বদা অনুমতি দিন"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>দিঃ <xliff:g id="HOURS">%2$d</xliff:g>ঘঃ <xliff:g id="MINUTES">%3$d</xliff:g>মি <xliff:g id="SECONDS">%4$d</xliff:g>সেঃ"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>ঘঃ <xliff:g id="MINUTES">%2$d</xliff:g>মি <xliff:g id="SECONDS">%3$d</xliff:g>সেঃ"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>মি <xliff:g id="SECONDS">%2$d</xliff:g>সেঃ"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>সেকেন্ড"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"ব্যবহারের পরিসংখ্যান"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"ব্যবহারের পরিসংখ্যান"</string>
     <string name="display_order_text" msgid="8592776965827565271">"এই অনুসারে বাছুন:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"স্ক্রিন রিডার, ডিসপ্লে, ইন্টারঅ্যাকশন নিয়ন্ত্রণগুলি"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"দৃষ্টিশক্তি সেটিংস"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"আপনি এই ডিভাইসটি নিজের পছন্দমত সেট করতে পারেন৷ এই অ্যাক্সেসযোগ্যতার বৈশিষ্ট্যগুলি পরে সেটিংসে গিয়ে পরিবর্তন করা যাবে৷"</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"ফন্ট বড় করুন"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"হরফের মাপ পরিবর্তন করুন"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"স্ক্রিন রিডার"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"অডিও এবং অন-স্ক্রিন পাঠ্য"</string>
     <string name="display_category_title" msgid="685461049938269166">"ডিসপ্লে"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"জুম করার জন্য"</b>" স্ক্রিনে ৩ বার দ্রুত ট্যাপ করুন।\n"<ul><li>"স্ক্রল করতে ২টি বা তার বেশি আঙ্গুল টেনে নিয়ে যান"</li>\n<li>"জুমের সমন্বয়ের জন্য ২টি বা তার বেশি আঙ্গুল ব্যবহার করুন"</li></ul>\n\n<b>" অস্থায়ী জুমের জন্য"</b>" স্ক্রিনে দ্রুত ৩ বার ট্যাপ করুন এবং তৃতীয় বার ট্যাপ করার সময় আঙ্গুলটি দিয়ে টিপে ধরুন।\n"<ul><li>"স্ক্রিনের উপরে বিভিন্ন দিকে যাওয়ার জন্য আঙ্গুল টেনে নিয়ে যান"</li>\n<li>"জুম কম করতে আঙ্গুল সরিয়ে নিন"</li></ul>\n\n"কিবোর্ডে অথবা নেভিগেশন বারে জুম করতে পারবেন না।"</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"যখন ম্যাগনিফিকেশন চালু থাকবে তখন দ্রুত ম্যাগনিফাই করতে স্ক্রিনের মাঝখানের অ্যাক্সেসযোগ্যতা বোতামটি ব্যবহার করুন। \n\n"<b>"জুমের জন্য"</b>", অ্যাক্সেসযোগ্যতা বোতামটি ট্যাপ করুন, তারপর স্ক্রিনের যেকোনও জায়গায় ট্যাপ করুন।\n"<ul><li>"স্ক্রল করতে ২টি বা তার বেশি আঙ্গুল টেনে নিয়ে যান"</li>\n<li>"জুমের সমন্বয়ের জন্য ২ বা তার বেশি আঙ্গুল ব্যবহার করুন "</li></ul>\n\n<b>"অস্থায়ীভাবে জুমের জন্য"</b>"অ্যাক্সেসযোগ্যতা বোতামটি ট্যাপ করুন, তারপর স্ক্রিনের যেকোনও জায়গায় স্পর্শ করে টিপে ধরুন।\n"<ul><li>"স্ক্রিনের উপরে বিভিন্ন দিকে যাওয়ার জন্য আঙ্গুল টেনে নিয়ে যান"</li>\n<li>"জুম কম করতে আঙ্গুল সরিয়ে নিন"</li></ul>\n\n"কিবোর্ডে অথবা নেভিগেশন বারে জুম করতে পারবেন না।"</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"অ্যাক্সেসযোগ্যতা বোতামটি <xliff:g id="SERVICE">%1$s</xliff:g> এর সাথে সেট করা আছে। ম্যাগনিফিকেশন ব্যবহার করার জন্য অ্যাক্সেসযোগ্যতা বোতামটি স্পর্শ করে টিপে ধরুন, তারপর ম্যাগনিফিকেশন বেছে নিন।"</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"সহজ ব্যবহার শর্টকাট"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"ভলিউম কী শর্টকাট"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"শর্টকাট সার্ভিসগুলি"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"লক স্ক্রিন থেকে অনুমতি নিন"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"যখন শর্টকাটটি চালু থাকবে, কোনও অ্যাক্সেসযোগ্যতা বৈশিষ্ট্য চালু করতে আপনি উভয় ভলিউম বোতামকে ৩ সেকেন্ডের জন্য টিপে ধরতে পারেন।"</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"যখন শর্টকাটটি চালু থাকবে, তখন দুটি ভলিউম বোতাম ৩ সেকেন্ডের জন্য চেপে ধরে রেখে আপনি কোনও অ্যাক্সেসযোগ্যতা বৈশিষ্ট্য চালু করতে পারেন।"</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">"স্ক্রীন বৃহত্তরীকরণ স্বতঃ আপডেট"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"অ্যাপ্লিকেশান ট্রানজিশনের উপর স্ক্রীন বৃহত্তরীকরণ আপডেট"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"কার্য-সম্পাদনায় প্রভাব রাখতে পারে"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"পয়েন্টার সরানো বন্ধ হবার পরেই ক্লিক করুন"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"ক্লিক করার আগে বিলম্ব"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"চালু"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"বন্ধ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"দ্রুত সেটিংসে দেখান"</string>
@@ -1932,13 +1937,13 @@
     </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"প্রিন্ট পরিষেবাগুলি"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"কোনো পরিষেবা ইনস্টল করা নেই"</string>
-    <string name="print_no_printers_found" msgid="989018646884973683">"কোনো মুদ্রক পাওয়া যায়নি"</string>
+    <string name="print_no_printers_found" msgid="989018646884973683">"কোনো প্রিন্টার পাওয়া যায়নি"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"সেটিংস"</string>
-    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"মুদ্রক যোগ করুন"</string>
+    <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_menu_item_add_service" msgid="3811645167869797802">"Add service"</string>
-    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"মুদ্রক যোগ করুন"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"প্রিন্টার যোগ করুন"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"খুঁজুন"</string>
     <string name="print_searching_for_printers" msgid="4680248496457576358">"মুদ্রকগুলি অনুসন্ধান করা হচ্ছে"</string>
     <string name="print_service_disabled" msgid="7739452396114245222">"পরিষেবা অক্ষমিত"</string>
@@ -1949,8 +1954,8 @@
     <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>
-    <string name="print_failed_state_title_template" msgid="1436099128973357969">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> মুদ্রক ত্রুটি"</string>
-    <string name="print_blocked_state_title_template" msgid="9065391617425962424">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> মুদ্রক অবরুদ্ধ করা হয়েছে"</string>
+    <string name="print_failed_state_title_template" msgid="1436099128973357969">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> প্রিন্টার ত্রুটি"</string>
+    <string name="print_blocked_state_title_template" msgid="9065391617425962424">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> প্রিন্টার অবরুদ্ধ করা হয়েছে"</string>
     <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"অনুসন্ধান বাক্স দেখানো হয়েছে"</string>
     <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"অনুসন্ধান বাক্স লুকানো হয়েছে"</string>
     <string name="printer_info_desc" msgid="5824995108703060003">"এই মুদ্রকটির বিষয়ে আরো তথ্য"</string>
@@ -2241,7 +2246,7 @@
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="5221011285568343155">"আপনার ওয়াই-ফাই পাসওয়ার্ড, বুকমার্ক, অন্যান্য সেটিংস এবং অ্যাপ ডেটা ব্যাক-আপ করা বন্ধ করুন, এছাড়াও Google সার্ভারগুলিতে সব কপি মুছে ফেলতে চান?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"ডিভাইস ডেটা (যেমন ওয়াই-ফাই এর পাসওয়ার্ড এবং কলের ইতিহাস) এবং অ্যাপ্লিকেশন ডেটা (যেমন অ্যাপ্লিকেশনগুলির দ্বারা সেভ করা সেটিংস এবং ফাইলগুলি) এর ব্যাক-আপ নেওয়া বন্ধ করবেন, তার সাথে দূরবর্তী সার্ভারে সমস্ত কপি মুছবেন?"</string>
-    <string name="fullbackup_data_summary" msgid="960850365007767734">"দূরবর্তীভাবে ডিভাইস ডেটার (যেমন, ওয়াই-ফাই এর পাসওয়ার্ডগুলি এবং কলের ইতিহাস) এবং অ্যাপ্লিকেশন ডেটার (যেমন অ্যাপ্লিকেশনগুলির দ্বারা সঞ্চিত সেটিংস এবং ফাইলগুলি)স্বয়ংক্রিয়ভাবে ব্যাকআপ নেওয়া হয়৷\n\nআপনি যখন স্বয়ংক্রিয় ব্যাকআপ চালু করেন তখন দূরবর্তীভাবে ডিভাইস এবং অ্যাপ্লিকেশনের ডেটা পর্যায়ক্রমে সংরক্ষিত হয়৷ অ্যাপ্লিকেশন ডেটা যেকোনও ডেটা হতে পারে যা অ্যাপ্লিকেশন সংরক্ষণ করে (বিকাশকারীর সেটিংস এর উপর ভিত্তি করে), পরিচিতি, মেসেজ এবং ফটোগুলির মতো সম্ভাব্য সংবেদনশীল ডেটা অন্তর্ভুক্ত করে৷"</string>
+    <string name="fullbackup_data_summary" msgid="960850365007767734">"দূরবর্তীভাবে ডিভাইস ডেটার (যেমন, ওয়াই-ফাই এর পাসওয়ার্ডগুলি এবং কলের ইতিহাস) এবং অ্যাপ্লিকেশন ডেটার (যেমন অ্যাপ্লিকেশনগুলির দ্বারা সঞ্চিত সেটিংস এবং ফাইলগুলি)স্বয়ংক্রিয়ভাবে ব্যাকআপ নেওয়া হয়৷\n\nআপনি যখন স্বয়ংক্রিয় ব্যাকআপ চালু করেন তখন দূরবর্তীভাবে ডিভাইস এবং অ্যাপ্লিকেশনের ডেটা পর্যায়ক্রমে সংরক্ষিত হয়৷ অ্যাপ্লিকেশন ডেটা যেকোনও ডেটা হতে পারে যা অ্যাপ্লিকেশন সংরক্ষণ করে (ডেভেলপারের সেটিংস এর উপর ভিত্তি করে), পরিচিতি, মেসেজ এবং ফটোগুলির মতো সম্ভাব্য সংবেদনশীল ডেটা অন্তর্ভুক্ত করে৷"</string>
     <string name="device_admin_settings_title" msgid="4960761799560705902">"ডিভাইসের প্রশাসকের সেটিংস"</string>
     <string name="active_device_admin_msg" msgid="578748451637360192">"ডিভাইস প্রশাসক অ্যাপ"</string>
     <string name="remove_device_admin" msgid="9207368982033308173">"এই ডিভাইস প্রশাসক অ্যাপটি নিস্ক্রিয় করুন"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g> এর মধ্যে <xliff:g id="NUMBER">%1$d</xliff:g> নির্বাচিত"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g>টির মধ্যে <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"সবগুলি বেছে নিন"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"প্ল্যান পরিচালনা করুন"</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>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"মোবাইল নেটওয়ার্কগুলি"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"পরিমাপ করা ওয়াই-ফাই নেটওয়ার্ক"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"পরিমাপ করা নেটওয়ার্ক নির্বাচন করতে,ওয়াই-ফাই চালু করুন।"</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"অটোমেটিক"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"পরিমাপ করা"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"পরিমাপ করা নয়"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"পরিষেবা প্রদানকারীর ডেটার হিসাব আপনার ডিভাইসের হিসাবের থেকে ভিন্ন হতে পারে।"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"জরুরি কল"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"কলে ফিরুন"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"কল ম্যানেজার"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"জরুরী সম্প্রচার"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"জরুরি সতর্কতা"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"নেটওয়ার্ক অপারেটরগুলি"</string>
     <string name="access_point_names" msgid="1381602020438634481">"অ্যাক্সেস পয়েন্টের নামগুলি"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"উন্নত 4G LTE মোড"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"এর জন্য পছন্দসই সিম"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"প্রতিবার জিজ্ঞাসা করুন"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"নির্বাচন করার প্রয়োজন"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"সিম বেছে নেওয়া"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"সেটিংস"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="one">%dটি লুকানো আইটেম দেখান</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"অ্যাপ বিজ্ঞপ্তি"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"বিজ্ঞপ্তির বিভাগ"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"গুরুত্ব"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"অ্যাপটিকে সিদ্ধান্ত নিতে দিন"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"সাউন্ডের অনুমতি দিন"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"কখনোই বিজ্ঞপ্তগুলি দেখায় না"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"কোনো শব্দ বা ভিজ্যুয়াল বাধা নেই"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"শব্দ করবে না"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"শব্দ করে"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"সাউন্ড হবে ও স্ক্রিনে ভেসে উঠবে"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"স্ক্রিনে দেখান"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"নিম্ন"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"মাঝারি"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"বেশি"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"জরুরি"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"আওয়াজের অনুমতি দিন"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"শব্দ, ভাইব্রেট করে না বা বর্তমান স্ক্রীনে এই বিজ্ঞপ্তিগুলিকে দেখানো হয় না৷"</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"বিরক্ত করার অনুমতি দিন"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"অ্যাপটিকে আওয়াজ করতে, ভাইব্রেট করতে, এবং স্ক্রিনে বিজ্ঞপ্তি দেখাতে দিন"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"কম গুরুত্ব"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"মাঝারি গুরুত্ব"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"উচ্চ গুরুত্ব"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"ছবির-মধ্যে-ছবি"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"ছবির-মধ্যে-ছবি"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"ছবির-মধ্যে-ছবি তৈরির অনুমতি দিন"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"অ্যাপটি খোলা থাকার সময় অথবা আপনি এটি ছেড়ে বেরিয়ে গেলে (যেমন, কোনো ভিডিও দেখার জন্য) এটিকে একটি ছবির-মধ্যে-ছবি সমেত উইন্ডো তৈরি করার অনুমতি দিন। চালু থাকা অন্যান্য অ্যাপের উপরে এই উইন্ডোটি দেখা যাবে।"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"অ্যাপটি খোলা থাকার সময় অথবা আপনি এটি ছেড়ে বেরিয়ে গেলে (যেমন, কোনও ভিডিও দেখার জন্য) এটিকে একটি ছবির-মধ্যে-ছবি সমেত উইন্ডো তৈরি করার অনুমতি দিন। চালু থাকা অন্যান্য অ্যাপের উপরে এই উইন্ডোটি দেখা যাবে।"</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>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"ফাইলগুলি স্থানান্তর করা হচ্ছে"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"ফটোগুলি স্থানান্তর করা হচ্ছে (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"ডিভাইসটিকে MIDI হিসেবে ব্যবহার করা হচ্ছে"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"এসএমএস প্রতিবিম্ব"</string>
     <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>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"নাইট লাইটের সময়সূচী সেট করুন"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"ঘুম আসতে অসুবিধা না হওয়ার জন্য স্ক্রিনের আভা অ্যাম্বার করুন"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"নাইট লাইট চালু আছে"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"স্ক্রিন হলুদাভ বাদামি আভা ধারণ করে৷ এটি আপনাকে ঘুমিয়ে পড়তে সহায়তা করতে পারে৷"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"প্রস্তাবনাগুলি"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"কুলার প্রদর্শনী রঙগুলি ব্যবহার করুন"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"রঙের পরিবর্তন প্রয়োগ করতে, স্ক্রীন বন্ধ করুন"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"টেলিফোনি মনিটর এ করা পরিবর্তন প্রয়োগ করতে ডিভাইসটি বন্ধ করে আবার চালু করুন"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"ক্যামেরায় HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"ক্যামেরায় HAL HDR+ পরিবর্তনটি প্রয়োগ করতে ডিভাইসটি বন্ধ করে আবার চালু করুন"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"ক্যামেরা লেজার সেন্সর"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"স্বয়ংক্রিয় সিস্টেম আপডেটগুলি"</string>
     <string name="usage" msgid="2977875522080448986">"ব্যবহার"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"মোবাইল ডেটার ব্যবহার"</string>
@@ -3410,7 +3427,7 @@
     <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_2">%2$s</xliff:g> এর মধ্যে <xliff:g id="ID_1">%1$s</xliff:g> ব্যবহৃত হয়েছে"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g> এর মধ্যে <xliff:g id="ID_1">%1$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">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"মুছুন ও রূপান্তর করুন"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager রেট-লিমিটিং আবার সেট করুন"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager রেট-লিমিটিং আবার সেট করা হয়েছে"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"লক স্ক্রিন বিজ্ঞপ্তিগুলি নিয়ন্ত্রণ করুন"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"লক স্ক্রিনে নিয়ন্ত্রণের তথ্য"</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="8483187649355540109">"সহায়তা এবং টিপ্স"</string>
@@ -3487,7 +3504,7 @@
     <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="2456198532288640046">"অন্য ডিভাইস থেকে দেখা যাচ্ছে না"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"বন্ধ আছে"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> এর সাথে সংযুক্ত আছে"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"একাধিক ডিভাইসের সাথে সংযুক্ত আছে"</string>
     <string name="demo_mode" msgid="2798762752209330277">"সিস্টেম UI ডেমো মোড"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"ঝটপট অ্যাপগুলি"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"অ্যাপ ইনস্টল করা না থাকলেও অ্যাপের মাধ্যমে লিঙ্ক খুলুন"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"ঝটপট অ্যাপগুলি"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"ঝটপট অ্যাপগুলির অ্যাকাউন্ট"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"ঝটপট অ্যাপের পছন্দগুলি"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ইনস্টল করা অ্যাপ্স"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"আপনার স্টোরেজ এখন স্টোরেজ ম্যানেজারের দ্বারা পরিচালিত হচ্ছে"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> এর অ্যাকাউন্ট"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"আপনার ব্যক্তিগত প্রোফাইলে সর্বদা-চালু VPN অন করা আছে"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"আপনার কর্মস্থলের প্রোফাইলে সর্বদা-চালু VPN অন করা আছে"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"বৈশ্বিক HTTP প্রক্সী সেট করা আছে"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"বিশ্বস্ত শংসাপত্রগুলি"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"বিশ্বস্ত ক্রেডেনশিয়াল"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"আপনার ব্যক্তিগত প্রোফাইলের বিশ্বস্ত ক্রেডেনশিয়াল"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"আপনার অফিস প্রোফাইলের বিশ্বস্ত ক্রেডেনশিয়াল"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">কমপক্ষে <xliff:g id="COUNT_1">%d</xliff:g>টি CA সার্টিফিকেট</item>
       <item quantity="other">কমপক্ষে <xliff:g id="COUNT_1">%d</xliff:g>টি CA সার্টিফিকেট</item>
@@ -3663,7 +3682,7 @@
       <item quantity="one">ইমেল ক্লায়েন্ট অ্যাপগুলি</item>
       <item quantity="other">ইমেল ক্লায়েন্ট অ্যাপগুলি</item>
     </plurals>
-    <string name="default_map_app_title" msgid="7560143381633608567">"মানচিত্র অ্যাপ"</string>
+    <string name="default_map_app_title" msgid="7560143381633608567">"ম্যাপ অ্যাপ"</string>
     <plurals name="default_phone_app_title" formatted="false" msgid="6714041230953195024">
       <item quantity="one">ফোন অ্যাপগুলি</item>
       <item quantity="other">ফোন অ্যাপগুলি</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"পরিষেবা প্রদানকারীর ব্যবস্থামূলক তথ্য"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ট্রিগার পরিষেবা প্রদানকারীর ব্যবস্থা"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"নতুন এবং উত্তেজনাপূর্ণ আর কি আছে?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"সেরা ৫টি বৈশিষ্ট্য ব্যবহার করে দেখুন"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"আপনার নতুন ফোন চালিয়ে দেখুন"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"আপনার নতুন ট্যাবলেট চালিয়ে দেখুন"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"আপনার নতুন ডিভাইস চালিয়ে দেখুন"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"এই বৈশিষ্ট্যটি এই ডিভাইসে উপলব্ধ নেই"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS রেজিস্ট্রেশনের স্থিতি"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"রেজিস্টার করা"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"রেজিস্টার করা নয়"</string>
diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml
index edb66b6..e0a99bd 100644
--- a/res/values-bs/arrays.xml
+++ b/res/values-bs/arrays.xml
@@ -152,7 +152,7 @@
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Vrijeme korištenja"</item>
     <item msgid="4796160515314745154">"Zadnji put korišteno"</item>
-    <item msgid="2502754479975776899">"Naziv aplikacije"</item>
+    <item msgid="2502754479975776899">"Ime aplikacije"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
     <item msgid="8615575908717909498">"PEAP"</item>
@@ -286,8 +286,8 @@
     <item msgid="1091168669714823370">"projektuj sadržaj medija"</item>
     <item msgid="485564189219029300">"aktiviraj VPN"</item>
     <item msgid="7155384795265164395">"ispisana pozadinska slika"</item>
-    <item msgid="1835836196806147034">"pomoćnik za podešavanje strukture"</item>
-    <item msgid="5989890403088155055">"pomoćnik za snimak ekrana"</item>
+    <item msgid="1835836196806147034">"asistent za podešavanje strukture"</item>
+    <item msgid="5989890403088155055">"asistent za snimak ekrana"</item>
     <item msgid="8582699692765917557">"čitaj podatke o stanju telefona"</item>
     <item msgid="1474039653814954902">"dodaj govornu poštu"</item>
     <item msgid="7222837656938871633">"koristi SIP"</item>
@@ -353,8 +353,8 @@
     <item msgid="4992007785575926253">"Projektuj sadržaj medija"</item>
     <item msgid="2482631530338029480">"Aktiviraj VPN"</item>
     <item msgid="1662979573471871926">"Ispisana pozadinska slika"</item>
-    <item msgid="5964768335278263478">"Pomoćnik za podešavanje strukture"</item>
-    <item msgid="2657138701132782702">"Pomoćnik za snimak ekrana"</item>
+    <item msgid="5964768335278263478">"Asistent za podešavanje strukture"</item>
+    <item msgid="2657138701132782702">"Asistent za snimak ekrana"</item>
     <item msgid="8571369610363539266">"Čitaj podatke o stanju telefona"</item>
     <item msgid="4542463358215230845">"Dodaj govornu poštu"</item>
     <item msgid="864565065016166003">"Koristi SIP"</item>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 5868c1a..e014da1 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -23,6 +23,7 @@
     <string name="deny" msgid="6947806159746484865">"Odbij"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Zatvori"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Prebaci"</string>
+    <string name="device_info_default" msgid="7847265875578739287">"Nepoznato"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Još <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> korak vas dijeli od toga da postanete programer.</item>
       <item quantity="few">Još <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> koraka vas dijele od toga da postanete programer.</item>
@@ -101,33 +102,24 @@
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Zaključaj glasovno biranje"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Spriječi korištenje bluetooth birača kada je ekran zaključan"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth uređaji"</string>
-    <string name="bluetooth_device_name" msgid="8415828355207423800">"Naziv uređaja"</string>
+    <string name="bluetooth_device_name" msgid="8415828355207423800">"Ime uređaja"</string>
     <string name="bluetooth_device_details" msgid="4594773497930028085">"Postavke uređaja"</string>
     <string name="bluetooth_profile_details" msgid="6823621790324933337">"Postavke profila"</string>
-    <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Nije postavljen naziv, koristi se naziv računa"</string>
+    <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Nije postavljeno ime, koristi se ime računa"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Potraži uređaje"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Preimenuj ovaj uređaj"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Preimenuj"</string>
-    <!-- no translation found for bluetooth_disconnect_title (7830252930348734303) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_all_profiles (8208712728668714199) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_all_profiles (6611038575213485336) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_all_profiles (3995834526315103965) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_dialog_ok (3308586619539119106) -->
-    <skip />
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Želite li prekinuti vezu s uređajem?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Vaš telefon će prekinuti vezu s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Vaš tablet će prekinuti vezu s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Vaš uređaj će prekinuti vezu s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Prekini vezu"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Nemate dozvolu da mijenjate postavke za Bluetooth."</string>
-    <!-- no translation found for bluetooth_pairing_pref_title (7429413067477968637) -->
-    <skip />
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Uparivanje novog uređaja"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g> je vidljiv uređajima u blizini, dok su postavke Bluetootha otvorene."</string>
-    <!-- no translation found for bluetooth_footer_mac_message (1109366350000220283) -->
-    <skip />
-    <!-- no translation found for bluetooth_footer_mac_message (6807634484499166486) -->
-    <skip />
-    <!-- no translation found for bluetooth_footer_mac_message (8413944740341742061) -->
-    <skip />
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Bluetooth adresa telefona: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Bluetooth adresa tableta: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Bluetooth adresa uređaja: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Želite li prekinuti vezu sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Emitovanje"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Onemogućiti profil?"</string>
@@ -139,9 +131,8 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Zahtjev za Bluetooth uparivanje"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Zahtjev za uparivanje"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Dodirnite za spajanje s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
-    <skip />
-    <string name="device_picker" msgid="4978696506172252813">"Izaberi Bluetooth uređaj"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Primljeni fajlovi"</string>
+    <string name="device_picker" msgid="4978696506172252813">"Odaberi Bluetooth uređaj"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi uključiti Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi uključiti Bluetooth"</string>
     <string name="bluetooth_ask_enablement_no_name" msgid="1644353686104482763">"Aplikacija želi uključiti Bluetooth"</string>
@@ -176,11 +167,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s želi pristupiti svojim porukama. Dozvoliti pristup za %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Zahtjev za pristup SIM-u"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> želi pristupiti vašoj SIM kartici. Odobrenje pristupa SIM kartici će onemogućiti vezu za prijenos podataka na vašem uređaju za vrijeme trajanja veze. Odobri pristup uređaju <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
-    <skip />
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Uređaj je vidljiv drugim uređajima kao \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\'"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaši uređaji"</string>
-    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
-    <skip />
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Uparivanje novog uređaja"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum i vrijeme"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Odaberite vremensku zonu"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -224,7 +213,7 @@
     <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_band_mode_label" msgid="8730871744887454509">"Odaberite 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>
@@ -382,55 +371,39 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Otključavanje otiskom prsta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Koristite otisak prsta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Samo dodirnite senzor za otisak prsta da otključate telefon, odobrite kupovinu ili da se prijavite u aplikaciju. Pazite čije otiske prsta dodajete. Samo jedan dodani otisak može izvršiti sve navedeno.\n\nNapomena: Vaš otisak prsta može biti manje siguran od jakog uzorka ili PIN kôda."</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_message_unlock_disabled (1550756694054944874) -->
-    <skip />
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_message_setup (6817326798834882531) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"Pomoću otiska prsta otključavajte telefon ili odobravajte kupovinu.\n\nNapomena: otisak prsta ne možete koristiti za otključavanje ovog uređaja. Za više informacija, obratite se administratoru svoje organizacije"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"Pomoću otiska prsta otključavajte telefon ili odobravajte kupovinu.\n\nNapomena: otisak vašeg prsta može biti manje siguran od jakog uzorka ili PIN koda."</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>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_continue_setup (1961957425135180242) -->
-    <skip />
-    <!-- no translation found for lock_screen_intro_skip_dialog_text_frp (1581834104051243425) -->
-    <skip />
-    <!-- no translation found for lock_screen_intro_skip_dialog_text_frp (4629503416877189572) -->
-    <skip />
-    <!-- no translation found for lock_screen_intro_skip_dialog_text_frp (2423428240245737909) -->
-    <skip />
-    <!-- no translation found for lock_screen_intro_skip_dialog_text (5219287483885558525) -->
-    <skip />
-    <!-- no translation found for lock_screen_intro_skip_dialog_text (1466238255429527112) -->
-    <skip />
-    <!-- no translation found for lock_screen_intro_skip_dialog_text (3008526710555416125) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Naprijed"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj tablet ako ga izgubite, ako vam ga ukradu ili ga vratite na početne postavke."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj uređaj ako ga izgubite, ako vam ga ukradu ili ga vratite na početne postavke."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj telefon ako ga izgubite, ako vam ga ukradu ili ga vratite na početne postavke."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj tablet ako ga izgubite ili vam ga ukradu."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj uređaj ako ga izgubite ili vam ga ukradu."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj telefon ako ga izgubite ili vam ga ukradu."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ipak preskoči"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Nazad"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_find_sensor_title (3051496861358227199) -->
-    <skip />
-    <!-- no translation found for security_settings_fingerprint_enroll_find_sensor_message (8793966374365960368) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Dodirnite senzor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Nalazi se na poleđini telefona. Koristite kažiprst."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustracija sa uređajem i lokacijom senzora za otisak prsta"</string>
-    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Naziv"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Ime"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"U redu"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Izbriši"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Dodirnite senzor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Stavite prst na senzor i podignite ga kad osjetite vibraciju"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (2819679722403209778) -->
-    <skip />
-    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (6158989350522518586) -->
-    <skip />
-    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (7567276170287972230) -->
-    <skip />
-    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (4796715961273420536) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Podignite i ponovo dodirnite"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Nastavite podizati prst da dodate različite segmente otiska"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Dodan je otisak prsta"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Kada vidite ovu ikonu, koristite otisak prsta za identifikaciju ili odobravanje kupovine."</string>
+    <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Uradi to kasnije"</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">"Odabrali ste da koristite otisak prsta kao jedan od načina za otključavanja telefona. Ukoliko sada preskočite ovaj korak, morat ćete ga postaviti kasnije. Postavka traje otprilike samo jednu minutu."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Postavi zaključavanje ekrana"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Gotovo"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ups, to nije senzor"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Dodirnite senzor na poleđini telefona. Koristite kažiprst."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Upis nije dovršen"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Vrijeme za uzimanje otiska prsta je isteklo. Pokušajte ponovo."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Upis otiska prsta nije uspio. Pokušajte ponovo ili koristite drugi prst."</string>
@@ -443,6 +416,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Dodali ste maksimalan broj otisaka prstiju"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Nije moguće dodati još otisaka prstiju"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Ukloniti sve otiske prstiju?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Ukloni \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Želite li izbrisati ovaj otisak prsta?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Otiske prstiju nećete moći koristiti za otključavanje telefona, odobravanje kupovine ili prijavljivanje u aplikacije"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Otiske prstiju nećete moći koristiti za otključavanje radnog profila, odobravanje kupovine ili prijavljivanje u radne aplikacije"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Da, ukloni"</string>
@@ -461,14 +436,14 @@
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Trebate postaviti PIN za zaključavanje ekrana ili lozinku da biste mogli pokrenuti šifriranje."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Šifriraj?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"Postupak šifriranja je neopoziv te gubite podatke u slučaju prekida. Šifriranje traje jedan sat ili duže, pri čemu se tablet ponovo pokreće nekoliko puta."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"Postupak šifriranja je nepovratan; u slučaju prekida, gubite podatke. Šifriranje traje jedan sat ili duže, pri čemu se telefon ponovno pokreće nekoliko puta."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"Postupak šifriranja je nepovratan; u slučaju prekida, gubite podatke. Šifriranje traje jedan sat ili duže, pri čemu se telefon ponovo pokreće nekoliko puta."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Šifriranje"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Pričekajte dok se tablet šifrira. Dovršeno <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Pričekajte dok se telefon šifrira. Dovršeno <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Pričekajte dok se tablet šifrira. Preostalo vrijeme: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Pričekajte dok se telefon šifrira. Preostalo vrijeme: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Da biste otključali tablet, isključite ga, zatim ponovno uključite."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Da biste otključali tablet, isključite ga, a zatim ponovno uključite."</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Da biste otključali tablet, isključite ga, zatim ponovo uključite."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Da biste otključali tablet, isključite ga, a zatim ponovo uključite."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Upozorenje: Preostalo vam je <xliff:g id="COUNT">^1</xliff:g> pokušaja otključavanja, nakon čega će sadržaj vašeg uređaja biti izbrisan!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Otkucajte lozinku"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifriranje nije uspjelo"</string>
@@ -488,10 +463,10 @@
     <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_fingerprint_message" msgid="5585650064305600578">"Za dodatnu sigurnost podesite rezervni način zaključavanja 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>
-    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Spriječite da druge osobe koriste ovaj telefon 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="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Izaberite rezervni metod zaključavanja 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. Odaberite 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. Odaberite koji način zaključavanja ekrana želite koristiti."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Spriječite da druge osobe koriste ovaj telefon bez vašeg odobrenja tako što ćete aktivirati funkcije za zaštitu uređaja. Odaberite koji način zaključavanja ekrana želite koristiti."</string>
+    <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Odaberite rezervni metod zaključavanja ekrana"</string>
     <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Opcije za Zaključani ekran"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Opcije zaključavanja ekrana"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Zaključavanje ekrana"</string>
@@ -529,55 +504,55 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Ukloniti zaštitu uređaja?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Želite li ukloniti zaštitu profila?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Funkcije za zaštitu uređaja neće funkcionirati bez obrasca."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Funkcije za zaštitu uređaja neće funkcionirati bez obrasca.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Funkcije za zaštitu uređaja neće raditi bez uzorka.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Vaši sačuvani otisci prstiju će također biti izbrisani sa ovog uređaja te njima nećete moći otključavati telefon, odobravati kupnje ili se prijavljivati u aplikacije.\""</string>
+</xliff:g>Vaši sačuvani otisci prstiju također će se ukloniti iz ovog uređaja i nećete ih moći koristiti za otključavanje telefona, odobravanje kupovine ili prijavljivanje u aplikacije."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Funkcija zaštite uređaja neće raditi bez PIN-a."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Funkcije za zaštitu uređaja neće funkcionirati bez PIN-a.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Funkcije za zaštitu uređaja neće raditi bez PIN koda.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Vaši sačuvani otisci prstiju će također biti izbrisani sa ovog uređaja te njima nećete moći otključavati telefon, odobravati kupnje ili se prijavljivati u aplikacije.\""</string>
+</xliff:g>Vaši sačuvani otisci prstiju također će se ukloniti iz ovog uređaja i nećete ih moći koristiti za otključavanje telefona, odobravanje kupovine ili prijavljivanje u aplikacije."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Funkcija zaštite uređaja neće raditi bez lozinke."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Funkcije za zaštitu uređaja neće funkcionirati bez lozinke.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Funkcije za zaštitu uređaja neće raditi bez lozinke.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Vaši sačuvani otisci prstiju će također biti izbrisani sa ovog uređaja te njima nećete moći otključavati telefon, odobravati kupnje ili se prijavljivati u aplikacije.\""</string>
+</xliff:g>Vaši sačuvani otisci prstiju također će se ukloniti iz ovog uređaja i nećete ih moći koristiti za otključavanje telefona, odobravanje kupovine ili prijavljivanje u aplikacije."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Funkcija zaštite uređaja neće raditi bez zaključavanja ekrana."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Funkcija zaštite uređaja neće raditi bez zaključavanja ekrana. <xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Funkcije za zaštitu uređaja neće raditi bez zaključavanja ekrana.<xliff:g id="EMPTY_LINE">
 
-</xliff:g> Sačuvani otisci prstiju će također biti uklonjeni iz ovog uređaja i nećete moći otključati svoj telefon, ovlastiti kupuje, ili se prijavite na aplikacijama s njima."</string>
+</xliff:g>Vaši sačuvani otisci prstiju također će se ukloniti iz ovog uređaja i nećete ih moći koristiti za otključavanje telefona, odobravanje kupovine ili prijavljivanje u aplikacije."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Funkcije za zaštitu profila neće funkcionirati bez uzorka."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Funkcije za zaštitu profila neće funkcionirati bez uzorka.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Funkcije za zaštitu profila neće raditi bez uzorka.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>S profila će se ukloniti i sačuvani otisci prstiju i nećete ih moći upotrebljavati za otključavanje profila, autoriziranje kupovine i prijavljivanje na aplikacije."</string>
+</xliff:g>Vaši sačuvani otisci prstiju također će se ukloniti iz ovog profila i nećete ih moći koristiti za otključavanje profila, odobravanje kupovine ili prijavljivanje u aplikacije."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Funkcije za zaštitu profila neće funkcionirati bez PIN-a."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Funkcije za zaštitu profila neće funkcionirati bez PIN-a.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Funkcije za zaštitu profila neće raditi bez PIN koda.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>S profila će se ukloniti i sačuvani otisci prstiju i nećete ih moći upotrebljavati za otključavanje profila, autoriziranje kupovine i prijavljivanje na aplikacije."</string>
+</xliff:g>Vaši sačuvani otisci prstiju također će se ukloniti iz ovog profila i nećete ih moći koristiti za otključavanje profila, odobravanje kupovine ili prijavljivanje u aplikacije."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Funkcije za zaštitu profila neće funkcionirati bez lozinke."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Funkcije za zaštitu profila neće funkcionirati bez lozinke.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Funkcije za zaštitu profila neće raditi bez lozinke.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>S profila će se ukloniti i sačuvani otisci prstiju i nećete ih moći upotrebljavati za otključavanje profila, autoriziranje kupovine i prijavljivanje na aplikacije."</string>
+</xliff:g>Vaši sačuvani otisci prstiju također će se ukloniti iz ovog profila i nećete ih moći koristiti za otključavanje profila, odobravanje kupovine ili prijavljivanje u aplikacije."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Funkcije za zaštitu profila neće funkcionirati bez zaključavanja ekrana."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Funkcije za zaštitu profila neće funkcionirati bez zaključavanja ekrana.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Funkcije za zaštitu profila neće raditi bez zaključavanja ekrana.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>S profila će se ukloniti i sačuvani otisci prstiju i nećete ih moći upotrebljavati za otključavanje profila, autoriziranje kupovine i prijavljivanje na aplikacije."</string>
+</xliff:g>Vaši sačuvani otisci prstiju također će se ukloniti iz ovog profila i nećete ih moći koristiti za otključavanje profila, odobravanje kupovine ili prijavljivanje u aplikacije."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Da, ukloni"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Promijeni uzorak za otključavanje"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Prom. PIN za otključ."</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Promijeni lozinku za otključavanje"</string>
     <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Pokušajte ponovo. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>. od <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> pokušaja."</string>
     <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Vaši podaci će se izbrisati"</string>
-    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Ako u sljedećem pokušaju unesete neispravan obrazac, podaci ovog uređaja će se izbrisati"</string>
-    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Ako u sljedećem pokušaju unesete neispravan PIN kôd, podaci ovog uređaja će se izbrisati"</string>
-    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Ako u sljedećem pokušaju unesete neispravnu lozinku, podaci ovog uređaja će se izbrisati"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="1688030823464420974">"Ako u sljedećem pokušaju unesete neispravan obrazac, podaci ovog uređaja će se izbrisati"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Ako u sljedećem pokušaju unesete neispravan PIN kôd, podaci ovog uređaja će se izbrisati"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"Ako u sljedećem pokušaju unesete neispravnu lozinku, podaci ovog uređaja će se izbrisati"</string>
     <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Ako u sljedećem pokušaju unesete neispravan obrazac, ovaj korisnik će se izbrisati"</string>
     <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Ako u sljedećem pokušaju unesete neispravan PIN kôd, ovaj korisnik će se izbrisati"</string>
     <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Ako u sljedećem pokušaju unesete neispravnu lozinku, ovaj korisnik će se izbrisati"</string>
     <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Ako u sljedećem pokušaju unesete neispravan obrazac, vaš radni profil i njegovi podaci će se izbrisati"</string>
     <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Ako u sljedećem pokušaju unesete neispravan PIN kôd, vaš radni profil i njegovi podaci će se izbrisati"</string>
     <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Ako u sljedećem pokušaju unesete neispravnu lozinku, vaš radni profil i njegovi podaci će se izbrisati"</string>
-    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Previše je neispravnih pokušaja. Podaci ovog uređaja će se izbrisati."</string>
-    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Previše je neispravnih pokušaja. Ovaj korisnik će se ukloniti."</string>
-    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Previše je neispravnih pokušaja. Ovaj poslovni profil i njegovi podaci će se ukloniti."</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="5047439819181833824">"Previše je neispravnih pokušaja. Podaci ovog uređaja će se izbrisati."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Previše je neispravnih pokušaja. Ovaj korisnik će se izbrisati."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Previše je neispravnih pokušaja. Ovaj poslovni profil i njegovi podaci će se izbrisati."</string>
     <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Odbaci"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Broj znakova mora biti najmanje <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Broj cifara u PIN-u mora biti najmanje <xliff:g id="COUNT">%d</xliff:g>"</string>
@@ -646,7 +621,7 @@
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Uključi Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
-    <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Upravljajte vezama, postavite naziv uređaja i vidljivost"</string>
+    <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Upravljajte vezama, postavite ime uređaja i vidljivost"</string>
     <string name="bluetooth_pairing_request" msgid="2605098826364694673">"Upariti sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_pairing_key_msg" msgid="418124944140102021">"Kod za Bluetooth uparivanje"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="6813273136442138444">"Upišite kod za uparivanje, zatim pritisnite Return ili Enter"</string>
@@ -680,29 +655,21 @@
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Poveži se"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Prekini vezu"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Upari i poveži"</string>
-    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Ukini uparivanje"</string>
-    <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Prekini vezu i ukini uparivanje"</string>
+    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Prekini uparivanje"</string>
+    <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Prekini vezu i uparivanje"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opcije..."</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Napredno"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Napredni Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Kada je Bluetooth uključen, uređaj može komunicirati sa drugim uređajima s Bluetoothom u blizini."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Radi poboljšanja preciznosti lociranja, sistemske aplikacije i usluge i dalje mogu detektirati uređaje s Bluetoothom. Ovo možete promijeniti u <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>postavkama skeniranja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
-    <!-- no translation found for bluetooth_connect_failed (4500234659813241053) -->
-    <skip />
-    <!-- no translation found for device_details_title (6576953269221085300) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_mac_address (2513724313558236181) -->
-    <skip />
-    <!-- no translation found for bluetooth_unpair_dialog_title (38467834196432400) -->
-    <skip />
-    <!-- no translation found for bluetooth_unpair_dialog_body (9087609557757135712) -->
-    <skip />
-    <!-- no translation found for bluetooth_unpair_dialog_body (7785695793007576501) -->
-    <skip />
-    <!-- no translation found for bluetooth_unpair_dialog_body (251257782642157557) -->
-    <skip />
-    <!-- no translation found for bluetooth_unpair_dialog_forget_confirm_button (3829370108973879006) -->
-    <skip />
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Nije povezan. Pokušajte ponovo."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Detalji o uređaju"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Bluetooth adresa uređaja: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Želite li zaboraviti uređaj?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Vaš telefon neće više biti uparen s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Vaš tablet neće više biti uparen s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Vaš uređaj neće više biti uparen s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Zaboravi uređaj"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Poveži se na…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Veza uređaja <xliff:g id="DEVICE_NAME">%1$s</xliff:g> sa zvukom medija će biti prekinuta."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Veza uređaja <xliff:g id="DEVICE_NAME">%1$s</xliff:g> sa handsfree zvukom će biti prekinuta."</string>
@@ -768,11 +735,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Automatsko uključivanje Wi-Fi veze"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi veza se automatski ponovo uključuje u blizini sačuvanih mreža visokog kvaliteta, kao što je kućna mreža"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Nije dostupno jer je skeniranje Wi-Fi mreže isključeno"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Za korištenje funkcije odaberite ocjenjivača mreže"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Izbjegavaj slabe veze"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Ne koristi se Wi-Fi mreža ako njena Internet veza nije dobra"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Koristiti samo mreže koje imaju dobru internet vezu"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Povezivanje na otvorene mreže"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Automatsko povezivanje na javne mreže visokog kvaliteta"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Za korištenje funkcije odaberite ocjenjivača mreže"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Za korištenje funkcije odaberite kompatibilnog ocjenjivača mreže"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instaliranje certifikata"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Radi poboljšanja preciznosti lociranja, sistemske aplikacije i usluge i dalje mogu skenirati nove Wi-Fi mreže. Ovo možete promijeniti u <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>postavkama skeniranja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Radi poboljšanja preciznosti lociranja, uključite skeniranje Wi-Fi mreža u <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>postavkama skeniranja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -824,7 +794,7 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Sigurnosna postavka za bežični usmjerivač (TKIP) nije podržana"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Provjeravanje vjerodostojnosti nije uspjelo. Pokušajte ponovo."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Otkrivena je još jedna WPS sesija. Pokušajte ponovo za nekoliko minuta."</string>
-    <string name="wifi_ssid" msgid="5519636102673067319">"Naziv mreže"</string>
+    <string name="wifi_ssid" msgid="5519636102673067319">"Ime mreže"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Unesite SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sigurnost"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Jačina signala"</string>
@@ -855,6 +825,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Ne navodi"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Ne potvrđuj valjanost"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Nije naveden certifikat. Veza neće biti privatna."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Naziv mreže je predug."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Morate navesti domenu."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS dostupan"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS dostupan)"</string>
@@ -923,28 +894,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Zaboraviti ovu grupu?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Prijenosna Wi-Fi pristupna tačka"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi hotspot"</string>
-    <!-- no translation found for wifi_hotspot_off_subtext (5466126533609394170) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_tethering_on_subtext (5752490509369962007) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_tethering_on_subtext (6461075246164300670) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_on_local_only_subtext (2068110388011294735) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_name_title (1341735529132128887) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_name_summary_connecting (3378299995508671967) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_name_summary_connected (3888672084861445362) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_password_title (1955592302902091281) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_ap_band_title (1165801173359290681) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_footer_info_regular (1203489406068036455) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_footer_info_local_only (857988412470694109) -->
-    <skip />
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Nema dijeljenja interneta ili sadržaja s drugim uređajima"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Internetska veza ovog tableta dijeli se putem pristupne tačke"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Internetska veza ovog telefona dijeli se putem pristupne tačke"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplikacija dijeli sadržaj. Za dijeljenje internetske veze isključite pa uključite pristupnu tačku"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Naziv Wi‑Fi mreže"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Uključivanje pristupne tačke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Drugi uređaji se mogu povezati na pristupnu tačku <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi lozinka"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP opseg"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Koristite pristupnu tačku da kreirate Wi‑Fi mrežu za ostale svoje uređaje. Pristupna tačka pruža internet koristeći vaš mobilni prijenos podataka. Mogu se naplaćivati dodatni troškovi za mobilni prijenos podataka."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikacije mogu kreirati pristupnu tačku za dijeljenje sadržaja s uređajima u blizini."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Uključivanje pristupne tačke…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Isključivanje pristupne tačke…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktivna"</string>
@@ -1050,6 +1010,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nema rezultata"</string>
     <string name="display_settings" msgid="7965901687241669598">"Prikaz"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Automatsko rotiranje ekrana"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Izražene boje"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Automatski promijeni orijentaciju prilikom rotiranja tableta"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Automatski promijeni orijentaciju prilikom rotiranja telefona"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Automatski promijeni orijentaciju prilikom rotiranja tableta"</string>
@@ -1077,33 +1038,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimizirajte nivo osvjetljenja prema dostupnom svjetlu. Kada je ova funkcija uključena i dalje možete privremeno podešavati nivo osvjetljenja."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Noćno svjetlo"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Noćno svjetlo oboji ekran u žutosmeđe. Tako je lakše gledati u ekran ili čitati pod prigušenim svjetlom, a može vam pomoći da lakše zaspite."</string>
-    <!-- no translation found for night_display_auto_mode_title (6574111412154833409) -->
-    <skip />
-    <!-- no translation found for night_display_auto_mode_never (2483761922928753400) -->
-    <skip />
-    <!-- no translation found for night_display_auto_mode_custom (2379394568898721765) -->
-    <skip />
-    <!-- no translation found for night_display_auto_mode_twilight (589042813708244059) -->
-    <skip />
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Raspored"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Ništa"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Uključuje se u zadano vrijeme"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Uključeno od sumraka do svitanja"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Vrijeme početka"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Vrijeme završetka"</string>
-    <!-- no translation found for night_display_status_title (1784041143360286267) -->
-    <skip />
+    <string name="night_display_status_title" msgid="1784041143360286267">"Status"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intenzitet"</string>
     <string name="night_display_summary_off" msgid="1792750041697946539">"Isključeno / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <!-- no translation found for night_display_summary_off_auto_mode_never (3583590137322963513) -->
-    <skip />
-    <!-- no translation found for night_display_summary_off_auto_mode_custom (6365668239253173208) -->
-    <skip />
-    <!-- no translation found for night_display_summary_off_auto_mode_twilight (3596291693781757392) -->
-    <skip />
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Neće se nikada automatski uključiti"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Automatski će se uključiti u <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Automatski će se uključiti u sumrak"</string>
     <string name="night_display_summary_on" msgid="1355713529996456744">"Uključeno / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <!-- no translation found for night_display_summary_on_auto_mode_never (9117830821363119835) -->
-    <skip />
-    <!-- no translation found for night_display_summary_on_auto_mode_custom (5510753572245577263) -->
-    <skip />
-    <!-- no translation found for night_display_summary_on_auto_mode_twilight (852270120144683507) -->
-    <skip />
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Neće se nikada automatski isključiti"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Automatski će se isključiti u <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Automatski će se isključiti u svitanje"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Mirovanje"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekran se isključuje"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Nakon <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivnosti"</string>
@@ -1127,19 +1077,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Postavke"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatsko osvjetljenje"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Podignite za buđenje"</string>
-    <!-- no translation found for ambient_display_screen_title (4252755516328775766) -->
-    <skip />
-    <!-- no translation found for ambient_display_screen_summary_always_on (7974004969481877214) -->
-    <skip />
-    <!-- no translation found for ambient_display_screen_summary_notifications (1449570742600868654) -->
-    <skip />
-    <!-- no translation found for ambient_display_category_triggers (4359289754456268573) -->
-    <skip />
-    <!-- no translation found for doze_title (2375510714460456687) -->
-    <skip />
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambijentalni prikaz"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Uvijek uključeno / Veća potrošnja baterije"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nova obavještenja"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kada prikazati"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Nova obavještenja"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Ekran se aktivira kada primite obavještenja"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"Uvijek uključeno"</string>
-    <string name="doze_always_on_summary" msgid="1254238982577776475">"Prikaži vrijeme, ikone obavještenja i druge informacije"</string>
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"Prikaz vremena, ikona obavještenja i drugih informacija. Veća potrošnja baterije."</string>
     <string name="title_font_size" msgid="4405544325522105222">"Veličina fonta"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Povećavanje ili umanjivanje teksta"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Postavke zaključavanja SIM kartice"</string>
@@ -1168,7 +1113,7 @@
     <string name="sim_enter_ok" msgid="6475946836899218919">"Uredu"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Otkaži"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Pronađeno više SIM-ova"</string>
-    <string name="sim_multi_sims_summary" msgid="2698176447067691396">"Izaberite željenu SIM karticu za prijenos mobilnih podataka."</string>
+    <string name="sim_multi_sims_summary" msgid="2698176447067691396">"Odaberite željenu SIM karticu za prijenos mobilnih podataka."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Promijeniti podatkovni SIM?"</string>
     <string name="sim_change_data_message" msgid="5854582807996717811">"Želite li za prijenos mobilnih podataka koristiti SIM karticu <xliff:g id="NEW_SIM">%1$s</xliff:g> umjesto SIM kartice <xliff:g id="OLD_SIM">%2$s</xliff:g>?"</string>
     <string name="sim_preferred_title" msgid="5567909634636045268">"Ažurirati željenu SIM karticu?"</string>
@@ -1383,7 +1328,7 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN omogućen"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN onemogućen"</string>
     <string name="bearer" msgid="594270280031923558">"Nosilac"</string>
-    <string name="mvno_type" msgid="2543253857818336421">"MVNO tip"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"MVNO vrsta"</string>
     <string name="mvno_match_data" msgid="4560671695220540466">"MVNO vrijednost"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Izbriši APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Novi APN"</string>
@@ -1398,8 +1343,8 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Obnavljanje zadanih postavki za APN."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Vrati na zadane vrijednosti"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Obnavljanje zadanih postavki za APN dovršeno."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Vraćanje na zadano"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Vraćanje postavki mreže na zadano"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Vrati opcije na zadane postavke"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Vrati Wi-Fi, mobilnu i Bluetooth vezu na zadane postavke"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Sve postavke mreže vratit će se na zadano, uključujući:\n\n"<li>"Wi‑Fi mrežu"</li>\n<li>"Prijenos mobilnih podataka"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Resetuj postavke"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Vratiti sve postavke mreže na zadano? Ovu radnju ne možete poništiti!"</string>
@@ -1407,7 +1352,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Ponovo postaviti?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Ponovno postavljanje mreže nije dostupno za ovog korisnika"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Postavke mreže vraćene su na zadano"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Vraćanje na fabričke postavke"</string>
+    <string name="master_clear_title" msgid="6617679904229218425">"Potpuno izbriši sve podatke (Vraćanje na fabričke postavke)"</string>
     <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
       <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> račun će se vratiti na zadano</item>
       <item quantity="few"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> računa će se vratiti na zadano</item>
@@ -1450,20 +1395,15 @@
     <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>
-    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
-    <skip />
-    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
-    <skip />
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Dijeljenje internetske veze telefona putem USB-a"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Dijeljenje internetske veze tableta putem USB-a"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Dijeljenje Bluetooth veze"</string>
-    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
-    <skip />
-    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
-    <skip />
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Dijeljenje internetske veze tableta putem Bluetootha"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Dijeljenje internetske veze telefona putem Bluetootha"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Dijeljenje internetske veze uređaja <xliff:g id="DEVICE_NAME">%1$d</xliff:g> putem Bluetootha"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Ne može se povezati sa više od <xliff:g id="MAXCONNECTION">%1$d</xliff:g> uređaja."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Prestat će se dijeliti veza s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
-    <skip />
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Koristite pristupnu tačku i dijeljenje veze za pružanje interneta drugim uređajima putem mobilnog prijenosa podataka. Aplikacije također mogu kreirati pristupne tačke za dijeljenje sadržaja s uređajima u blizini."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoć"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobilna mreža"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Paket mobilne usluge"</string>
@@ -1542,8 +1482,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nemate podatkovnu vezu. Da biste odmah vidjeli ove informacije, idite na %s sa bilo kojeg računara povezanog na Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Učitavanje…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Odaberite svoju lozinku"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Da koristite otisak prsta, postavite lozinku"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Odaberite uzorak"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Izaberite PIN"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Da koristite otisak prsta, postavite uzorak"</string>
+    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Odaberite PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Da koristite otisak prsta, postavite PIN kôd"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Potvrdite lozinku"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrdite uzorak"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Potvrdite PIN"</string>
@@ -1559,12 +1502,12 @@
     <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_strong_auth_required_device_pattern" msgid="530802132223800623">"Za dodatnu sigurnost, unesite uzorak uređaja"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Za dodatnu sigurnost, unesite PIN kôd uređaja"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Za dodatnu sigurnost, unesite lozinku uređaja"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Za dodatnu sigurnost, unesite radni uzorak"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Za dodatnu sigurnost, unesite radni PIN kôd"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Za dodatnu sigurnost, unesite radnu lozinku"</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>
@@ -1612,12 +1555,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Postavke aplikacije"</string>
     <string name="install_applications" msgid="4872012136210802181">"Nepoznati izvori"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Dopusti sve izvore aplikacija"</string>
-    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
-    <skip />
-    <!-- no translation found for see_all_apps_title (1459400183763114135) -->
-    <skip />
-    <!-- no translation found for recent_app_summary (3366446669844932300) -->
-    <skip />
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Nedavno otvarane aplikacije"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Vidite sve aplikacije, ukupno <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"Prije <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Vaši podaci na tabletu i lični podaci su više izloženi napadima aplikacija iz nepoznatih izvora. Instaliranjem aplikacija iz takvih izvora, saglasni ste da ste vi odgovorni za bilo kakvu štetu na telefonu ili gubitak podataka koji mogu nastati korištenjem tih aplikacija."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Vaši podaci na telefonu i lični podaci više su izloženi napadima aplikacija iz nepoznatih izvora. Instaliranjem aplikacija iz takvih izvora, saglasni ste da ste vi odgovorni za bilo kakvu štetu na telefonu ili gubitak podataka koji mogu nastati korištenjem tih aplikacija."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Napredne postavke"</string>
@@ -1660,7 +1600,7 @@
     <string name="ask_compatibility" msgid="7225195569089607846">"Pitaj prilikom pokretanja"</string>
     <string name="enable_compatibility" msgid="5806819252068617811">"Skaliraj aplikaciju"</string>
     <string name="unknown" msgid="1592123443519355854">"Nepoznato"</string>
-    <string name="sort_order_alpha" msgid="1410278099123670628">"Poredaj po nazivu"</string>
+    <string name="sort_order_alpha" msgid="1410278099123670628">"Poredaj po imenu"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Poredaj po veličini"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Prikaži pokrenute usluge"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Prikaži procese iz keš memorije"</string>
@@ -1678,7 +1618,6 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Pokretanje"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB pohrana"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na SD kartici"</string>
-    <string name="disabled" msgid="9206776641295849915">"Onemogućeno"</string>
     <string name="not_installed" msgid="2797554494953450291">"Nije instal. za ovog korisnika"</string>
     <string name="installed" msgid="3070865169422600098">"Instalirano"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nema aplikacija."</string>
@@ -1784,12 +1723,11 @@
     <string name="service_manage_description" msgid="479683614471552426">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: trenutno je u upotrebi. Dodirnite Postavke da kontrolirate uslugu."</string>
     <string name="main_running_process_description" msgid="1130702347066340890">"Glavni proces se koristi."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Usluga <xliff:g id="COMP_NAME">%1$s</xliff:g> se koristi."</string>
-    <string name="process_provider_in_use_description" msgid="5586603325677678940">"Operater <xliff:g id="COMP_NAME">%1$s</xliff:g> se koristi."</string>
+    <string name="process_provider_in_use_description" msgid="5586603325677678940">"Pružalac <xliff:g id="COMP_NAME">%1$s</xliff:g> se koristi."</string>
     <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>
-    <!-- no translation found for language_input_gesture_title (8749227808244881255) -->
-    <skip />
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Jezici, unos i pokreti"</string>
     <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
     <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
     <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
@@ -1873,13 +1811,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Kreirati vidžet i omogućiti pristup?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Nakon što kreirate vidžet, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> može pristupiti svim podacima koje prikazuje."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Uvijek dopusti da aplikacija <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> kreira vidžete i koristi njihove podatke"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> d, <xliff:g id="HOURS">%2$d</xliff:g> h, <xliff:g id="MINUTES">%3$d</xliff:g> min, <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h, <xliff:g id="MINUTES">%2$d</xliff:g> min, <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> min, <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d, <xliff:g id="HOURS">%2$d</xliff:g> h, <xliff:g id="MINUTES">%3$d</xliff:g> min"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h, <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Statistika korištenja"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Statistika korištenja"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Poredaj po:"</string>
@@ -1891,6 +1822,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Čitači ekrana, ekran, kontrole za interakciju"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Postavke za vid"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Ovaj uređaj možete prilagoditi svojim potrebama. Funkcije pristupačnosti se mogu kasnije promijeniti u Postavkama."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Povećaj veličinu slova"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Čitači ekrana"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Zvuk i tekst na ekranu"</string>
     <string name="display_category_title" msgid="685461049938269166">"Prikaz"</string>
@@ -1911,10 +1843,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Da zumirate "</b>", brzo dodirnite ekran 3 puta.\n"<ul><li>"Povlačite s 2 ili više prstiju da pomjerate prikaz"</li>\n<li>"Sastavite 2 ili više prstiju da podesite zumiranje"</li></ul>\n\n<b>"Da privremeno zumirate prikaz"</b>", brzo dodirnite ekran 3 puta i zadržite prst na trećem dodiru.\n"<ul><li>"Povlačite prstom da pregledate ekran"</li>\n<li>"Podignite prst da umanjite prikaz"</li></ul>\n\n"Ne možete uvećati prikaz na tastaturi i navigacionoj traci."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Kada je uključena funkcija uvećavanja, koristite dugme Pristupačnost na dnu ekrana da brzo uvećate.\n\n"<b>"Da zumirate"</b>", dodirnite dugme Pristupačnost, zatim dodirnite bilo gdje na ekranu.\n"<ul><li>"Povlačite s 2 ili više prstiju da pomjerate prikaz."</li>\n<li>"Sastavite 2 ili više prstiju da podesite zumiranje. "</li></ul>\n\n<b>"Da privremeno zumirate"</b>", dodirnite dugme Pristupačnost, zatim dodirnite i držite bilo gdje na ekranu.\n"<ul><li>"Povlačite prstom da pregledate ekran"</li>\n<li>"Podignite prst da umanjite prikaz"</li></ul>\n\n"Ne možete uvećati prikaz na tastaturi i navigacionoj traci."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Dugme Pirstupačnost podešeno je za aktiviranje usluge <xliff:g id="SERVICE">%1$s</xliff:g>. Da koristite uvećanje dodirnite i držite dugme Pristupačnost, zatim odaberite uvećanje."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Prečica za pristupačnost"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Tipka za jačinu zvuka kao prečica"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Usluga prečice"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Dopusti iz zaključanog ekrana"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Kada je uključena prečica, možete pritisnuti i držati 3 sekunde oba dugmeta za podešavanje jačine zvuka da pokrenete funkciju za pristupačnost."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Kada je uključena prečica, možete pritisnuti obje tipke za podešavanje jačine zvuka i držati ih 3 sekunde da pokrenete funkciju pristupačnosti."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Tekst visokog kontrasta"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Automatsko ažuriranje uvećanja ekrana"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Ažurira uvećanje ekrana kod prelaza aplikacija"</string>
@@ -1927,7 +1859,7 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Može uticati na performanse"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klik kada se pokazivač zaustavi"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Odgoda prije klika"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
+    <string name="preference_summary_default_combination" msgid="8532964268242666060">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"UKLJUČENO"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ISKLJUČENO"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Prikaži u Brzim postavkama"</string>
@@ -2085,46 +2017,29 @@
     <string name="details_subtitle" msgid="32593908269911734">"Detalji o upotrebi"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Podesite potrošnju energije"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Uključeni paketi"</string>
-    <!-- no translation found for battery_abnormal_details_title (5469019021857291216) -->
-    <skip />
-    <!-- no translation found for battery_abnormal_wakelock_summary (4326186999058828831) -->
-    <skip />
-    <!-- no translation found for battery_abnormal_wakeup_alarm_summary (644657277875785240) -->
-    <skip />
-    <!-- no translation found for battery_abnormal_location_summary (6552797246798806002) -->
-    <skip />
-    <!-- no translation found for battery_abnormal_apps_summary (792553273248686972) -->
-    <skip />
-    <!-- no translation found for dialog_stop_title (6395127715596746479) -->
-    <skip />
-    <!-- no translation found for dialog_stop_message (9149534230295983971) -->
-    <skip />
-    <!-- no translation found for dialog_stop_message (5702924180465982412) -->
-    <skip />
-    <!-- no translation found for dialog_stop_message (9201053069493107713) -->
-    <skip />
-    <!-- no translation found for dialog_stop_ok (2319777211264004900) -->
-    <skip />
-    <!-- no translation found for dialog_background_check_title (1525936543485084879) -->
-    <skip />
-    <!-- no translation found for dialog_background_check_message (5539009263025812279) -->
-    <skip />
-    <!-- no translation found for dialog_background_check_message (4001747292234087612) -->
-    <skip />
-    <!-- no translation found for dialog_background_check_message (585341224642457664) -->
-    <skip />
-    <!-- no translation found for dialog_background_check_ok (412876934682899659) -->
-    <skip />
-    <!-- no translation found for dialog_location_title (5888917530725874727) -->
-    <skip />
-    <!-- no translation found for dialog_location_message (7684240588903005427) -->
-    <skip />
-    <!-- no translation found for dialog_location_message (7439311770795993356) -->
-    <skip />
-    <!-- no translation found for dialog_location_message (6285773079775018012) -->
-    <skip />
-    <!-- no translation found for dialog_location_ok (4572391197601313986) -->
-    <skip />
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplikacije koje prazne bateriju"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Uređaj ne ulazi u stanje mirovanja"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Podizanje uređaja iz stanja mirovanja u pozadini"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Učestalo zahtijevanje lokacije"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Ukupno aplikacija koje se ne ponašaju kako treba: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Želite zaustaviti aplikaciju?"</string>
+    <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Vaš telefon ne može normalno upravljati baterijom jer aplikacija <xliff:g id="APP">%1$s</xliff:g> stalno drži vaš telefon aktivnim.\n\nDa pokušate riješiti ovaj problem, možete zaustaviti aplikaciju.\n\nAko se problem ne riješi, možda ćete trebati deinstalirati aplikaciju da poboljšate rad baterije."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Vaš tablet ne može normalno upravljati baterijom jer aplikacija <xliff:g id="APP">%1$s</xliff:g> stalno drži vaš tablet aktivnim.\n\nDa pokušate riješiti ovaj problem, možete zaustaviti aplikaciju.\n\nAko se problem ne riješi, možda ćete trebati deinstalirati aplikaciju da poboljšate rad baterije."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Vaš uređaj ne može normalno upravljati baterijom jer aplikacija <xliff:g id="APP">%1$s</xliff:g> stalno drži vaš uređaj aktivnim.\n\nDa pokušate riješiti ovaj problem, možete zaustaviti aplikaciju.\n\nAko se problem ne riješi, možda ćete trebati deinstalirati aplikaciju da poboljšate rad baterije."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Vaš telefon ne može normalno upravljati baterijom jer aplikacija <xliff:g id="APP_0">%1$s</xliff:g> stalno podiže telefon iz stanja mirovanja.\n\nDa pokušate riješiti ovaj problem, možete zaustaviti aplikaciju <xliff:g id="APP_1">%1$s</xliff:g>.\n\nAko se problem ne riješi, možda ćete trebati deinstalirati aplikaciju da poboljšate rad baterije."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Vaš tablet ne može normalno upravljati baterijom jer aplikacija <xliff:g id="APP_0">%1$s</xliff:g> stalno podiže tablet iz stanja mirovanja.\n\nDa pokušate riješiti ovaj problem, možete zaustaviti aplikaciju <xliff:g id="APP_1">%1$s</xliff:g>.\n\nAko se problem ne riješi, možda ćete trebati deinstalirati aplikaciju da poboljšate rad baterije."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Vaš uređaj ne može normalno upravljati baterijom jer aplikacija <xliff:g id="APP_0">%1$s</xliff:g> stalno podiže uređaj iz stanja mirovanja.\n\nDa pokušate riješiti ovaj problem, možete zaustaviti aplikaciju <xliff:g id="APP_1">%1$s</xliff:g>.\n\nAko se problem ne riješi, možda ćete trebati deinstalirati aplikaciju da poboljšate rad baterije."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Zaustavi aplikaciju"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Želite li isključiti korištenje u pozadini i zaustaviti aplikaciju?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Vaš telefon ne može normalno upravljati baterijom jer aplikacija <xliff:g id="APP_0">%1$s</xliff:g> stalno podiže vaš telefon iz stanja mirovanja.\n\nDa pokušate riješiti ovaj problem, možete zaustaviti aplikaciju <xliff:g id="APP_1">%1$s</xliff:g> i spriječiti njen rad u pozadini."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Vaš tablet ne može normalno upravljati baterijom jer aplikacija <xliff:g id="APP_0">%1$s</xliff:g> stalno podiže vaš tablet iz stanja mirovanja.\n\nDa pokušate riješiti ovaj problem, možete zaustaviti aplikaciju <xliff:g id="APP_1">%1$s</xliff:g> i spriječiti njen rad u pozadini."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Vaš uređaj ne može normalno upravljati baterijom jer aplikacija <xliff:g id="APP_0">%1$s</xliff:g> stalno podiže vaš uređaj iz stanja mirovanja.\n\nDa pokušate riješiti ovaj problem, možete zaustaviti aplikaciju <xliff:g id="APP_1">%1$s</xliff:g> i spriječiti njen rad u pozadini."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Isključi"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Želite li isključiti uslugu lokacije?"</string>
+    <string name="dialog_location_message" product="default" msgid="7774807745601479888">"Vaš telefon ne može normalno upravljati baterijom jer aplikacija <xliff:g id="APP">%1$s</xliff:g> stalno traži vašu lokaciju kada je ne koristite.\n\nDa pokušate riješiti ovaj problem, možete isključiti lokaciju za ovu aplikaciju."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Vaš tablet ne može normalno upravljati baterijom jer aplikacija <xliff:g id="APP">%1$s</xliff:g> stalno traži vašu lokaciju kada je ne koristite.\n\nDa pokušate riješiti ovaj problem, možete isključiti lokaciju za ovu aplikaciju."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Vaš uređaj ne može normalno upravljati baterijom jer aplikacija <xliff:g id="APP">%1$s</xliff:g> stalno traži vašu lokaciju kada je ne koristite.\n\nDa pokušate riješiti ovaj problem, možete isključiti lokaciju za ovu aplikaciju."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Isključi"</string>
     <string name="power_screen" msgid="3023346080675904613">"Ekran"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Svjetiljka"</string>
     <string name="power_camera" msgid="4976286950934622605">"Fotoaparat"</string>
@@ -2139,8 +2054,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Aplikacije"</string>
     <string name="power_service" msgid="1599661212370831780">"Usluge"</string>
     <string name="power_system" msgid="8290455327965307383">"Sistem"</string>
-    <!-- no translation found for power_user (3706143225319881667) -->
-    <skip />
+    <string name="power_user" msgid="3706143225319881667">"Drugi korisnici"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Ukupno CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU u prvom planu"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Drži aktivnim"</string>
@@ -2192,14 +2106,13 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Prekoračenje potrošnje energije"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Korišteno <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_active_for (2964359540508103032) -->
-    <skip />
+    <string name="battery_active_for" msgid="2964359540508103032">"Aktivna već <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Korištenje ekrana <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"Aplikacija <xliff:g id="APP">%2$s</xliff:g> koristi <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ukupne baterije"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Pregled od posljednje potpune napunjenosti"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Posljednja potpuna napunjenost"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Preostalo vrijeme baterije je približno i može se mijenjati u zavisnosti od korištenja"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Podaci o korištenju baterije su okvirni i mogu se promijeniti u zavisnosti od upotrebe"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Dok se aktivno koristi"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Dok je u pozadini"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Korištenje baterije"</string>
@@ -2581,7 +2494,7 @@
     <string name="vpn_not_used" msgid="9094191054524660891">"(ne koristi se)"</string>
     <string name="vpn_no_ca_cert" msgid="8776029412793353361">"(ne verifikuj server)"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(primljeno od servera)"</string>
-    <string name="vpn_always_on_invalid_reason_type" msgid="7574518311224455825">"Ovaj tip VPN-a ne može biti stalno povezan"</string>
+    <string name="vpn_always_on_invalid_reason_type" msgid="7574518311224455825">"Ova vrsta VPN-a ne može biti stalno povezana"</string>
     <string name="vpn_always_on_invalid_reason_server" msgid="477304620899799383">"Uvijek aktivni VPN podržava samo numeričke adrese servera"</string>
     <string name="vpn_always_on_invalid_reason_no_dns" msgid="2226648961940273294">"DNS server mora biti naveden za uvijek aktivni VPN"</string>
     <string name="vpn_always_on_invalid_reason_dns" msgid="3551394495620249972">"Adrese DNS servera moraju biti numeričke za uvijek aktivni VPN"</string>
@@ -2764,7 +2677,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Promijeni PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Prikaži obavještenja"</string>
     <string name="help_label" msgid="6886837949306318591">"Pomoć i pov. inform."</string>
-    <string name="support_summary" msgid="8276116616493882830">"Članci za pomoć, podrška putem telefona i chata"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Članci za pomoć, telefon i chat, prvi koraci"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Račun za sadržaj"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID fotografije"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Ekstremne prijetnje"</string>
@@ -2779,7 +2692,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Upravitelj za pozive"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Hitna emitiranja"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Upozorenja na hitne slučajeve"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Mrežni operateri"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Nazivi pristupnih tačaka"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Unaprijeđeni 4G LTE način rada"</string>
@@ -2807,7 +2720,7 @@
     <string name="wizard_next" msgid="3606212602795100640">"Naprijed"</string>
     <string name="wizard_finish" msgid="3286109692700083252">"Kraj"</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_choose_photo" msgid="7940990613897477057">"Odaberi sliku iz Galerije"</string>
     <string name="user_image_photo_selector" msgid="5492565707299454873">"Odaberite fotografiju"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
     <string name="sim_setup_wizard_title" msgid="1732682852692274928">"SIM kartice"</string>
@@ -2824,8 +2737,8 @@
     <string name="sim_select_card" msgid="211285163525563293">"Odaberite SIM karticu"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM kartica je prazna"</string>
-    <string name="sim_editor_name" msgid="1722945976676142029">"Naziv SIM-a"</string>
-    <string name="sim_name_hint" msgid="7038643345238968930">"Unesite naziv SIM-a"</string>
+    <string name="sim_editor_name" msgid="1722945976676142029">"Ime SIM-a"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Unesite ime SIM-a"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM slot %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operater"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Broj"</string>
@@ -2839,9 +2752,9 @@
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM za odlazne pozive"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Ostale postavke poziva"</string>
     <string name="preferred_network_offload_title" msgid="1605829724169550275">"Pron. preferiranih mreža"</string>
-    <string name="preferred_network_offload_header" msgid="2321173571529106767">"Onem. emit. naziva mreže"</string>
-    <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Funkcija Onemogući emitiranje naziva mreže sprječava da treće strane dobiju informacije o vašoj mreži."</string>
-    <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Onemogućavanje Emitiranja naziva mreže će spriječiti automatsko povezivanje na skrivene mreže."</string>
+    <string name="preferred_network_offload_header" msgid="2321173571529106767">"Onem. emit. imena mreže"</string>
+    <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Funkcija Onemogući emitiranje imena mreže sprječava da treće strane dobiju informacije o vašoj mreži."</string>
+    <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Onemogućavanje emitiranja imena mreže će spriječiti automatsko povezivanje na skrivene mreže."</string>
     <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM kartice promijenjene."</string>
     <string name="sim_notification_summary" msgid="8858043655706669772">"Dodirnite za postavke"</string>
@@ -2867,8 +2780,8 @@
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Zadane aplikacije"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Jezici, vrijeme, sigurnosna kopija, ažuriranja"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Postavke"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Postavke pretraživanja"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Postavke pretraživanja"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Pretraži postavke"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Pretraži postavke"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, mrežne veze"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"tekstualna poruka, slanje tekstualnih poruka, poruke, slanje poruka"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilni, mobilni operater, bežični, podaci, 4g, 3g, 2g, lte"</string>
@@ -2897,7 +2810,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"preciznost"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"račun"</string>
     <string name="keywords_users" msgid="3434190133131387942">"ograničenje, ograničavanje, ograničen"</string>
-    <string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"korekcija teksta, ispravan, zvuk, vibrirati, auto, jezik, gest, predložiti, prijedlog, tema, uvredljivo, riječ, tip, emoji, međunarodna"</string>
+    <string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"korekcija teksta, ispravan, zvuk, vibrirati, auto, jezik, gest, predložiti, prijedlog, tema, uvredljivo, riječ, vrsta, emoji, međunarodna"</string>
     <string name="keywords_reset_apps" msgid="5293291209613191845">"ponovo podesi, željene postavke, zadano"</string>
     <string name="keywords_emergency_app" msgid="3143078441279044780">"hitni slučajevi, led, aplikacija, zadano"</string>
     <string name="keywords_default_phone_app" msgid="4213090563141778486">"telefon, brojčanik, zadani"</string>
@@ -2910,15 +2823,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"prevuci za otključavanje, lozinka, uzorak, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"poslovni izazov, rad, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"radni profil, upravljani profil, ujediniti, ujedinjenje, rad, profil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"pokret"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"pokreti"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"plati, dodir, plaćanja"</string>
     <string name="keywords_backup" msgid="470070289135403022">"sigurnosna kopija"</string>
-    <!-- no translation found for keywords_squeeze_to_launch_gesture (4459283333825902485) -->
-    <skip />
-    <!-- no translation found for keywords_wake_squeeze_gesture (6923058534235267845) -->
-    <skip />
-    <!-- no translation found for keywords_alarm_silence_gesture (8507935972184597252) -->
-    <skip />
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"pokret"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Postavljanje Wi-Fi NFC taga"</string>
     <string name="write_tag" msgid="8571858602896222537">"Pisati"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Dodirnite oznaku da biste pisali..."</string>
@@ -3002,7 +2910,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Uopće ne prikazuj poslovna obavještenja"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Kada je uređaj zaključan, na koji način želite da se prikazuju obavještenja profila?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Obavještenja profila"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Obavještenja"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Obavještenja"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Obavještenja o aplikaciji"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategorija obavještenja"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Značaj"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Neka aplikacija odluči"</string>
@@ -3015,8 +2924,12 @@
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Srednja"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Visoka"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Hitno"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Dozvoli zvuk"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Ne oglašavaj ova obavještenja zvukom, vibriranjem niti kratkim prikazom na aktuelnom ekranu."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Dozvoli ometanja"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Dopusti aplikaciji da se oglasi, vibrira i/ili prikaže obavještenja na ekranu"</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Manje važno"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Srednje važno"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Veoma važno"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Hitno"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Asistent za obavještenja"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Pristup obavještenjima"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Pristup obavještenjima radnog profila je blokiran"</string>
@@ -3044,7 +2957,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"sus slika u"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Slika u slici"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Dozvoli način rada Slika u slici"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Dozvoli ovoj aplikaciji da kreira prozor u načinu rada Slika u slici dok je aplikacija otvorena ili nakon što je napustite (naprimjer, da nastavite gledati videozapis). Ovaj videozapis se prikazuje preko drugih aplikacija koje koristite."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Dozvoli ovoj aplikaciji kreiranje prozora u načinu rada slika u slici dok je aplikacija otvorena ili nakon što je napustite (naprimjer, da nastavite gledati videozapis). Ovaj prozor se prikazuje preko drugih aplikacija koje koristite."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Pristup opciji Ne ometaj"</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>
@@ -3086,8 +2999,8 @@
     <string name="notification_channel_sound_title" msgid="3899212238513507941">"Zvuk"</string>
     <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"Izbriši"</string>
     <string name="zen_mode_rule_rename_button" msgid="4642843370946599164">"Preimenuj"</string>
-    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Naziv pravila"</string>
-    <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Unesite naziv pravila"</string>
+    <string name="zen_mode_rule_name" msgid="5149068059383837549">"Ime pravila"</string>
+    <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Unesite ime pravila"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Ime pravila se već koristi"</string>
     <string name="zen_mode_add_rule" msgid="7459154136384467057">"Dodajte još"</string>
     <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Obrisati pravilo"</string>
@@ -3124,7 +3037,7 @@
     <string name="zen_mode_calls" msgid="7051492091133751208">"Pozivi"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Poruke"</string>
     <string name="zen_mode_all_messages" msgid="6449223378976743208">"Sve poruke"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Izabrane poruke"</string>
+    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Odabrane poruke"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Od bilo koga"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Samo od kontakata"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Samo od kontakata označenih zvjezdicom"</string>
@@ -3282,7 +3195,7 @@
     <string name="assistant_security_warning" msgid="8498726261327239136">"Asistent dobija mogućnost čitanja informacija o aplikacijama koje se koriste na vašem sistemu, uključujući informacije vidljive na ekranu ili dostupne unutar aplikacija."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Pristajem"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"Ne slažem se"</string>
-    <string name="choose_voice_input_title" msgid="975471367067718019">"Izaberite glasovni unos"</string>
+    <string name="choose_voice_input_title" msgid="975471367067718019">"Odaberite glasovni unos"</string>
     <string name="default_browser_title" msgid="8101772675085814670">"Aplikacija preglednika"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"Nema zadanog pretraživača"</string>
     <string name="default_phone_title" msgid="282005908059637350">"Aplikacija za pozive"</string>
@@ -3309,13 +3222,17 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Obavještenja o upotrebi"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Prikaži kompletno korištenje uređaja"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Prikaži korištenje aplikacije"</string>
-    <string name="power_high_usage_title" msgid="6027369425057347826">"Velika potrošnja"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Visoka potrošnja"</string>
     <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
       <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacija se ne ponaša kako treba</item>
       <item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacije se ne ponašaju kako treba</item>
       <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacija se ne ponaša kako treba</item>
     </plurals>
-    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">Aplikacije prazne bateriju</item>
+      <item quantity="few">Aplikacije prazne bateriju</item>
+      <item quantity="other">Aplikacije prazne bateriju</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Bez optimizacije"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Nije optimiziran"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimizacija potrošnje baterije"</string>
@@ -3411,7 +3328,6 @@
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikacije s odobrenjem"</string>
     <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Dozvoljeno"</string>
     <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Nije dozvoljeno"</string>
-    <string name="install_other_apps" msgid="6986686991775883017">"Instaliranje nepoznatih aplikacija"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"instaliranje aplikacije nepoznati izvori"</string>
     <string name="write_settings" msgid="4797457275727195681">"Izmjena postavki sistema"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"pisati izmijeniti sistemske postavke"</string>
@@ -3423,6 +3339,8 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Dozvola za izmjenu postavki sistema aplikacije"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Dozvoli izmijenu postavki sistema"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Ovo odobrenje omogućava aplikaciji da izmijeni postavke sistema."</string>
+    <string name="write_settings_on" msgid="8230580416068832239">"Da"</string>
+    <string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Dozvoli iz ovog izvora"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Dvostruko uvrtanje za otvaranje kamere"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Da biste otvorili aplikaciju za kameru, dva puta uvrnite zglob"</string>
@@ -3496,15 +3414,30 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Pozadinski podaci su dostupni samo putem Wi-Fi mreže. Ovo može uticati na rad nekih aplikacija ili usluga kada Wi-Fi nije dostupan."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Radni profil je isključen"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Isključene su aplikacije, pozadinska sinhronizacija i ostale funkcije povezane s vašim radnim profilom."</string>
+    <string name="night_display_suggestion_title" msgid="6602129097059325291">"Postavite plan za Noćno svjetlo"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Obojite ekran u narandžasto da lakše zaspite"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Noćno svjetlo je uključeno"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Ekran je obojen u žutosmeđu nijansu. To vam može pomoći da zaspite."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Prijedlozi"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"još <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"Još <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> prijedlog</item>
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> prijedloga</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> prijedloga</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="one">još <xliff:g id="COUNT">%1$d</xliff:g> prijedlog</item>
+      <item quantity="few">još <xliff:g id="COUNT">%1$d</xliff:g> prijedloga</item>
+      <item quantity="other">još <xliff:g id="COUNT">%1$d</xliff:g> prijedloga</item>
+    </plurals>
     <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">"Koristite hladnije boje prikaza"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Isključite ekran kako biste primijenili promjenu boje"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Da primijenite promjenu na nadzoru telefonije, ponovo pokrenite uređaj"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Da primijenite promjenu za Kamera HAL HDR+, ponovo pokrenite uređaj"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatsko ažuriranje sistema"</string>
     <string name="usage" msgid="2977875522080448986">"Potrošnja"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Potrošnja mobilnih podataka"</string>
@@ -3605,7 +3538,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrola obavještenja zaključanog ekrana"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Pokaži ili sakrij sadržaj obavještenja"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Sve"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Podrška"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Podrška i savjeti"</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 premijum SMS-ovima"</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>
@@ -3673,58 +3606,38 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatski"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Ručno"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Oslobodite prostor odmah"</string>
-    <string name="gesture_preference_title" msgid="4033736910560673690">"Prečice za pokrete"</string>
+    <string name="gesture_preference_title" msgid="5280023307132819052">"Pokreti"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Brzi pokreti za kontrolu nad telefonom"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Brzi pokreti za kontrolu nad tableta"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Brzi pokreti za kontrolu uređaja"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Prelazak na Kameru"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Dodirivanje dvaput na dugme za uključivanje za brzo otvaranje kamere. Funkcionira na svakom ekranu."</string>
-    <!-- no translation found for double_tap_power_for_camera_suggestion_title (6500405261202883589) -->
-    <skip />
-    <!-- no translation found for double_tap_power_for_camera_suggestion_summary (7010153544554016996) -->
-    <skip />
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Brzo otvorite kameru"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Dodirnite dugme za napajanje dvaput da otvorite kameru"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Okretanje kamere"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
-    <!-- no translation found for double_twist_for_camera_suggestion_title (4689410222517954869) -->
-    <skip />
-    <!-- no translation found for double_twist_for_camera_suggestion_summary (447403641027147153) -->
-    <skip />
-    <!-- no translation found for double_twist_for_camera_suggestion_summary (1724660290703318739) -->
-    <skip />
-    <!-- no translation found for double_twist_for_camera_suggestion_summary (5980398380988039489) -->
-    <skip />
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Snimajte selfije brže"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Uvrnite telefon dvaput za selfi način rada"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Uvrnite tablet dvaput za selfi način rada"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Uvrnite uređaj dvaput za selfi način rada"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Kliknite dvaput za provjeru telefona"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Kliknite dvaput za provjeru tableta"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Kliknite dvaput za provjeru uređaja"</string>
-    <!-- no translation found for ambient_display_summary (525662960806416373) -->
-    <skip />
-    <!-- no translation found for ambient_display_suggestion_summary (5987443721392571847) -->
-    <skip />
+    <string name="ambient_display_summary" msgid="525662960806416373">"Da provjerite vrijeme, ikone obavještenja i druge informacije, dodirnite ekran dvaput."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Provjera obavještenja kada je ekran isključen"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Provjera telefona kad se podigne"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Podignite za provjeru tableta"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Podignite za provjeru uređaja"</string>
-    <!-- no translation found for ambient_display_pickup_summary (4567020486787561873) -->
-    <skip />
-    <!-- no translation found for ambient_display_pickup_summary (5435283849947236648) -->
-    <skip />
-    <!-- no translation found for ambient_display_pickup_summary (8256669101643381568) -->
-    <skip />
-    <!-- no translation found for ambient_display_pickup_suggestion_summary (7014700589991761035) -->
-    <skip />
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Da provjerite vrijeme, ikone obavještenja i druge informacije, podignite telefon."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Da provjerite vrijeme, ikone obavještenja i druge informacije, podignite tablet."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Da provjerite vrijeme, ikone obavještenja i druge informacije, podignite uređaj."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Provjerite obavještenja dok je ekran isključen"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Prevlačenje prstom za obavještenja"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Provjera obavještenja prevlačenjem prstom prema dolje po senzoru za otisak prsta na poleđini telefona."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Provjera obavještenja prevlačenjem prstom prema dolje po senzoru za otisak prsta na poleđini tableta."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Provjera obavještenja prevlačenjem prstom prema dolje po senzoru za otisak prsta na poleđini uređaja."</string>
-    <!-- no translation found for fingerprint_swipe_for_notifications_suggestion_title (1677291167470357802) -->
-    <skip />
-    <!-- no translation found for fingerprint_swipe_for_notifications_suggestion_summary (127592803294414082) -->
-    <skip />
-    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Podignite da otvorite kameru"</string>
-    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Za automatsko otvaranje kamere, podignite telefon u položaj za fotografiranje (pejzaž ili portret). Funkcionira kada je telefon u stanju mirovanja ili je zaključan."</string>
-    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Fotografirajte dok je telefon u stanju mirovanja ili zaključan"</string>
-    <string name="assist_gesture_title" msgid="7746563137898655539">"Pokret za pomoć"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Osjetljivost"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Brzo pregledajte obavještenja"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Prevucite prstom prema dolje na senzoru za otisak 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">"Program za učitavanje operativnog sistema je već otključan"</string>
@@ -3745,6 +3658,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Automatsko sinhroniziranje radnih podataka"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Omogućava aplikacijama automatsko osvježavanje podataka"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Sinhronizacija računa"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Sinhronizacija uključena za <xliff:g id="ID_1">%1$d</xliff:g> od ukupno <xliff:g id="ID_2">%2$d</xliff:g> stav."</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Sinhronizacija je uključena za sve stavke"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Sinhronizacija je isključena za sve stavke"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Podaci o upravljanom uređaju"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Promjene i postavke kojima upravlja vaša organizacija"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Promjene i postavke kojima upravlja organizacija <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3848,8 +3764,7 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplikacije za filmove i TV"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operater koji pruža informacije"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktiviranje dodjele resursa operatera"</string>
-    <!-- no translation found for new_device_suggestion_title (8346563796032837800) -->
-    <skip />
-    <!-- no translation found for new_device_suggestion_summary (7172709269203435870) -->
-    <skip />
+    <string name="new_device_suggestion_title" msgid="698847081680980774">"Šta je novo i uzbudljivo?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Pogledajte 5 najboljih funkcija"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ova funkcija nije dostupna na ovom uređaju"</string>
 </resources>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 7ce5a9e..50b510d 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -264,7 +264,7 @@
     <item msgid="1545733463471924009">"dibuixa a sobre"</item>
     <item msgid="3609046903962454582">"accedeix a les notificacions"</item>
     <item msgid="4671646036128214513">"càmera"</item>
-    <item msgid="1097324338692486211">"enregistra l\'àudio"</item>
+    <item msgid="1097324338692486211">"grava l\'àudio"</item>
     <item msgid="5031552983987798163">"reprodueix l\'àudio"</item>
     <item msgid="8374996688066472414">"llegeix el porta-retalls"</item>
     <item msgid="3045529469061083747">"modifica el porta-retalls"</item>
@@ -331,7 +331,7 @@
     <item msgid="736541391767350377">"Dibuixa a sobre"</item>
     <item msgid="5530815681721654194">"Accedeix a les notificacions"</item>
     <item msgid="781213371706962767">"Càmera"</item>
-    <item msgid="1720492593061838172">"Enregistra l\'àudio"</item>
+    <item msgid="1720492593061838172">"Grava l\'àudio"</item>
     <item msgid="3493046322001257041">"Reprodueix l\'àudio"</item>
     <item msgid="136815868796597058">"Llegeix el porta-retalls"</item>
     <item msgid="5238692940326972503">"Modifica el porta-retalls"</item>
@@ -343,7 +343,7 @@
     <item msgid="7878027809189330917">"Volum de multimèdia"</item>
     <item msgid="7260546305036218513">"Volum de l\'alarma"</item>
     <item msgid="9103719301075748925">"Volum de notificació"</item>
-    <item msgid="7025966722295861512">"Volum de Bluetooth"</item>
+    <item msgid="7025966722295861512">"Volum del Bluetooth"</item>
     <item msgid="4665183401128289653">"Mantén actiu"</item>
     <item msgid="8584357129746649222">"Ubicació"</item>
     <item msgid="7669257279311110599">"Ubicació"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index ebc9381..7d2728d 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -115,7 +115,7 @@
     <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Desconnecta"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"No tens permís per canviar la configuració del Bluetooth."</string>
     <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Vincula un dispositiu nou"</string>
-    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> serà visible per a dispositius propers mentre la configuració de Bluetooth estigui oberta."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> serà visible per a dispositius propers mentre la configuració del Bluetooth estigui oberta."</string>
     <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Adreça Bluetooth del telèfon: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Adreça Bluetooth de la tauleta: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Adreça Bluetooth del dispositiu: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
@@ -136,14 +136,14 @@
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> vol desactivar el Bluetooth"</string>
     <string name="bluetooth_ask_enablement_no_name" msgid="1644353686104482763">"Una aplicació vol activar el Bluetooth"</string>
     <string name="bluetooth_ask_disablement_no_name" msgid="9218830122674868548">"Una aplicació vol desactivar el Bluetooth"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4791779658660357386">"<xliff:g id="APP_NAME">%1$s</xliff:g> vol que la tauleta sigui visible per a altres dispositius amb Bluetooth durant <xliff:g id="TIMEOUT">%2$d</xliff:g> segons."</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="1308225382575535366">"<xliff:g id="APP_NAME">%1$s</xliff:g> vol que el telèfon sigui visible per a altres dispositius amb Bluetooth durant <xliff:g id="TIMEOUT">%2$d</xliff:g> segons."</string>
-    <string name="bluetooth_ask_discovery_no_name" product="tablet" msgid="225715443477752935">"Una aplicació vol que la tauleta sigui visible per a altres dispositius amb Bluetooth durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons."</string>
-    <string name="bluetooth_ask_discovery_no_name" product="default" msgid="4949152735544109994">"Una aplicació vol que el telèfon sigui visible per a altres dispositius amb Bluetooth durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons."</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8528329166577187961">"<xliff:g id="APP_NAME">%1$s</xliff:g> vol que la tauleta sigui visible per a altres dispositius amb Bluetooth. Pots canviar aquesta opció més endavant a la configuració del Bluetooth."</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="4398738575307583138">"<xliff:g id="APP_NAME">%1$s</xliff:g> vol que el telèfon sigui visible per a altres dispositius amb Bluetooth. Pots canviar aquesta opció més endavant a la configuració del Bluetooth."</string>
-    <string name="bluetooth_ask_lasting_discovery_no_name" product="tablet" msgid="1702590641426207062">"Una aplicació vol que la tauleta sigui visible per a altres dispositius amb Bluetooth. Pots canviar aquesta opció més endavant a la configuració del Bluetooth."</string>
-    <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="8549952177383992238">"Una aplicació vol que el telèfon sigui visible per a altres dispositius amb Bluetooth. Pots canviar aquesta opció més endavant a la configuració del Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="4791779658660357386">"<xliff:g id="APP_NAME">%1$s</xliff:g> vol que la tauleta sigui visible per a altres dispositius Bluetooth durant <xliff:g id="TIMEOUT">%2$d</xliff:g> segons."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="1308225382575535366">"<xliff:g id="APP_NAME">%1$s</xliff:g> vol que el telèfon sigui visible per a altres dispositius Bluetooth durant <xliff:g id="TIMEOUT">%2$d</xliff:g> segons."</string>
+    <string name="bluetooth_ask_discovery_no_name" product="tablet" msgid="225715443477752935">"Una aplicació vol que la tauleta sigui visible per a altres dispositius Bluetooth durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons."</string>
+    <string name="bluetooth_ask_discovery_no_name" product="default" msgid="4949152735544109994">"Una aplicació vol que el telèfon sigui visible per a altres dispositius Bluetooth durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8528329166577187961">"<xliff:g id="APP_NAME">%1$s</xliff:g> vol que la tauleta sigui visible per a altres dispositius Bluetooth. Pots canviar aquesta opció més endavant a la configuració del Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="4398738575307583138">"<xliff:g id="APP_NAME">%1$s</xliff:g> vol que el telèfon sigui visible per a altres dispositius Bluetooth. Pots canviar aquesta opció més endavant a la configuració del Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery_no_name" product="tablet" msgid="1702590641426207062">"Una aplicació vol que la tauleta sigui visible per a altres dispositius Bluetooth. Pots canviar aquesta opció més endavant a la configuració del Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="8549952177383992238">"Una aplicació vol que el telèfon sigui visible per a altres dispositius Bluetooth. Pots canviar aquesta opció més endavant a la configuració del Bluetooth."</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="1141843490422565755">"<xliff:g id="APP_NAME">%1$s</xliff:g> vol activar el Bluetooth i que la tauleta sigui visible per a altres dispositius durant <xliff:g id="TIMEOUT">%2$d</xliff:g> segons."</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="5195836980079191473">"<xliff:g id="APP_NAME">%1$s</xliff:g> vol activar el Bluetooth i que el telèfon sigui visible per a altres dispositius durant <xliff:g id="TIMEOUT">%2$d</xliff:g> segons."</string>
     <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="7009338445281693765">"Una aplicació vol activar el Bluetooth i que la tauleta sigui visible per a altres dispositius durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons."</string>
@@ -153,7 +153,7 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="692477613671555006">"Una aplicació vol activar el Bluetooth i que la tauleta sigui visible per a altres dispositius. Pots canviar aquesta opció més endavant a la configuració del Bluetooth."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Una aplicació vol activar el Bluetooth i que el telèfon sigui visible per a altres dispositius. Pots canviar aquesta opció més endavant a la configuració del Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"S\'està activant el Bluetooth..."</string>
-    <string name="bluetooth_turning_off" msgid="2337747302892025192">"S\'està desactivant Bluetooth??"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"S\'està desactivant el Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Connexió automàtica"</string>
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Sol·licitud de connexió de Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Toca per connectar-te al dispositiu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s vol accedir als teus missatges. Vols donar-li accés a %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Sol·licitud d\'accés a la SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> vol accedir a la targeta SIM. Si hi concedeixes accés, es desactivarà la connectivitat de dades al dispositiu mentre duri la connexió. Dona accés a <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visible com a <xliff:g id="DEVICE_NAME">^1</xliff:g> per a altres dispositius"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible com a <xliff:g id="DEVICE_NAME">^1</xliff:g> per a altres dispositius"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Els teus dispositius"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Vincula un dispositiu nou"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data i hora"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Següent"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Ometre l\'empremta digital?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Només calen un parell de minuts per configurar l\'empremta digital. Si omets aquest pas, pots afegir-la més endavant a Configuració."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Ometre bloqueig de pantalla?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Les funcions de protecció del dispositiu no s\'activaran. Si perds la tauleta, te la roben o se\'n restableixen les dades de fàbrica, no podràs evitar que altres persones la utilitzin."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Les funcions de protecció del dispositiu no s\'activaran. Si perds el dispositiu, te\'l roben o se\'n restableixen les dades de fàbrica, no podràs evitar que altres persones l\'utilitzin."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Les funcions de protecció del dispositiu no s\'activaran. Si perds el telèfon, te\'l roben o se\'n restableixen les dades de fàbrica, no podràs evitar que altres persones l\'utilitzin."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Has afegit el nombre màxim d\'empremtes digitals"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"No es poden afegir més empremtes digitals"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Suprimir les empremtes digitals?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Suprimeix <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Vols suprimir aquesta empremta digital?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"No podràs fer servir les empremtes digitals per desbloquejar el telèfon, autoritzar compres ni iniciar la sessió en aplicacions"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"No podràs utilitzar les empremtes digitals per desbloquejar el teu perfil professional, autoritzar compres ni iniciar la sessió en aplicacions de la feina"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Sí, suprimeix"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protegeix la tauleta"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protegeix el dispositiu"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protegeix el telèfon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Configura un bloqueig de pantalla alternatiu per a més seguretat."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Configura un bloqueig de pantalla alternatiu per a més seguretat."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activa les funcions de protecció del dispositiu per impedir que altres persones utilitzin aquesta tauleta sense permís. Tria el bloqueig de pantalla que vulguis utilitzar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activa les funcions de protecció del dispositiu per impedir que altres persones el facin servir sense permís. Tria el bloqueig de pantalla que vulguis utilitzar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activa les funcions de protecció del dispositiu per impedir que altres persones utilitzin aquest telèfon sense permís. Tria el bloqueig de pantalla que vulguis utilitzar."</string>
@@ -497,37 +502,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Vols suprimir la protecció del dispositiu?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Vols suprimir la protecció del perfil?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Les funcions de protecció del dispositiu no funcionaran sense el teu patró."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Les funcions de protecció del dispositiu no funcionaran sense el teu patró.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Les funcions de protecció del dispositiu no funcionen sense patró.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Les empremtes digitals que tinguis desades també se suprimiran del dispositiu i no podràs fer-les servir per desbloquejar el telèfon, per autoritzar compres ni per iniciar la sessió a les aplicacions."</string>
+</xliff:g>Les empremtes digitals que hagis desat també se suprimiran d\'aquest dispositiu i no podràs fer-les servir per desbloquejar el telèfon, autoritzar compres ni iniciar la sessió a les aplicacions."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Les funcions de protecció del dispositiu no funcionaran sense el teu PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Les funcions de protecció del dispositiu no funcionaran sense el teu PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Les funcions de protecció del dispositiu no funcionen sense PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Les empremtes digitals que tinguis desades també se suprimiran del dispositiu i no podràs fer-les servir per desbloquejar el telèfon, per autoritzar compres ni per iniciar la sessió a les aplicacions."</string>
+</xliff:g>Les empremtes digitals que hagis desat també se suprimiran d\'aquest dispositiu i no podràs fer-les servir per desbloquejar el telèfon, autoritzar compres ni iniciar la sessió a les aplicacions."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Les funcions de protecció del dispositiu no funcionaran sense la teva contrasenya."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Les funcions de protecció del dispositiu no funcionaran sense la teva contrasenya.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Les funcions de protecció del dispositiu no funcionen sense contrasenya.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Les empremtes digitals que tinguis desades també se suprimiran del dispositiu i no podràs fer-les servir per desbloquejar el telèfon, per autoritzar compres ni per iniciar la sessió a les aplicacions."</string>
+</xliff:g>Les empremtes digitals que hagis desat també se suprimiran d\'aquest dispositiu i no podràs fer-les servir per desbloquejar el telèfon, autoritzar compres ni iniciar la sessió a les aplicacions."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Les funcions de protecció del dispositiu no funcionaran sense el teu bloqueig de pantalla."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Les funcions de protecció del dispositiu no funcionaran sense el teu bloqueig de pantalla.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Les funcions de protecció del dispositiu no funcionen sense bloqueig de pantalla.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Les empremtes digitals que tinguis desades també se suprimiran del dispositiu i no podràs fer-les servir per desbloquejar el telèfon, per autoritzar compres ni per iniciar la sessió a les aplicacions."</string>
+</xliff:g>Les empremtes digitals que hagis desat també se suprimiran del dispositiu i no podràs fer-les servir per desbloquejar el telèfon, autoritzar compres ni iniciar la sessió a les aplicacions."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Les funcions de protecció del perfil no funcionen sense patró."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Les funcions de protecció del perfil no funcionen sense patró.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Les funcions de protecció del perfil no funcionen sense patró.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Les empremtes digitals que hagis desat també se suprimiran d\'aquest perfil i no podràs fer-les servir per desbloquejar-lo, per autoritzar compres ni per iniciar la sessió a les aplicacions."</string>
+</xliff:g>Les empremtes digitals que hagis desat també se suprimiran d\'aquest perfil i no podràs fer-les servir per desbloquejar-lo, autoritzar compres ni iniciar la sessió a les aplicacions."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Les funcions de protecció del perfil no funcionen sense PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Les funcions de protecció del perfil no funcionen sense PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Les funcions de protecció del perfil no funcionen sense PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Les empremtes digitals que hagis desat també se suprimiran d\'aquest perfil i no podràs fer-les servir per desbloquejar-lo, per autoritzar compres ni per iniciar la sessió a les aplicacions."</string>
+</xliff:g>Les empremtes digitals que hagis desat també se suprimiran d\'aquest perfil i no podràs fer-les servir per desbloquejar-lo, autoritzar compres ni iniciar la sessió a les aplicacions."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Les funcions de protecció del perfil no funcionen sense contrasenya."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Les funcions de protecció del perfil no funcionen sense contrasenya.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Les funcions de protecció del perfil no funcionen sense contrasenya.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Les empremtes digitals que hagis desat també se suprimiran d\'aquest perfil i no podràs fer-les servir per desbloquejar-lo, per autoritzar compres ni per iniciar la sessió a les aplicacions."</string>
+</xliff:g>Les empremtes digitals que hagis desat també se suprimiran d\'aquest perfil i no podràs fer-les servir per desbloquejar-lo, autoritzar compres ni iniciar la sessió a les aplicacions."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Les funcions de protecció del perfil no funcionen sense bloqueig de pantalla."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Les funcions de protecció del perfil no funcionen sense bloqueig de pantalla.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Les funcions de protecció del perfil no funcionen sense bloqueig de pantalla.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Les empremtes digitals que hagis desat també se suprimiran d\'aquest perfil i no podràs fer-les servir per desbloquejar-lo, per autoritzar compres ni per iniciar la sessió a les aplicacions."</string>
+</xliff:g>Les empremtes digitals que hagis desat també se suprimiran d\'aquest perfil i no podràs fer-les servir per desbloquejar-lo, autoritzar compres ni iniciar la sessió a les aplicacions."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Sí, suprimeix"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Canvia el patró de desbloqueig"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Canvia el PIN de desbloqueig"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"No es permet cap seqüència de dígits ascendents, descendents ni repetits"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"D\'acord"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancel·la"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Esborra"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancel·la"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Següent"</string>
     <string name="lock_setup" msgid="3355847066343753943">"S\'ha completat la configuració."</string>
@@ -644,7 +650,7 @@
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Desconnecta i dessincronitza"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opcions…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Configuració avançada"</string>
-    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Config. avançada de Bluetooth"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Config. avançada del Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Amb el Bluetooth activat, el dispositiu pot connectar amb més dispositius Bluetooth a prop."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Per millorar la precisió de la ubicació, les aplicacions i els serveis del sistema poden continuar detectant els dispositius Bluetooth. Pots canviar aquesta opció a la <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configuració de cerca<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_failed" msgid="4500234659813241053">"No s\'ha pogut connectar. Torna-ho a provar."</string>
@@ -737,7 +743,7 @@
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"S\'ha produït un problema en canviar la configuració"</string>
     <string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"Millora l\'eficàcia"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimització de Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimitza l\'ús de la bateria amb Wi-Fi activada"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimitza el consum de la bateria amb Wi-Fi activada"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Límit bateria usada per Wi-Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"Utilitza dades mòbils si la Wi-Fi perd l\'accés a Internet."</string>
     <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"Canvia automàticament a dades mòbils"</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introdueix la contrasenya de la xarxa."</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Xarxa Wi-Fi de l\'operador"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Connecta\'t mitjançant <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Per millorar la precisió de la ubicació i per a altres finalitats, <xliff:g id="APP_NAME">%1$s</xliff:g> vol activar la cerca de xarxes tot i que la connexió Wi-Fi estigui desactivada.\n\nVols permetre-ho per a totes les aplicacions que vulguin cercar xarxes?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Per desactivar aquesta funció, ves a Configuració avançada al menú addicional."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permet"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Connecta"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"No s\'ha pogut connectar a la xarxa"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Esborra"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modifica"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"No s\'ha pogut esborrar la xarxa"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Desa"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"No s\'ha pogut desar la xarxa"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Config. avançada de Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adreça MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Adreça IP"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Informació de la xarxa"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Màscara de la subxarxa"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Adreces IPv6"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Vols cancel·lar la invitació?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vols cancel·lar la invitació per connectar amb <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Vols esborrar aquest grup?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Punt d\'accés Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Punt d\'accés Wi-Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"No s\'està compartint la connexió a Internet ni contingut amb altres dispositius"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"S\'està compartint la connexió a Internet de la tauleta mitjançant el punt d\'accés Wi-Fi"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"S\'està compartint la connexió a Internet del telèfon mitjançant el punt d\'accés Wi-Fi"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"L\'aplicació està compartint contingut. Per compartir la connexió a Internet, desactiva el punt d\'accés Wi-Fi i torna\'l a activar."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nom de la Wi-Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Nom del punt d\'accés Wi-Fi"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"S\'està activant <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Altres dispositius es poden connectar a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Contrasenya de la Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Contrasenya del punt d\'accés Wi-Fi"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda del punt d\'accés"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Utilitza el punt d\'accés Wi-Fi per crear una xarxa Wi-Fi per a altres dispositius. El punt d\'accés Wi-Fi proporciona Internet mitjançant la teva connexió de dades mòbils. És possible que s\'hi apliquin càrrecs addicionals per l\'ús de dades mòbils."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Les aplicacions poden crear un punt d\'accés Wi-Fi per compartir contingut amb els dispositius que es trobin a prop."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Adreça que utilitzen els serveis d\'emergència com la teva ubicació si fas una trucada d\'emergència per Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"So"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volum"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Cerca"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Gestiona la configuració i l\'historial de cerques"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"No s\'ha trobat cap resultat"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Esborra l\'historial"</string>
     <string name="display_settings" msgid="7965901687241669598">"Pantalla"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Gira pantalla automàticament"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Colors vius"</string>
@@ -1018,7 +1028,7 @@
     <string name="auto_brightness_very_high_title" msgid="8867164854439331022">"Molt alta"</string>
     <string name="auto_brightness_subtitle" msgid="6454652530864093466">"El teu nivell de brillantor preferit"</string>
     <string name="auto_brightness_off_summary" msgid="7629228736838155268">"No l\'ajustis segons la llum disponible"</string>
-    <string name="auto_brightness_very_high_summary" msgid="4551003097086220709">"Augment de l\'ús de la bateria"</string>
+    <string name="auto_brightness_very_high_summary" msgid="4551003097086220709">"Augment del consum de la bateria"</string>
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimitza la brillantor segons la llum. Quan aquesta funció està activada, pots ajustar la brillantor temporalment."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Llum nocturna"</string>
     <string name="night_display_text" msgid="1837277457033025056">"La llum nocturna acoloreix la pantalla de groc. D\'aquesta manera, costa menys mirar-la o llegir-hi amb poca llum i és més fàcil adormir-se."</string>
@@ -1247,7 +1257,7 @@
     <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="8907101974576694793">"A la secció Altres s\'inclouen fitxers compartits que han desat les aplicacions, fitxers que s\'han baixat d\'Internet o mitjançant Bluetooth, i fitxers d\'Android, entre d\'altres. \n\nPer veure el contingut visible d\'aquest dispositiu <xliff:g id="NAME">^1</xliff:g>, toca Explora."</string>
+    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"A la secció Altres s\'inclouen fitxers compartits que han desat les aplicacions, fitxers que s\'han baixat d\'Internet o per Bluetooth, i fitxers d\'Android, entre d\'altres. \n\nPer veure el contingut visible d\'aquest dispositiu <xliff:g id="NAME">^1</xliff:g>, toca Explora."</string>
     <string name="storage_detail_dialog_system" msgid="862835644848361569">"El sistema inclou fitxers que s\'utilitzen per executar la versió d\'Android <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"És possible que <xliff:g id="USER_0">^1</xliff:g> hagi desat fotos, música, aplicacions o altres dades que ocupen <xliff:g id="SIZE">^2</xliff:g> d\'emmagatzematge. \n\nPer veure\'n informació detallada, 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>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"S\'està restaurant la configuració predeterminada d\'APN."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Restableix valors predeterminats"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"S\'ha restablert la configuració predeterminada d\'APN."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Restableix"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Restableix la configuració de xarxa"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Restableix les opcions"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Es poden restablir la xarxa, les aplicacions o el dispositiu"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Restableix la Wi-Fi, les dades mòbils i el Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Es restabliran totes les opcions de configuració de la xarxa, inclosos:\n\n"<li>"la Wi‑Fi"</li>\n<li>"les dades mòbils"</li>\n<li>"el Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Restableix la configuració"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Vols restablir tota la configuració de la xarxa? Aquesta acció no es pot desfer."</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Restablir?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"El restabliment de xarxa no està disponible per a aquest usuari"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"S\'ha restablert la configuració de la xarxa"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Restableix les dades de fàbrica"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other">Es restabliran <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> comptes</item>
-      <item quantity="one">Es restablirà 1 compte</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Es restabliran l\'emmagatzematge intern i totes les dades"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Esborra totes les dades (restabliment de les dades de fàbrica)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Aquesta acció esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" de la tauleta, com ara:\n\n"<li>"El teu compte de Google"</li>\n<li>"Les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"Les aplicacions baixades"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Aquesta acció esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" del teu telèfon, també:\n\n"<li>"El teu compte de Google"</li>\n<li>"Les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"Les aplicacions baixades"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualment has iniciat la sessió als comptes següents:\n"</string>
@@ -1382,7 +1388,7 @@
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Compartició de xarxa per Bluetooth"</string>
     <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Comparteix la connexió a Internet de la tauleta per Bluetooth"</string>
     <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Comparteix la connexió a Internet del telèfon per Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"S\'està compartint la connexió a Internet de <xliff:g id="DEVICE_NAME">%1$d</xliff:g> per Bluetooth"</string>
+    <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"S\'està compartint la connexió a Internet del dispositiu <xliff:g id="DEVICE_NAME">%1$d</xliff:g> per Bluetooth"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"No es pot compartir la xarxa amb més de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositius."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Es desactivarà la compartició de xarxa per a: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="tethering_footer_info" msgid="1308462275952345985">"Utilitza el punt d\'accés Wi-Fi i la compartició de xarxa per proporcionar Internet a altres dispositius mitjançant la teva connexió de dades mòbils. Les aplicacions també poden crear un punt d\'accés Wi-Fi per compartir contingut amb els dispositius que es trobin a prop."</string>
@@ -1390,8 +1396,8 @@
     <string name="network_settings_title" msgid="2876509814832830757">"Xarxa mòbil"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Pla mòbil"</string>
     <string name="sms_application_title" msgid="4903928270533250448">"Aplicació d\'SMS"</string>
-    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vols canviar l\'aplicació per a SMS?"</string>
-    <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Vols fer servir <xliff:g id="NEW_APP">%1$s</xliff:g> en lloc de <xliff:g id="CURRENT_APP">%2$s</xliff:g> com a aplicació per als SMS?"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vols canviar l\'aplicació d\'SMS?"</string>
+    <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Vols fer servir <xliff:g id="NEW_APP">%1$s</xliff:g> en lloc de <xliff:g id="CURRENT_APP">%2$s</xliff:g> com a aplicació d\'SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Vols fer servir <xliff:g id="NEW_APP">%s</xliff:g> com a aplicació per als SMS?"</string>
     <string name="network_scorer_picker_title" msgid="6383879578279046456">"Proveïdor de valoració de xarxes"</string>
     <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"Cap"</string>
@@ -1413,8 +1419,8 @@
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Sol·licituds d\'ubicació recents"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Cap aplicació no ha sol·licitat la ubicació recentment"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Serveis d\'ubicació"</string>
-    <string name="location_high_battery_use" msgid="517199943258508020">"Ús de bateria elevat"</string>
-    <string name="location_low_battery_use" msgid="8602232529541903596">"Poc ús de bateria"</string>
+    <string name="location_high_battery_use" msgid="517199943258508020">"Consum de bateria elevat"</string>
+    <string name="location_low_battery_use" msgid="8602232529541903596">"Poc consum de bateria"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode d\'ubicació"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Utilitza el GPS, la Wi-Fi, el Bluetooth o les xarxes mòbils per determinar la ubicació"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Utilitza la Wi‑Fi, el Bluetooth o les xarxes mòbils per determinar la ubicació"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informació de seguretat"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"No tens cap connexió de dades. Per visualitzar aquesta informació ara, dirigeix-te a %s des d\'un equip connectat a Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"S\'està carregant…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Tria una contrasenya"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Defineix un bloqueig de pantalla"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Per motius de seguretat, cal que defineixis una contrasenya"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Defineix una contrasenya"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Tria el teu patró"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Defineix un patró"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Selecciona un PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Per motius de seguretat, cal que defineixis un PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Defineix un PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirma la teva contrasenya"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Torna a introduir la contrasenya"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirma el patró"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirma el teu PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Torna a introduir el PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Les contrasenyes no coincideixen"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Els codis PIN no coincideixen"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Mètode de desbloqueig"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Utilitza el patró de la feina per continuar"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Introdueix el PIN de la feina per continuar"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Introdueix la contrasenya de la feina per continuar"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Utilitza el patró del dispositiu per continuar. Aquest pas és necessari després del reinici."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Introdueix el PIN del dispositiu per continuar. Aquest pas és necessari després del reinici."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Introdueix la contrasenya del dispositiu per continuar. Aquest pas és necessari després del reinici."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Utilitza el patró de la feina per continuar. Aquest pas és necessari després del reinici."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Introdueix el PIN de la feina per continuar. Aquest pas és necessari després del reinici."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Introdueix la contrasenya de la feina per continuar. Aquest pas és necessari després del reinici."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Per a més seguretat, utilitza el patró del dispositiu"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Per a més seguretat, introdueix el PIN del dispositiu"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Per a més seguretat, introdueix la contrasenya del dispositiu"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Per a més seguretat, utilitza el patró de la feina"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Per a més seguretat, introdueix el PIN de la feina"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Per a més seguretat, introdueix la contrasenya de la feina"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"S\'ha restablert el telèfon a les dades de fàbrica. Per utilitzar-lo, dibuixa el patró antic."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"S\'ha restablert el telèfon a les dades de fàbrica. Per utilitzar-lo, escriu el PIN antic."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"S\'ha restablert el telèfon a les dades de fàbrica. Per utilitzar-lo, escriu la contrasenya antiga."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verifica el patró"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verifica el PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verifica la contrasenya"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN incorrecte"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Contrasenya incorrecta"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Patró incorrecte"</string>
@@ -1531,7 +1544,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"El mateix bloqueig de pantalla que el del dispositiu"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gestiona les aplicacions"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gestiona i elimina les aplicacions instal·lades"</string>
-    <string name="applications_settings" msgid="5281808652705396152">"Informació d\'aplicacions"</string>
+    <string name="applications_settings" msgid="5281808652705396152">"Informació de les aplicacions"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Gestiona les aplicacions i configura les dreceres d\'inici ràpid"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Configuració de l\'aplicació"</string>
     <string name="install_applications" msgid="4872012136210802181">"Fonts desconegudes"</string>
@@ -1543,7 +1556,7 @@
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"El telèfon i les dades personals són més vulnerables a atacs d\'aplicacions desconegudes. En instal·lar aplicacions d\'aquesta font, acceptes que ets responsable de qualsevol dany al telèfon i qualsevol pèrdua de dades que es pugui produir per l\'ús d\'aquestes aplicacions."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Configuració avançada"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Activa més opcions de configuració"</string>
-    <string name="application_info_label" msgid="5736524913065714880">"Informació de l\'aplicació"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"Informació de les aplicacions"</string>
     <string name="storage_label" msgid="8700867073480107253">"Emmagatzematge"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"Obrir de manera determinada"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"Valors predeterminats"</string>
@@ -1634,7 +1647,7 @@
     <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Mou a la tauleta"</string>
     <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Desplaça al telèfon"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Mou a emmagatzematge USB"</string>
-    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Desplaça a la targeta SD"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Mou a la targeta SD"</string>
     <string name="moving" msgid="6431016143218876491">"S\'està desplaçant"</string>
     <string name="another_migration_already_in_progress" msgid="7817354268848365487">"Ja hi ha una migració en curs."</string>
     <string name="insufficient_storage" msgid="481763122991093080">"No hi ha prou espai d\'emmagatzematge."</string>
@@ -1736,7 +1749,7 @@
     <string name="keyboard_assistance_category" msgid="5843634175231134014">"Assistència per al teclat"</string>
     <string name="physical_keyboard_title" msgid="8285149877925752042">"Teclat físic"</string>
     <string name="show_ime" msgid="2658582193437188227">"Mostra el teclat virtual"</string>
-    <string name="show_ime_summary" msgid="8164993045923240698">"Mantén-lo a la pantalla mentre el teclat físic està actiu"</string>
+    <string name="show_ime_summary" msgid="8164993045923240698">"Mantén-lo en pantalla mentre el teclat físic està actiu"</string>
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Ajuda per a les tecles de drecera"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Mostra les dreceres disponibles"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Predeterminat"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vols crear el widget i permetre l\'accés?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Després de crear el widget, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> podrà accedir a totes les dades que mostri."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Permet sempre que <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> creï widgets i que accedeixi a les seves dades"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> m <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> m <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> m"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Estadístiques d\'ús"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Estadístiques d\'ús"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Ordena per:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Lectors de pantalla, pantalla, controls d\'interacció"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Configuració de visió"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Pots personalitzar el dispositiu perquè s\'adapti a les teves necessitats. Aquestes funcions d\'accessibilitat es poden canviar més endavant des de Configuració."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Augmenta la mida de la lletra"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Canvia la mida de la lletra"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Lectors de pantalla"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Àudio i text en pantalla"</string>
     <string name="display_category_title" msgid="685461049938269166">"Pantalla"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Per ampliar la imatge"</b>", fes tres tocs ràpids a la pantalla.\n"<ul><li>"Arrossega dos dits o més per desplaçar-la"</li>\n<li>"Pinça la pantalla unint dos dits o més per ajustar el zoom"</li></ul>\n\n<b>"Per fer zoom de manera temporal"</b>", fes tres tocs ràpids a la pantalla i mantén-la premuda al tercer toc.\n"<ul><li>"Arrossega el dit per desplaçar-te per la pantalla"</li>\n<li>"Aixeca\'l per allunyar la imatge"</li></ul>\n\n"No pots fer zoom al teclat ni a la barra de navegació."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Quan la funció d\'ampliació està activada, utilitza el botó Accessibilitat que hi ha a la part inferior de la pantalla per ampliar-la ràpidament.\n\n"<b>"Per ampliar la imatge"</b>", toca el botó Accessibilitat i, a continuació, toca qualsevol punt de la pantalla.\n"<ul><li>"Arrossega dos dits o més per desplaçar-te"</li>\n<li>"Pinça unint dos dits o més dits per ajustar el zoom"</li></ul>\n\n<b>"Per ampliar la imatge temporalment"</b>", toca el botó Accessibilitat i, a continuació, toca i mantén premut qualsevol punt de la pantalla.\n"<ul><li>"Arrossega el dit per desplaçar-te per la pantalla"</li>\n<li>"Aixeca\'l per allunyar la imatge"</li></ul>\n\n"No pots fer zoom al teclat ni a la barra de navegació."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"El botó Accessibilitat està configurat per a <xliff:g id="SERVICE">%1$s</xliff:g>. Per utilitzar la funció d\'ampliació, toca i mantén premut el botó Accessibilitat i, a continuació, selecciona l\'ampliació."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Drecera d\'accessibilitat"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Drecera amb les tecles de volum"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Servei associat a la drecera"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Permet a la pantalla de bloqueig"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Quan la drecera està activada, pots prémer els dos botons de volum durant 3 segons per iniciar una funció d\'accessibilitat."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Quan la drecera està activada, pots prémer les dues tecles de volum durant 3 segons per iniciar una funció d\'accessibilitat."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Text d\'alt contrast"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Actualitza ampliació automàticament"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Actualitza augment pantalla a transicions aplic."</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Pot afectar el rendiment"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clic quan el punter deixi de moure\'s"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Retard abans del clic"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ACTIVAT"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESACTIVADA"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Mostra a configuració ràpida"</string>
@@ -1956,7 +1961,7 @@
     <string name="printer_info_desc" msgid="5824995108703060003">"Més informació sobre aquesta impressora"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Elements que han utilitzat la bateria"</string>
-    <string name="power_usage_not_available" msgid="3109326074656512387">"Dades d\'ús de la bateria no disponibles"</string>
+    <string name="power_usage_not_available" msgid="3109326074656512387">"Dades de consum de la bateria no disponibles"</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"Temps restant: <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> per completar la càrrega"</string>
@@ -1965,16 +1970,16 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"L\'aplicació es pot executar en segon pla quan no s\'utilitza"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"L\'activitat en segon pla de l\'aplicació està limitada quan no s\'utilitza"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"L\'aplicació no es pot executar en segon pla"</string>
-    <string name="device_screen_usage" msgid="3386088035570409683">"Ús de la pantalla des de l\'última càrrega completa"</string>
+    <string name="device_screen_usage" msgid="3386088035570409683">"Consum de la pantalla des de l\'última càrrega completa"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consum de la pantalla"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Cerca de xarxes mòbils"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"Fa <xliff:g id="TIME">^1</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Ús d\'aplicacions des de l\'última càrrega completa (fa <xliff:g id="TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Ús del dispositiu des de l\'última càrrega completa (fa <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Consum de les aplicacions des de l\'última càrrega completa (fa <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Consum del dispositiu des de l\'última càrrega completa (fa <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Temps que la pantalla ha estat activa des de l\'última càrrega completa"</string>
-    <string name="device_usage_list_summary" msgid="5623036661468763251">"Ús del dispositiu des de l\'última càrrega completa"</string>
-    <string name="battery_since_unplugged" msgid="338073389740738437">"Ús de la bateria des que s\'ha desconnectat"</string>
-    <string name="battery_since_reset" msgid="7464546661121187045">"Ús de la bateria des que s\'ha restablert"</string>
+    <string name="device_usage_list_summary" msgid="5623036661468763251">"Consum del dispositiu des de l\'última càrrega completa"</string>
+    <string name="battery_since_unplugged" msgid="338073389740738437">"Consum de la bateria des que s\'ha desconnectat"</string>
+    <string name="battery_since_reset" msgid="7464546661121187045">"Consum de la bateria des que s\'ha restablert"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> utilitzant bateria"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> des de la desconnexió"</string>
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"S\'està carregant"</string>
@@ -1992,9 +1997,9 @@
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi a temps"</string>
     <string name="advanced_battery_title" msgid="2068039111517508622">"Ús avançat de la bateria"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Detalls de l\'historial"</string>
-    <string name="battery_details_title" msgid="6101394441569858580">"Ús de la bateria"</string>
+    <string name="battery_details_title" msgid="6101394441569858580">"Consum de la bateria"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Detalls d\'ús"</string>
-    <string name="controls_subtitle" msgid="390468421138288702">"Redueix l\'ús de la bateria"</string>
+    <string name="controls_subtitle" msgid="390468421138288702">"Redueix el consum de la bateria"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Paquets inclosos"</string>
     <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplicacions que consumeixen molta bateria"</string>
     <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"El dispositiu es manté actiu"</string>
@@ -2002,22 +2007,22 @@
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Se sol·licita la ubicació massa sovint"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplicacions no funcionen correctament"</string>
     <string name="dialog_stop_title" msgid="6395127715596746479">"Vols aturar l\'aplicació?"</string>
-    <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"El telèfon no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> el manté actiu.\n\nPer solucionar el problema, pots aturar l\'aplicació.\n\nSi el problema persisteix, pot ser que hagis de desinstal·lar l\'aplicació per millorar el rendiment de la bateria."</string>
-    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"La tauleta no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> la manté activa.\n\nPer solucionar el problema, pots aturar l\'aplicació.\n\nSi el problema persisteix, pot ser que hagis de desinstal·lar l\'aplicació per millorar el rendiment de la bateria."</string>
-    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"El dispositiu no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> el manté actiu.\n\nPer solucionar el problema, pots aturar l\'aplicació.\n\nSi el problema persisteix, pot ser que hagis de desinstal·lar l\'aplicació per millorar el rendiment de la bateria."</string>
-    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"El telèfon no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> l\'activa contínuament.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSi el problema persisteix, pot ser que hagis de desinstal·lar l\'aplicació per millorar el rendiment de la bateria."</string>
-    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"La tauleta no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> l\'activa contínuament.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSi el problema persisteix, pot ser que hagis de desinstal·lar l\'aplicació per millorar el rendiment de la bateria."</string>
-    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"El dispositiu no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> l\'activa contínuament.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSi el problema persisteix, pot ser que hagis de desinstal·lar l\'aplicació per millorar el rendiment de la bateria."</string>
+    <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"El telèfon no pot gestionar el consum de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> el manté actiu.\n\nPer solucionar el problema, pots aturar l\'aplicació.\n\nSi el problema persisteix, pot ser que hagis de desinstal·lar l\'aplicació per millorar el rendiment de la bateria."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"La tauleta no pot gestionar el consum de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> la manté activa.\n\nPer solucionar el problema, pots aturar l\'aplicació.\n\nSi el problema persisteix, pot ser que hagis de desinstal·lar l\'aplicació per millorar el rendiment de la bateria."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"El dispositiu no pot gestionar el consum de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> el manté actiu.\n\nPer solucionar el problema, pots aturar l\'aplicació.\n\nSi el problema persisteix, pot ser que hagis de desinstal·lar l\'aplicació per millorar el rendiment de la bateria."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"El telèfon no pot gestionar el consum de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> l\'activa contínuament.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSi el problema persisteix, pot ser que hagis de desinstal·lar l\'aplicació per millorar el rendiment de la bateria."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"La tauleta no pot gestionar el consum de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> l\'activa contínuament.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSi el problema persisteix, pot ser que hagis de desinstal·lar l\'aplicació per millorar el rendiment de la bateria."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"El dispositiu no pot gestionar el consum de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> l\'activa contínuament.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSi el problema persisteix, pot ser que hagis de desinstal·lar l\'aplicació per millorar el rendiment de la bateria."</string>
     <string name="dialog_stop_ok" msgid="2319777211264004900">"Atura l\'aplicació"</string>
     <string name="dialog_background_check_title" msgid="6936542136153283692">"Vols desactivar l\'ús en segon pla i aturar l\'aplicació?"</string>
-    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"El telèfon no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> l\'activa contínuament.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g> per evitar que s\'executi en segon pla."</string>
-    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"La tauleta no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> l\'activa contínuament.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g> per evitar que s\'executi en segon pla."</string>
-    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"El dispositiu no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> l\'activa contínuament.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g> per evitar que s\'executi en segon pla."</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"El telèfon no pot gestionar el consum de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> l\'activa contínuament.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g> per evitar que s\'executi en segon pla."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"La tauleta no pot gestionar el consum de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> l\'activa contínuament.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g> per evitar que s\'executi en segon pla."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"El dispositiu no pot gestionar el consum de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> l\'activa contínuament.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g> per evitar que s\'executi en segon pla."</string>
     <string name="dialog_background_check_ok" msgid="412876934682899659">"Desactiva"</string>
     <string name="dialog_location_title" msgid="5888917530725874727">"Vols desactivar la ubicació?"</string>
-    <string name="dialog_location_message" product="default" msgid="7774807745601479888">"El telèfon no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> continua sol·licitant la teva ubicació quan no fas servir l\'aplicació.\n\nPer solucionar el problema, pots desactivar la ubicació per a aquesta aplicació."</string>
-    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"La tauleta no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> continua sol·licitant la teva ubicació quan no fas servir l\'aplicació.\n\nPer solucionar el problema, pots desactivar la ubicació per a aquesta aplicació."</string>
-    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"El dispositiu no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> continua sol·licitant la teva ubicació quan no fas servir l\'aplicació.\n\nPer solucionar el problema, pots desactivar la ubicació per a aquesta aplicació."</string>
+    <string name="dialog_location_message" product="default" msgid="7774807745601479888">"El telèfon no pot gestionar el consum de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> continua sol·licitant la teva ubicació quan no fas servir l\'aplicació.\n\nPer solucionar el problema, pots desactivar la ubicació per a aquesta aplicació."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"La tauleta no pot gestionar el consum de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> continua sol·licitant la teva ubicació quan no fas servir l\'aplicació.\n\nPer solucionar el problema, pots desactivar la ubicació per a aquesta aplicació."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"El dispositiu no pot gestionar el consum de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> continua sol·licitant la teva ubicació quan no fas servir l\'aplicació.\n\nPer solucionar el problema, pots desactivar la ubicació per a aquesta aplicació."</string>
     <string name="dialog_location_ok" msgid="4572391197601313986">"Desactiva"</string>
     <string name="power_screen" msgid="3023346080675904613">"Pantalla"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Llanterna"</string>
@@ -2060,7 +2065,7 @@
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Configuració de l\'aplicació"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Configuració de la pantalla"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"Configuració de Wi-Fi"</string>
-    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Configuració de Bluetooth"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Configuració del Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Bateria utilitzada per les trucades de veu"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Bateria utilitzada quan la tauleta estigui inactiva"</string>
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Bateria utilitzada quan el telèfon està inactiu"</string>
@@ -2078,26 +2083,26 @@
     <string name="battery_desc_apps" msgid="8530418792605735226">"Bateria utilitzada per l\'aplicació"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Atura o desinstal·la l\'aplicació"</string>
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Selecciona el mode d\'estalvi de bateria"</string>
-    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"L\'aplicació pot oferir paràmetres per reduir l\'ús de la bateria"</string>
+    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"L\'aplicació pot oferir paràmetres per reduir el consum de la bateria"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Bateria utilitzada per l\'usuari"</string>
     <string name="battery_desc_unaccounted" msgid="7404256448541818019">"Ús variat de l\'energia"</string>
-    <string name="battery_msg_unaccounted" msgid="1963583522633067961">"L\'ús de la bateria és l\'ús d\'energia aproximat i no inclou totes les fonts de descàrrega de la bateria. L\'ús variat és la diferència entre l\'ús d\'energia calculat i la descàrrega real que es detecta a la bateria."</string>
+    <string name="battery_msg_unaccounted" msgid="1963583522633067961">"El consum de la bateria és l\'ús d\'energia aproximat i no inclou totes les fonts de descàrrega de la bateria. Altres és la diferència entre el consum d\'energia calculat i la descàrrega real que es detecta a la bateria."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consum d\'energia comptabilitzat més d\'una vegada"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"En ús durant <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_active_for" msgid="2964359540508103032">"Activa durant <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Ús de la pantalla: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilitzat per <xliff:g id="APP">%2$s</xliff:g>"</string>
-    <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> d\'ús de la bateria"</string>
+    <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> de consum de la bateria"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Desglossament des de l\'última càrrega completa"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Última càrrega completa"</string>
-    <string name="battery_footer_summary" msgid="67169726550144016">"Les dades d\'ús de la bateria són aproximades i poden variar en funció de l\'ús del dispositiu"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Les dades de consum de la bateria són aproximades i poden variar en funció de l\'ús del dispositiu"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Durant l\'ús actiu"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"En segon pla"</string>
-    <string name="battery_detail_power_usage" msgid="6485766868610469101">"Ús de la bateria"</string>
+    <string name="battery_detail_power_usage" msgid="6485766868610469101">"Consum de la bateria"</string>
     <string name="battery_detail_power_percentage" msgid="8064814503316094497">"<xliff:g id="PERCENT">%1$s</xliff:g> de l\'ús total de les aplicacions (<xliff:g id="POWER">%2$d</xliff:g> mAh)"</string>
     <string name="battery_detail_info_title" msgid="8227822131405620369">"Des de l\'última càrrega completa"</string>
-    <string name="battery_detail_manage_title" msgid="9094314252105828014">"Gestiona l\'ús de la bateria"</string>
+    <string name="battery_detail_manage_title" msgid="9094314252105828014">"Gestiona el consum de la bateria"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Temps estimat restant"</string>
     <string name="estimated_charging_time_left" msgid="5614442409326164691">"Fins a completar la càrrega"</string>
     <string name="estimated_time_description" msgid="8760210909000037089">"El temps estimat pot variar en funció de l\'ús"</string>
@@ -2178,7 +2183,7 @@
     <string name="tts_play" msgid="2628469503798633884">"Reprodueix"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Control d\'energia"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"S\'està actualitzant la configuració Wi-Fi"</string>
-    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"S\'està actualitzant la configuració de Bluetooth"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"S\'està actualitzant la configuració del Bluetooth"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"activat"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"desactivat"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"s\'han seleccionat <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Selecciona-ho tot"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Gestiona els plans"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Ús de dades"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Ús de dades de l\'aplicació"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"El recompte de dades de l\'operador de telefonia mòbil pot ser diferent del calculat pel dispositiu."</string>
@@ -2436,13 +2442,16 @@
     <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Aplicacions i usuaris eliminats"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> rebuts, <xliff:g id="SENT">%2$s</xliff:g> enviats"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: ús aproximat de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
-    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: ús aproximat de <xliff:g id="TOTAL">%1$s</xliff:g>, segons mesura la tauleta. És possible que l\'operador faci un recompte diferent de la utilització."</string>
-    <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: ús aproximat de <xliff:g id="TOTAL">%1$s</xliff:g>, segons el telèfon. És possible que l\'operador faci un càlcul diferent de l\'ús de les dades."</string>
+    <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>, ús aproximat segons la tauleta. L\'operador pot fer un càlcul diferent."</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>, ús aproximat segons el telèfon. L\'operador pot fer un càlcul diferent."</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"Restriccions de xarxa"</string>
     <string name="data_usage_metered_body" msgid="7655851702771342507">"Quan les dades en segon pla es restringeixen, les xarxes amb límit de dades es tracten igual que les xarxes mòbils. Pot ser que les aplicacions mostrin un advertiment abans d\'utilitzar aquestes xarxes per baixar fitxers grans."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Xarxes mòbils"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Xarxes Wi‑Fi amb límit de dades"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Per seleccionar xarxes amb límit de dades, activa la Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automàtic"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Amb límit de dades"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Sense límit de dades"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"El recompte de dades de l\'operador de telefonia mòbil pot ser diferent del calculat pel dispositiu."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Trucada d\'emergència"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Torna a la trucada"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Gestor de trucades"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Missatges d\'emergència"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Alertes d\'emergència"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Operadors de xarxa"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Noms dels punts d\'accés"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Mode LTE 4G millorat"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"SIM preferida per a"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Pregunta sempre"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Has de seleccionar una preferència."</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Selecció de SIM"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Configuració"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">Mostra %d elements amagats</item>
@@ -2762,7 +2772,7 @@
     <string name="keywords_display_font_size" msgid="3404655440064726124">"mida del text"</string>
     <string name="keywords_display_cast_screen" msgid="7684618996741933067">"projecte, emissió"</string>
     <string name="keywords_storage" msgid="3299217909546089225">"espai, disc, unitat de disc dur, ús del dispositiu"</string>
-    <string name="keywords_battery" msgid="1173830745699768388">"ús de la bateria, càrrega"</string>
+    <string name="keywords_battery" msgid="1173830745699768388">"consum de la bateria, càrrega"</string>
     <string name="keywords_spell_checker" msgid="1399641226370605729">"ortografia, diccionari, corrector ortogràfic, correcció automàtica"</string>
     <string name="keywords_voice_input" msgid="769778245192531102">"reconeixedor, entrada, veu, parlar, idioma, mans lliures, reconeixement, ofensiu, paraula, àudio, historial, auriculars bluetooth"</string>
     <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"velocitat, idioma, predeterminat, parla, parlar, síntesi de veu, accessibilitat, lector de pantalla, invident"</string>
@@ -2837,7 +2847,7 @@
       <item quantity="one">1 regla automàtica activada</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="842308776768942600">"Preferències per a No molestis"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritat només permet"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Només amb prioritat permet"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Regles automàtiques"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Defineix regles de No molestis"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limita sons i vibracions en hores concretes"</string>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificacions d\'aplicacions"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoria de les notificacions"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importància"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Deixa que ho decideixi l\'aplicació"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Permet el so"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"No mostris mai notificacions"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Sense so ni interrupcions visuals"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Sense so"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Amb so"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Amb so i amb una finestra emergent"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Finestra emergent"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Baixa"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Mitjana"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Alta"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgent"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Permet el so"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"No reprodueix cap so, no vibra ni mostra aquestes notificacions a la pantalla actual."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Permet interrupcions"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Permet que l\'aplicació emeti un so, vibri o mostri notificacions emergents a la pantalla"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Poc important"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Mitjanament important"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Molt important"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip imatge en"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Pantalla en pantalla"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Permet el mode de pantalla en pantalla"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Permet que aquesta aplicació creï una finestra de pantalla en pantalla mentre l\'aplicació està oberta o després de sortir-ne (per exemple, per seguir veient un vídeo). Aquesta finestra es mostra sobre altres aplicacions que estàs utilitzant."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Permet que aquesta aplicació creï una finestra de pantalla en pantalla mentre l\'aplicació està oberta o després de sortir-ne (per exemple, per seguir veient un vídeo). Aquesta finestra es mostra sobre altres aplicacions que estàs utilitzant."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Accés a No molestis"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Cap aplicació instal·lada no ha sol·licitat accés a No molestis."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"S\'estan carregant les aplicacions..."</string>
@@ -2949,7 +2960,7 @@
     <string name="notification_content_block_summary" msgid="7746185794438882389">"No mostris mai notificacions a l\'àrea de notificacions ni en dispositius perifèrics"</string>
     <string name="notification_badge_title" msgid="6370122441168519809">"Permet el punt de notificació"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"Mostra el punt de notificació"</string>
-    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Fes prioritària"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignora el mode No Molestis"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permet que aquestes notificacions continuïn interrompent quan el mode No molestis estigui configurat com a Només amb prioritat"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"A la pantalla de bloqueig"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloquejat"</string>
@@ -3190,14 +3201,14 @@
     </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Sense optimitzar"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Sense optimitzar"</string>
-    <string name="high_power_off" msgid="3393904131961263278">"Optimitza l\'ús de la bateria"</string>
+    <string name="high_power_off" msgid="3393904131961263278">"Optimitza el consum de la bateria"</string>
     <string name="high_power_system" msgid="7362862974428225301">"L\'optimització de la bateria no està disponible"</string>
     <string name="high_power_desc" msgid="6283926163708585760">"No s\'aplica l\'optimització de la bateria. És possible que es consumeixi més ràpidament."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"Vols permetre que l\'aplicació s\'executi sempre en segon pla?"</string>
     <string name="high_power_prompt_body" msgid="1031422980602565049">"Si permets que <xliff:g id="APP_NAME">%1$s</xliff:g> s\'executi sempre en segon pla, és possible que disminueixi la durada de la bateria. \n\nPots canviar-ho més tard a Configuració &gt; Aplicacions i notificacions."</string>
     <string name="battery_summary" msgid="8044042095190688654">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> utilitzats des de l\'última càrrega completa"</string>
     <string name="battery_power_management" msgid="5571519699679107523">"Gestió de l\'energia"</string>
-    <string name="no_battery_summary" msgid="3528036835462846814">"Cap ús de la bateria des de l\'última càrrega completa"</string>
+    <string name="no_battery_summary" msgid="3528036835462846814">"No s\'ha consumit bateria des de l\'última càrrega completa"</string>
     <string name="app_notification_preferences" msgid="1599319335092722613">"Configuració de l\'aplicació"</string>
     <string name="system_ui_settings" msgid="579824306467081123">"Mostra SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Permisos addicionals"</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transfereix fitxers"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transfereix fotos (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Utilitza el dispositiu com a MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Projecció de missatges SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Comprovació en segon pla"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Accés complet en segon pla"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Ús del text de la pantalla"</string>
@@ -3301,7 +3313,7 @@
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Botó d\'engegada dos cops per obrir càmera"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Obre ràpidament la càmera sense haver de desbloquejar la pantalla"</string>
     <string name="screen_zoom_title" msgid="5233515303733473927">"Mida de la pantalla"</string>
-    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Amplia o redueix la mida dels elements de la pantalla"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Amplia o redueix la mida dels elements en pantalla"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"densitat de pantalla, zoom de pantalla, escala, mida"</string>
     <string name="screen_zoom_summary" msgid="6445488991799015407">"Amplia o redueix la mida dels elements de la pantalla. És possible que algunes aplicacions de la pantalla canviïn de posició."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Previsualització"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Configura el programa de Llum nocturna"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Pantalla groga per ajudar-te a agafar el son"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Opció Llum nocturna activada"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"La pantalla té un to groguenc; això t\'ajudarà a adormir-te."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Suggeriments"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilitza colors de pantalla més freds"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Desactiva la pantalla per aplicar el canvi de color"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Per aplicar canvis al monitor de telefonia, reinicia el dispositiu"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HDR+ a HAL de la càmera"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Per aplicar els canvis de HDR+ de HAL de la càmera, reinicia el dispositiu"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor del làser de la càmera"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Actualitzacions del sistema automàtiques"</string>
     <string name="usage" msgid="2977875522080448986">"Ús"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Ús de dades mòbils"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Advertiment de dades"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Defineix un límit de dades"</string>
     <string name="data_limit" msgid="1885406964934590552">"Límit de dades"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> utilitzats durant el període <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"Utilitzats: <xliff:g id="ID_1">%1$s</xliff:g> (<xliff:g id="ID_2">%2$s</xliff:g>)"</string>
     <string name="configure" msgid="1029654422228677273">"Configura"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Altres aplicacions que utilitzen dades"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Esborra i converteix"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Restableix la limitació de velocitat de ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"S\'ha restablert la limitació de velocitat de ShortcutManager"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Controla notificacions de pantalla bloq."</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Controla la informació de la pantalla de bloqueig"</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="8483187649355540109">"Ajuda i consells"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Cap aplicació instal·lada no ha sol·licitat accés a SMS prèmium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Els SMS prèmium et poden costar diners, i aquest import s\'afegirà a la facturació de l\'operador de telefonia mòbil. Si actives el permís en una aplicació, podràs enviar SMS prèmium utilitzant-la."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Accés a SMS prèmium"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"No visible per a altres dispositius"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Desactivat"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connectat a <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connectat a diversos dispositius"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Mode de demostració de la IU del sistema"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Aplicacions instantànies"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Obre enllaços en aplicacions, encara que no estiguin instal·lades"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Aplicacions instantànies"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Compte per a les aplicacions instantànies"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Preferències d\'Aplicacions instantànies"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplicacions instal·lades"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Ara mateix, el gestor d\'emmagatzematge gestiona el teu emmagatzematge"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Comptes de l\'usuari <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"S\'ha activat l\'opció VPN sempre activada al teu perfil personal"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"S\'ha activat l\'opció VPN sempre activada al teu perfil professional"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"S\'ha definit el servidor intermediari HTTP global"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Certificats de confiança"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Certificats de confiança"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Certificats de confiança al teu perfil personal"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Certificats de confiança al teu perfil professional"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> certificats de CA com a mínim</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> certificat de CA com a mínim</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informació de serveis de l\'operador de telefonia mòbil"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Activa els serveis de l\'operador de telefonia mòbil"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Quines són les novetats més importants?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Dona un cop d\'ull a les 5 funcions principals"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Dona una ullada al teu telèfon nou"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Dona una ullada a la teva tauleta nova"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Dona una ullada al teu dispositiu nou"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Aquesta funció no està disponible en aquest dispositiu"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Estat del registre d\'IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrat"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Sense registrar"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index e2376d2..ad87b45 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -168,7 +168,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Zařízení %1$s žádá o přístup k vašim zprávám. Povolit přístup zařízení %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Žádost o přístup k SIM kartě"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Zařízení <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> žádá o přístup k SIM kartě. Po dobu přístupu zařízení k SIM kartě bude datové připojení ve vašem zařízení vypnuto. Chcete zařízení <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> povolit přístup?"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Viditelné pro ostatní zařízení jako „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Viditelné pro ostatní zařízení jako „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaše zařízení"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Spárovat nové zařízení"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum a čas"</string>
@@ -378,6 +378,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Další"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Přeskočit zadání otisku prstu?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Nastavení otisku prstu trvá jen minutu nebo dvě. Pokud tento krok přeskočíte, můžete otisk prstu přidat později v nastavení."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Přeskočit zámek obrazovky?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Nebudou zapnuty funkce ochrany zařízení. V případě ztráty, odcizení nebo resetování tabletu nebudete moci ostatním zabránit v jeho používání."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Nebudou zapnuty funkce ochrany zařízení. V případě ztráty, odcizení nebo resetování zařízení nebudete moci ostatním zabránit v jeho používání."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Nebudou zapnuty funkce ochrany zařízení. V případě ztráty, odcizení nebo resetování telefonu nebudete moci ostatním zabránit v jeho používání."</string>
@@ -417,6 +420,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Přidali jste maximální počet otisků prstů"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Další otisky prstů nelze přidat"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Odstranit všechny otisky prstů?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Odstranit <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Chcete tento otisk prstu smazat?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Otisky prstů již nebude možné používat k odemykání telefonu, autorizaci nákupů ani přihlašování do aplikací."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Otisky prstů již nebude možné používat k odemknutí pracovního profilu, autorizaci nákupů ani přihlašování do pracovních aplikací."</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Ano, odstranit"</string>
@@ -461,7 +466,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Ochraňte svůj tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Ochraňte své zařízení"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Chraňte svůj telefon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Pro ještě lepší zabezpečení nastavte záložní zámek obrazovky."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Pro ještě lepší zabezpečení nastavte záložní zámek obrazovky."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Aktivujte funkce ochrany zařízení a zabraňte tak ostatním v používání tabletu bez vašeho svolení. Vyberte zámek obrazovky, který chcete používat."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Aktivujte funkce ochrany zařízení a zabraňte tak ostatním v jeho používání bez vašeho svolení. Vyberte zámek obrazovky, který chcete používat."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Aktivujte funkce ochrany zařízení a zabraňte tak ostatním v používání telefonu bez vašeho svolení. Vyberte zámek obrazovky, který chcete používat."</string>
@@ -503,37 +508,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Odstranit ochranu zařízení?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Odstranit ochranu profilu?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Bez bezpečnostního gesta nebudou funkce ochrany zařízení fungovat."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Bez bezpečnostního gesta nebudou funkce ochrany zařízení fungovat.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Bez gesta nebudou funkce ochrany zařízení fungovat.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Ze zařízení budou odstraněny i uložené otisky prstů, a tak nebudete moci telefon odemknout, potvrzovat nákupy ani se přihlašovat do aplikací."</string>
+</xliff:g>Ze zařízení budou odstraněny i uložené otisky prstů, a tak nebudete moci odemykat telefon, potvrzovat nákupy ani se přihlašovat do aplikací."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Bez kódu PIN nebudou funkce ochrany zařízení fungovat."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Bez kódu PIN nebudou funkce ochrany zařízení fungovat.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Bez kódu PIN nebudou funkce ochrany zařízení fungovat.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Ze zařízení budou odstraněny i uložené otisky prstů, a tak nebudete moci telefon odemknout, potvrzovat nákupy ani se přihlašovat do aplikací."</string>
+</xliff:g>Ze zařízení budou odstraněny i uložené otisky prstů, a tak nebudete moci odemykat telefon, potvrzovat nákupy ani se přihlašovat do aplikací."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Bez hesla nebudou funkce ochrany zařízení fungovat."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Bez hesla nebudou funkce ochrany zařízení fungovat.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Bez hesla nebudou funkce ochrany zařízení fungovat.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Ze zařízení budou odstraněny i uložené otisky prstů, a tak nebudete moci telefon odemknout, potvrzovat nákupy ani se přihlašovat do aplikací."</string>
+</xliff:g>Ze zařízení budou odstraněny i uložené otisky prstů, a tak nebudete moci odemykat telefon, potvrzovat nákupy ani se přihlašovat do aplikací."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Bez zámku obrazovky nebudou funkce ochrany zařízení fungovat."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Bez zámku obrazovky nebudou funkce ochrany zařízení fungovat.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Bez zámku obrazovky nebudou funkce ochrany zařízení fungovat.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Ze zařízení budou odstraněny i uložené otisky prstů, a tak nebudete moci telefon odemknout, potvrzovat nákupy ani se přihlašovat do aplikací."</string>
+</xliff:g>Ze zařízení budou odstraněny i uložené otisky prstů, a tak nebudete moci odemykat telefon, potvrzovat nákupy ani se přihlašovat do aplikací."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Bez gesta nebudou funkce ochrany profilu fungovat."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Bez gesta nebudou funkce ochrany profilu fungovat.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Bez gesta nebudou funkce ochrany profilu fungovat.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Uložené otisky prstů budou z tohoto profilu odstraněny a nebudete moci odemykat profil, autorizovat nákupy ani se přihlašovat do aplikací."</string>
+</xliff:g>Z profilu budou odstraněny i uložené otisky prstů, a tak nebudete moci odemykat profil, potvrzovat nákupy ani se přihlašovat do aplikací."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Bez kódu PIN nebudou funkce ochrany profilu fungovat."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Bez kódu PIN nebudou funkce ochrany profilu fungovat.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Bez kódu PIN nebudou funkce ochrany profilu fungovat.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Uložené otisky prstů budou z tohoto profilu odstraněny a nebudete moci odemykat profil, autorizovat nákupy ani se přihlašovat do aplikací."</string>
+</xliff:g>Z profilu budou odstraněny i uložené otisky prstů, a tak nebudete moci odemykat profil, potvrzovat nákupy ani se přihlašovat do aplikací."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Bez hesla nebudou funkce ochrany profilu fungovat."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Bez hesla nebudou funkce ochrany profilu fungovat.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Bez hesla nebudou funkce ochrany profilu fungovat.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Uložené otisky prstů budou z tohoto profilu odstraněny a nebudete moci odemykat profil, autorizovat nákupy ani se přihlašovat do aplikací."</string>
+</xliff:g>Z profilu budou odstraněny i uložené otisky prstů, a tak nebudete moci odemykat profil, potvrzovat nákupy ani se přihlašovat do aplikací."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Bez zámku obrazovky nebudou funkce ochrany profilu fungovat."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Bez zámku obrazovky nebudou funkce ochrany profilu fungovat.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Bez zámku obrazovky nebudou funkce ochrany profilu fungovat.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Uložené otisky prstů budou z tohoto profilu odstraněny a nebudete moci odemykat profil, autorizovat nákupy ani se přihlašovat do aplikací."</string>
+</xliff:g>Z profilu budou odstraněny i uložené otisky prstů, a tak nebudete moci odemykat profil, potvrzovat nákupy ani se přihlašovat do aplikací."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Ano, odstranit"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Změna bezpečnostního gesta"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Změna bezpečnostního kódu PIN"</string>
@@ -604,6 +609,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Posloupnost rostoucích, klesajících nebo opakujících se číslic není povolena"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Zrušit"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Vymazat"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Zrušit"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Další"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Nastavení je dokončeno."</string>
@@ -838,6 +844,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je k dispozici"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je k dispozici)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Zadejte heslo sítě"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Síť Wi-Fi operátora"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Připojit přes: <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> chce zapnout vyhledávání sítí (kvůli lepšímu určení polohy i kvůli jiným účelům) a hledat sítě i v případě, že je vypnut modul Wi-Fi.\n\nChcete tuto možnost povolit všem aplikacím, které chtějí vyhledávat sítě?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Chcete-li toto nastavení vypnout, přejděte do rozbalovací nabídky Rozšířené."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Povolit"</string>
@@ -855,6 +863,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Připojit"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Připojení k síti se nezdařilo."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Odstranit"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Upravit"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Odstranění záznamu sítě se nezdařilo."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Uložit"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Uložení sítě se nezdařilo."</string>
@@ -869,6 +878,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Rozšířené nastavení"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adresa MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP adresa"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Informace o síti"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska podsítě"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Adresy IPv6"</string>
@@ -901,16 +911,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Zrušit pozvánku?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Chcete zrušit pozvánku ke spojení s klientem <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Odstranit tuto skupinu?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Přenosný hotspot Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi hotspot"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Internet ani obsah není sdílen s dalšími zařízeními"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Internetové připojení tohoto tabletu je sdíleno pomocí hotspotu"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Internetové připojení tohoto telefonu je sdíleno pomocí hotspotu"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplikace sdílí obsah. Chcete-li sdílet připojení k internetu, vypněte hotspot a znovu jej zapněte"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Název Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Název hotspotu"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Zapínám hotspot <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Ostatní zařízení se mohou připojit k hostpotu <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Heslo k Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Heslo hotspotu"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Pásmo přístupového bodu"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Pomocí hotspotu můžete vytvořit síť Wi‑Fi pro další zařízení. Hotspot poskytuje připojení k internetu pomocí vašeho mobilního datového připojení. Může to vést k dodatečným poplatkům za mobilní data."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikace mohou vytvořit hotspot ke sdílení obsahu s okolními zařízeními."</string>
@@ -962,7 +971,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Adresa, kterou nouzové služby použijí jako vaši polohu, pokud uskutečníte tísňové volání přes Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Obrazovka"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Hlasitost"</string>
@@ -1016,6 +1025,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Vyhledávání"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Správa nastavení a historie vyhledávání"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Žádné výsledky"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Vymazat historii"</string>
     <string name="display_settings" msgid="7965901687241669598">"Obrazovka"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Autom. otočení obrazovky"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Živé barvy"</string>
@@ -1350,8 +1360,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Obnovování výchozích nastavení přístupového bodu"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Obnovit výchozí"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Výchozí nastavení přístupového bodu bylo obnoveno."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Resetovat"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Obnovení nastavení sítě"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Resetovat možnosti"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Lze resetovat síť, aplikace nebo zařízení"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Resetovat Wi-Fi, data a Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Budou resetována nastavení všech sítí, včetně následujících:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobilní data"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Obnovit nastavení"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Chcete resetovat všechna nastavení sítí? Tuto akci nelze vrátit zpět."</string>
@@ -1359,14 +1370,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Resetovat?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Pro tohoto uživatele resetování sítě není k dispozici"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Nastavení sítí bylo resetováno"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Obnovení továrních dat"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="few"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> účty budou obnoveny</item>
-      <item quantity="many"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> účtu bude obnoveno</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> účtů bude obnoveno</item>
-      <item quantity="one">1 účet bude obnoven</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Interní úložiště a všechna data budou vymazána"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Vymazat data (tovární reset)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" tabletu, mj. i:\n\n"<li>"váš účet Google"</li>\n<li>"nastavení a data systému a aplikací"</li>\n<li>"stažené aplikace"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" telefonu, mj. i:\n\n"<li>"váš účet Google"</li>\n<li>"nastavení a data systému a aplikací"</li>\n<li>"stažené aplikace"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Aktuálně jste přihlášeni k těmto účtům:\n"</string>
@@ -1490,15 +1494,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Bezpečnostní informace"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Datové připojení momentálně není k dispozici. Chcete-li tyto informace zobrazit, přejděte z libovolného počítače připojeného k internetu na stránku %s."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Načítání..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Zvolte heslo"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Nastavení zámku obrazovky"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Z bezpečnostních důvodů nastavte heslo"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Otisk vyžaduje nastavení hesla"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Vyberte gesto"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Otisk vyžaduje nastavení gesta"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Zvolte kód PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Z bezpečnostních důvodů nastavte PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Otisk vyžaduje nastavení PINu"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Potvrďte heslo"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Znovu zadejte heslo"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrďte své gesto"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Potvrďte kód PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Znovu zadejte PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Hesla nejsou shodná"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Kódy PIN nejsou shodné"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Výběr odemknutí"</string>
@@ -1511,12 +1516,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Chcete-li pokračovat, zadejte pracovní gesto."</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Chcete-li pokračovat, zadejte pracovní PIN."</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Chcete-li pokračovat, zadejte pracovní heslo."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Chcete-li pokračovat, zadejte gesto zařízení. Po restartování zařízení je gesto vyžadováno."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Chcete-li pokračovat, zadejte PIN zařízení. Po restartování zařízení je kód PIN vyžadován."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Chcete-li pokračovat, zadejte heslo zařízení. Po restartování zařízení je heslo vyžadováno."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Chcete-li pokračovat, zadejte pracovní gesto. Po restartování zařízení je pracovní gesto vyžadováno."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Chcete-li pokračovat, zadejte pracovní PIN. Po restartování zařízení je pracovní kód PIN vyžadován."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Chcete-li pokračovat, zadejte pracovní heslo. Po restartování zařízení je pracovní heslo vyžadováno."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Za účelem zvýšení zabezpečení použijte gesto zařízení"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Za účelem zvýšení zabezpečení zadejte PIN zařízení"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Za účelem zvýšení zabezpečení zadejte heslo zařízení"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Za účelem zvýšení zabezpečení použijte pracovní gesto"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Za účelem zvýšení zabezpečení zadejte pracovní PIN"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Za účelem zvýšení zabezpečení zadejte pracovní heslo"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Telefon byl obnoven do továrního nastavení. Chcete-li tento telefon použít, zadejte předchozí gesto."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Telefon byl obnoven do továrního nastavení. Chcete-li tento telefon použít, zadejte předchozí PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Telefon byl obnoven do továrního nastavení. Chcete-li tento telefon použít, zadejte předchozí heslo."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Ověřte gesto"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Ověřte PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Ověřte heslo"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Nesprávný kód PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Nesprávné heslo"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Nesprávné gesto"</string>
@@ -1821,13 +1832,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vytvořit widget a povolit přístup?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Po vytvoření widgetu bude moci aplikace <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> získat přístup ke všem datům, které widget zobrazuje."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Vždy povolit aplikaci <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> vytváření widgetů a přístup k jejich datům"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> min <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> m"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Statistika použití"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Statistika použití"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Řadit podle:"</string>
@@ -1839,7 +1843,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Čtečky obrazovky, zobrazení, ovládací prvky interakce"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Nastavení pro slabozraké"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Toto zařízení můžete přizpůsobit svým potřebám. Funkce přístupnosti lze později změnit v Nastavení."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Zvětšete písmo"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Změňte velikost písma"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Čtečky obrazovky"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Zvuk a text na obrazovce"</string>
     <string name="display_category_title" msgid="685461049938269166">"Zobrazení"</string>
@@ -1860,10 +1864,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Přiblížení"</b>" provedete tak, že třikrát klepnete na obrazovku.\n"<ul><li>"Přetažením dvěma prsty zobrazení posunete."</li>\n<li>"Úroveň přiblížení upravíte stažením nebo roztažením dvou nebo více prstů."</li></ul>\n\n"Chcete-li zobrazení "<b>"přiblížit dočasně"</b>", rychle na obrazovku klepněte třikrát za sebou a při posledním klepnutí prst přidržte.\n"<ul><li>"Přetažením se můžete pohybovat po obrazovce."</li>\n<li>"Zvednutím prstu zobrazení vrátíte do původního stavu."</li></ul>\n\n"Na klávesnici a navigačním panelu přiblížení není k dispozici."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Když je zapnuto zvětšení, lze pomocí tlačítka Přístupnost v dolní části obrazovky rychle zvětšit zobrazení.\n\n"<b>"Přiblížení"</b>" provedete tak, že klepnete na tlačítko Přístupnost a poté na libovolné místo na obrazovce.\n"<ul><li>"Přetažením dvěma prsty zobrazení posunete."</li>\n<li>"Úroveň přiblížení upravíte stažením nebo roztažením dvou nebo více prstů."</li></ul>\n\n"Chcete-li zobrazení "<b>"přiblížit dočasně"</b>", klepněte na tlačítko Přístupnost a poté klepněte na libovolné místo na obrazovce a podržte ho.\n"<ul><li>"Přetažením se můžete pohybovat po obrazovce."</li>\n<li>"Zvednutím prstu zobrazení vrátíte do původního stavu."</li></ul>\n\n"Na klávesnici a navigačním panelu přiblížení není k dispozici."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Tlačítko Přístupnost je nastaveno na službu <xliff:g id="SERVICE">%1$s</xliff:g>. Chcete-li použít zvětšení, klepněte na tlačítko Přístupnost, podržte jej a vyberte zvětšení."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Zkratka přístupnosti"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Zkratka tlačítka hlasitosti"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Služba ovládaná zkratkou"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Povolit na obrazovce uzamčení"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Když je tato zkratka zapnutá, můžete funkci přístupnosti spustit tím, že na tři sekundy podržíte obě tlačítka hlasitosti."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Když je tato zkratka zapnutá, můžete funkci přístupnosti spustit tím, že na tři sekundy podržíte obě tlačítka hlasitosti."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Text s vysokým kontrastem"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Automaticky aktualizovat přiblížení"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Aktual. přiblížení obrazovky při přepnutí aplikací"</string>
@@ -1876,7 +1880,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Toto nastavení může mít dopad na výkon"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Kliknutí po zastavení kurzoru"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Prodleva před kliknutím"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ZAPNUTO"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"VYPNUTO"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Zobrazit v rychlém nastavení"</string>
@@ -2402,6 +2405,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"vybráno: <xliff:g id="NUMBER">%1$d</xliff:g> z <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Vybrat vše"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Spravovat tarify"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Využití dat"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Využití dat apl."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Účtování dat operátora se může lišit od údajů zařízení."</string>
@@ -2487,6 +2491,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilní sítě"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Měřené sítě Wi-Fi"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Chcete-li vybrat měřené sítě, zapněte připojení Wi-Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automaticky"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Měřená"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Neměřená"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Účtování dat operátora se může lišit od údajů zařízení."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Tísňové volání"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Zpět k hovoru"</string>
@@ -2712,7 +2719,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Správce hovorů"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Výstražné zprávy o výjimečné situaci"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Výstražné zprávy"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Síťoví operátoři"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Názvy přístupových bodů"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Vylepšený režim 4G LTE"</string>
@@ -2781,6 +2788,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Preferovaná SIM karta"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Pokaždé se zeptat"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Vyžadován výběr"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Výběr SIM karty"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Nastavení"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="few">Zobrazit %d skryté položky</item>
@@ -2936,18 +2944,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Oznámení"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategorie oznámení"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Důležitost"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Ponechat rozhodnutí na aplikaci"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Povolit zvuk"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Oznámení nikdy nezobrazovat"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Bez zvukového a vizuálního vyrušení"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Bez zvuku"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Vydat zvukový signál"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Vydat zvukový signál a vyskočit na obrazovku"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Vyskočit na obrazovce"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Nízká"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Střední"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Vysoká"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Naléhavá"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Povolit zvuk"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Na tato oznámení nebudete upozorněni zvukem ani vibrací, ani se nebude zobrazovat jejich náhled na aktuální obrazovce."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Povolit vyrušení"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Umožněte aplikacím vydávat zvuky, vibrovat nebo zobrazovat oznámení na obrazovce"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Nízká důležitost"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Střední důležitost"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Vysoká důležitost"</string>
@@ -2980,7 +2989,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"obraz v obraze"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Obraz v obraze"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Povolit obraz v obraze"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Povolí této aplikaci vytvořit okno v režimu obraz v obraze, když je otevřená, nebo poté, co ji opustíte (například abyste mohli pokračovat ve sledování videa). Toto okno se zobrazuje nad ostatními aplikacemi, které používáte."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Povolí této aplikaci vytvořit okno v režimu obraz v obraze, když je aplikace otevřená nebo poté, co ji opustíte (například abyste mohli pokračovat ve sledování videa). Toto okno se zobrazuje nad ostatními aplikacemi, které používáte."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Přístup při nastavení Nerušit"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"O přístup při nastavení Nerušit nepožádaly žádné nainstalované aplikace"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Načítání aplikací..."</string>
@@ -3303,6 +3312,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Přenos souborů"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Přenos fotek (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Použití zařízení jako MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Zrcadlení SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Kontrola pozadí"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Úplný přístup k pozadí"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Použití textu z obrazovky"</string>
@@ -3449,6 +3459,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="night_display_suggestion_title" msgid="6602129097059325291">"Nastavení plánu Nočního režimu"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Pro snazší usínání obrazovku zbarvit do oranžova"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Noční režim je aktivní"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Obrazovka je tónována oranžově. Možná vám to pomůže usnout."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Návrhy"</string>
@@ -3471,6 +3483,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Použijí se studenější barvy zobrazení"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Chcete-li změnu barev použít, vypněte obrazovku"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Chcete-li použít změnu sledování telefonních služeb, restartujte zařízení"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Fotoaparát HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Chcete-li použít změnu fotoaparátu HAL HDR+, restartujte zařízení"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Laserový senzor fotoaparátu"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatické aktualizace systému"</string>
     <string name="usage" msgid="2977875522080448986">"Využití"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Využití mobilních dat"</string>
@@ -3498,7 +3513,7 @@
     <string name="data_warning" msgid="209133958008062117">"Upozornění na data"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Nastavit limit dat"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limit dat"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"V období <xliff:g id="ID_2">%2$s</xliff:g> jste využili <xliff:g id="ID_1">%1$s</xliff:g> dat"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> využito v období <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurovat"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Ostatní aplikace zahrnuté do využití"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3571,7 +3586,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Vymazat a aktivovat"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Resetovat limity četnosti služby ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Limity četnosti služby ShortcutManager byly resetovány"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Správa oznámení na obrazovce uzamčení"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Nastavte informace 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="8483187649355540109">"Podpora a tipy"</string>
@@ -3579,7 +3594,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Žádné nainstalované aplikace o přístup k prémiovým SMS nepožádaly"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Prémiové SMS mohou být zpoplatněny a jejich cena se přičte k fakturaci operátora. Pokud aplikaci udělíte příslušné oprávnění, budete pomocí této aplikace moci odesílat prémiové SMS."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Přístup k prémiovým SMS"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Neviditelné ostatním zařízením"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Vypnuto"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Připojeno k zařízení <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Připojeno k několika zařízením"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Ukázkový režim uživatelského rozhraní systému"</string>
@@ -3687,7 +3702,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Okamžité aplikace"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Otevírejte odkazy v aplikacích, i když je nemáte nainstalované"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Okamžité aplikace"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Účet okamžitých aplikací"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Předvolby okamžitých aplikací"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Nainstalované aplikace"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Úložiště je nyní spravováno správcem úložiště."</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Účty uživatele <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3738,7 +3753,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Trvalá síť VPN je zapnutá v osobním profilu"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Trvalá síť VPN je zapnutá v pracovním profilu"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globální proxy server protokolu HTTP je nastaven"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Důvěryhodná pověření"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Důvěryhodné identifikační údaje"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Důvěryhodné identifikační údaje ve vašem osobním profilu"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Důvěryhodné identifikační údaje ve vašem pracovním profilu"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="few">Minimálně <xliff:g id="COUNT_1">%d</xliff:g> certifikáty CA</item>
       <item quantity="many">Minimálně <xliff:g id="COUNT_1">%d</xliff:g> certifikátu CA</item>
@@ -3811,7 +3828,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informace o zprovoznění služby u operátora"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Spustit zprovoznění služby u operátora"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Co je nové a zajímavé?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Vyzkoušejte 5 nejpopulárnějších funkcí"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Prohlédněte si svůj nový telefon"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Prohlédněte si svůj nový tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Prohlédněte si své nové zařízení"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Funkce v tomto zařízení není k dispozici"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Stav registrace IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrováno"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Neregistrováno"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index ea66cd1..d65a87b 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s vil gerne have adgang til dine beskeder. Vil du give %2$s adgang?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Anmodning om SIM-adgang"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> vil have adgang til dit SIM-kort. Hvis du giver adgang til SIM-kortet, deaktiveres dataforbindelsen på din enhed, så længe den anden enhed er forbundet. Giv adgang til <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Vises som \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" på andre enheder"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Vises som \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" på andre enheder"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Dine enheder"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Par ny enhed"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Dato og klokkeslæt"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Næste"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Vil du ikke konfigurere fingeraftryk nu?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Konfigurationen af fingeraftryk tager ikke mere end et minut eller to. Hvis du springer dette trin over, kan du tilføje dit fingeraftryk på et senere tidspunkt i indstillingerne."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Vil du springe skærmlås over?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Funktionerne til enhedsbeskyttelse aktiveres ikke. Du vil ikke kunne forhindre andre i at bruge denne tablet, hvis du mister den, eller hvis den bliver stjålet eller nulstillet."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Funktionerne til enhedsbeskyttelse aktiveres ikke. Du vil ikke kunne forhindre andre i at bruge denne enhed, hvis du mister den, eller hvis den bliver stjålet eller nulstillet."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Funktionerne til enhedsbeskyttelse aktiveres ikke. Du vil ikke kunne forhindre andre i at bruge denne telefon, hvis du mister den, eller hvis den bliver stjålet eller nulstillet."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Du har tilføjet det maksimale antal fingeraftryk"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Du kan ikke tilføje flere fingeraftryk"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Vil du fjerne alle fingeraftryk?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Fjern \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\""</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Vil du slette dette fingeraftryk?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Du vil ikke kunne bruge dine fingeraftryk til at låse din telefon op, godkende køb eller logge ind på apps"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Du vil ikke kunne bruge dine fingeraftryk til at låse din arbejdsprofil op, godkende køb eller logge ind på arbejdsapps"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Ja, fjern det"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Beskyt din tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Beskyt din enhed"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Beskyt din telefon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Konfigurer en alternativ metode til skærmlåsning for at opnå ekstra sikkerhed."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Konfigurer en alternativ metode til skærmlåsning for at opnå ekstra sikkerhed."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Du kan forhindre andre i at bruge denne tablet uden din tilladelse ved at aktivere funktionerne til enhedsbeskyttelse. Vælg den skærmlås, du vil bruge."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Du kan forhindre andre i at bruge denne enhed uden din tilladelse ved at aktivere funktionerne til enhedsbeskyttelser. Vælg den skærmlås, du vil bruge."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Du kan forhindre andre i at bruge denne telefon uden din tilladelse ved at aktivere funktionerne til enhedsbeskyttelse. Vælg den skærmlås, du vil bruge."</string>
@@ -497,37 +502,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Vil du fjerne enhedsbeskyttelse?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Vil du fjerne profilbeskyttelsen?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Funktionerne til enhedsbeskyttelse fungerer ikke uden dit mønster."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Funktionerne til enhedsbeskyttelse fungerer ikke uden dit mønster.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Funktionerne til enhedsbeskyttelse fungerer ikke uden dit mønster.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Dine gemte fingeraftryk bliver også fjernet fra denne enhed, og du vil ikke kunne bruge dem til at låse din telefon op, godkende køb eller logge ind på apps."</string>
+</xliff:g>Dine gemte fingeraftryk fjernes også fra denne enhed, så du kan ikke længere bruge dem til at låse din telefon op, godkende køb eller logge ind på apps."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Funktionerne til enhedsbeskyttelse fungerer ikke uden din pinkode."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Funktionerne til enhedsbeskyttelse fungerer ikke uden din pinkode.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Funktionerne til enhedsbeskyttelse fungerer ikke uden din pinkode.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Dine gemte fingeraftryk bliver også fjernet fra denne enhed, og du vil ikke kunne bruge dem til at låse din telefon op, godkende køb eller logge ind på apps."</string>
+</xliff:g>Dine gemte fingeraftryk fjernes også fra denne enhed, så du kan ikke længere bruge dem til at låse din telefon op, godkende køb eller logge ind på apps."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Funktionerne til enhedsbeskyttelse fungerer ikke uden din adgangskode."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Funktionerne til enhedsbeskyttelse fungerer ikke uden din adgangskode.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Funktionerne til enhedsbeskyttelse fungerer ikke uden din adgangskode.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Dine gemte fingeraftryk bliver også fjernet fra denne enhed, og du vil ikke kunne bruge dem til at låse din telefon op, godkende køb eller logge ind på apps."</string>
+</xliff:g>Dine gemte fingeraftryk fjernes også fra denne enhed, så du kan ikke længere bruge dem til at låse din telefon op, godkende køb eller logge ind på apps."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Funktionerne til enhedsbeskyttelse fungerer ikke uden din skærmlås."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Funktionerne til enhedsbeskyttelse fungerer ikke uden din skærmlås.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Funktionerne til enhedsbeskyttelse fungerer ikke uden din skærmlås.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Dine gemte fingeraftryk bliver også fjernet fra denne enhed, og du vil ikke kunne bruge dem til at låse din telefon op, godkende køb eller logge ind på apps."</string>
+</xliff:g>Dine gemte fingeraftryk fjernes også fra denne enhed, så du kan ikke længere bruge dem til at låse din telefon op, godkende køb eller logge ind på apps."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Funktionerne til beskyttelse af profilen fungerer ikke uden dit mønster."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Funktionerne til beskyttelse af profilen fungerer ikke uden dit mønster.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Funktionerne til beskyttelse af profilen fungerer ikke uden dit mønster.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Dine gemte fingeraftryk fjernes også fra denne profil, så du kan ikke længere bruge dem til at låse din profil op, godkende køb eller logge ind på apps\"."</string>
+</xliff:g>Dine gemte fingeraftryk fjernes også fra denne profil, så du kan ikke længere bruge dem til at låse din profil op, godkende køb eller logge ind på apps."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Funktionerne til beskyttelse af profilen fungerer ikke uden din pinkode."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Funktionerne til beskyttelse af profilen fungerer ikke uden din pinkode.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Funktionerne til beskyttelse af profilen fungerer ikke uden din pinkode.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Dine gemte fingeraftryk fjernes også fra denne profil, så du kan ikke længere bruge dem til at låse din profil op, godkende køb eller logge ind på apps\"."</string>
+</xliff:g>Dine gemte fingeraftryk fjernes også fra denne profil, så du kan ikke længere bruge dem til at låse din profil op, godkende køb eller logge ind på apps."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Funktionerne til beskyttelse af profilen fungerer ikke uden din adgangskode."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Funktionerne til beskyttelse af profilen fungerer ikke uden din adgangskode.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Funktionerne til beskyttelse af profilen fungerer ikke uden din adgangskode.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Dine gemte fingeraftryk fjernes også fra denne profil, så du kan ikke længere bruge dem til at låse din profil op, godkende køb eller logge ind på apps\"."</string>
+</xliff:g>Dine gemte fingeraftryk fjernes også fra denne profil, så du kan ikke længere bruge dem til at låse din profil op, godkende køb eller logge ind på apps."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Funktionerne til beskyttelse af profilen fungerer ikke uden din skærmlås."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Funktionerne til beskyttelse af profilen fungerer ikke uden din skærmlås.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Funktionerne til beskyttelse af profilen fungerer ikke uden din skærmlås.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Dine gemte fingeraftryk fjernes også fra denne profil, så du kan ikke længere bruge dem til at låse din profil op, godkende køb eller logge ind på apps\"."</string>
+</xliff:g>Dine gemte fingeraftryk fjernes også fra denne profil, så du kan ikke længere bruge dem til at låse din profil op, godkende køb eller logge ind på apps."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Ja, fjern den"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Skift oplåsningsmønster"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Skift pinkode til oplåsning"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Stigende eller faldende talsekvens og gentagne tal er ikke tilladt"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Annuller"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Ryd"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Annuller"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Næste"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Konfigurationen er fuldført."</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS er tilgængelig"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS er tilgængelig)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Indtast adgangskoden til dit netværk"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Wi-Fi-netværk for mobilselskab"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Opret forbindelse via <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"For bl.a. at kunne angive en mere nøjagtig placering vil <xliff:g id="APP_NAME">%1$s</xliff:g> gerne aktivere netværkssøgning, selv når Wi-Fi er deaktiveret.\n\nVil du tillade dette for alle apps, der gerne vil søge?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Gå til Avanceret i prikmenuen for at slå denne funktion fra."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Tillad"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Forbind"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Der kunne ikke oprettes forbindelse til netværket"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Glem"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Rediger"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Netværket kunne ikke glemmes"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Gem"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Netværk kunne ikke gemmes"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Avanceret Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-adresse"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-adresse"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Oplysninger om netværket"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Undernetmaske"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-adresser"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Vil du annullere invitationen?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vil du annullere invitationen til at oprette forbindelse med <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Vil du glemme denne gruppe?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Wi-Fi-hotspot"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi-hotspot"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Deler ikke internet eller indhold med andre enheder"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Deler denne tablets internetforbindelse via hotspot"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Deler telefonens internetforbindelse via hotspot"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Appen deler indhold. Hvis du vil dele internetforbindelsen, skal du deaktivere hotspot og derefter aktivere det"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi-Fi-navn"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Navn på hotspot"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Aktiverer <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Andre enheder kan oprette forbindelse til <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi-adgangskode"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Adgangskode til hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP-bånd"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Brug hotspot til at oprette et Wi-Fi-netværk til dine andre enheder. Hotspot leverer internet via din mobildataforbindelse. Yderligere mobildatagebyrer kan forekomme."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Apps kan oprette et hotspot for at dele indhold med enheder i nærheden."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Den adresse, der af nødtjenester anvendes som din placering, hvis du foretager et nødopkald via Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skærm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Lyd"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Lydstyrke"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Søg"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Administrer søgeindstillinger og -historik"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Ingen resultater"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Ryd historik"</string>
     <string name="display_settings" msgid="7965901687241669598">"Skærm"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Roter skærm automatisk"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Levende farver"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Gendannelse af standardindstillingerne for adgangspunktet."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Nulstil til standard"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Standardindstillingerne for adgangspunktet er nulstillet."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Nulstilling"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Nulstil netværksindstillinger"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Nulstil valg"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Netværk, apps eller enheden kan nulstilles"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Nulstil Wi-Fi, mobil og Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Denne handling nulstiller alle netværksindstillinger, bl.a.:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobildata"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Nulstil indstillinger"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Vil du nulstille alle netværksindstillingerne? Du kan ikke fortryde denne handling."</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Vil du nulstille?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Gendannelse af netværk er ikke tilgængeligt for denne bruger"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Netværksindstillingerne er blevet nulstillet"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Gendannelse af fabriksdata"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> konto nulstilles</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> konti nulstilles</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Intern lagerplads og alle data nulstilles"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Ryd alle data (gendan fabriksindstillinger)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Dette sletter alle data fra tablettens "<b>"interne lagerplads"</b>", f.eks.: \n\n"<li>"din Google-konto"</li>\n<li>"data og indstillinger for system og applikationer"</li>\n<li>"downloadede applikationer"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Dette sletter alle data fra telefonens "<b>"interne lagerplads"</b>", f.eks.: \n\n"<li>"din Google-konto"</li>\n<li>"data og indstillinger for system og apps"</li>\n<li>"downloadede apps"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du er i øjeblikket logget ind på disse konti:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Sikkerhedsoplysninger"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Du har ingen dataforbindelse. Se disse oplysninger nu ved at gå til %s på en computer, der har forbindelse til internettet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Indlæser..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Vælg din adgangskode"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Konfigurer en skærmlås"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Konfigurer en adgangskode af hensyn til sikkerheden"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Angiv adgangskode for at bruge fingeraftryk"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Vælg dit mønster"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Angiv mønster for at bruge fingeraftryk"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Vælg din pinkode"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Konfigurer en pinkode af hensyn til sikkerheden"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Angiv pinkode for at bruge fingeraftryk"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Bekræft din adgangskode"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Angiv din adgangskode igen"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Bekræft dit mønster"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Bekræft din pinkode"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Angiv din pinkode igen"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Adgangskoderne matcher ikke"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Pinkoderne matcher ikke"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Vælg oplåsningsmetode"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Brug mønsteret til din arbejdsprofil for at fortsætte"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Indtast pinkoden til din arbejdsprofil for at fortsætte"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Indtast adgangskoden til din arbejdsprofil for at fortsætte"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Brug mønsteret til din enhed for at fortsætte. Det er påkrævet efter genstart."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Angiv pinkoden til din enhed for at fortsætte. Det er påkrævet efter genstart."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Angiv adgangskoden til din enhed for at fortsætte. Det er påkrævet efter genstart."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Brug mønsteret til din arbejdsprofil for at fortsætte. Det er påkrævet efter genstart."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Angiv pinkoden til din arbejdsprofil for at fortsætte. Det er påkrævet efter genstart."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Angiv adgangskoden til din arbejdsprofil for at fortsætte. Det er påkrævet efter genstart."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Brug mønsteret til din enhed for at opnå øget sikkerhed"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Angiv pinkoden til din enhed for at opnå øget sikkerhed"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Angiv adgangskoden til din enhed for at opnå øget sikkerhed"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Brug mønsteret til din arbejdsprofil for at opnå øget sikkerhed"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Angiv pinkoden til din arbejdsprofil for at opnå øget sikkerhed"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Angiv adgangskoden til din arbejdsprofil for at opnå øget sikkerhed"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Telefonens fabriksindstillinger blev gendannet. Angiv dit tidligere mønster for at bruge telefonen."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Telefonens fabriksindstillinger blev gendannet. Angiv din tidligere pinkode for at bruge telefonen."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Telefonens fabriksindstillinger blev gendannet. Angiv din tidligere adgangskode for at bruge telefonen."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Bekræft mønster"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Bekræft pinkode"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Bekræft adgangskode"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Forkert pinkode"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Forkert adgangskode"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Forkert mønster"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vil du oprette en widget og tillade adgang?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Når du opretter en widget, kan <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> få adgang til alle data, den viser."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Tillad altid, at <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> opretter widgets og får adgang til deres data"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>t <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>t <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>S"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>t <xliff:g id="MINUTES">%3$d</xliff:g>m"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>t <xliff:g id="MINUTES">%2$d</xliff:g>m"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Brugerstatistikker"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Brugerstatistikker"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sorter efter:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Skærmlæsere, visning, kontrolelementer til interaktion"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Synsindstillinger"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Du kan tilpasse denne enhed, så den passer til dine behov. Disse hjælpefunktioner kan ændres senere under Indstillinger."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Forøg skriftstørrelse"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Skift skriftstørrelse"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Skærmlæsere"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Lyd og tekst på skærmen"</string>
     <string name="display_category_title" msgid="685461049938269166">"Skærm"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Hvis du vil zoome"</b>", skal du hurtigt trykke tre gange på skærmen.\n"<ul><li>"Træk med to eller flere fingre for at rulle"</li>\n<li>"Knib sammen med to eller flere fingre for at justere zoomniveauet"</li></ul>\n\n<b>"Hvis du vil zoome midlertidigt"</b>", skal du hurtigt trykke tre gange på skærmen og holde fingeren nede på det tredje tryk.\n"<ul><li>"Træk for at udforske forskellige dele af skærmen"</li>\n<li>"Løft fingeren for at zoome ud"</li></ul>\n\n"Du kan ikke zoome ind på tastaturet eller navigationslinjen."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Når forstørrelse er slået til, kan du bruge knappen Hjælpefunktioner nederst på skærmen til hurtigt at forstørre.\n\n"<b>"Hvis du vil zoome"</b>", kan du trykke på knappen Hjælpefunktioner og derefter trykke et vilkårligt sted på skærmen.\n"<ul><li>"Træk med to eller flere fingre for at rulle"</li>\n<li>"Knib sammen med to eller flere fingre for at justere zoomniveauet"</li></ul>\n\n<b>"Hvis du vil zoome midlertidigt"</b>", skal du trykke på knappen Hjælpefunktioner og holde fingeren nede et vilkårligt sted på skærmen.\n"<ul><li>"Træk for at udforske forskellige dele af skærmen"</li>\n<li>"Løft fingeren for at zoome ud"</li></ul>\n\n"Du kan ikke zoome ind på tastaturet eller navigationslinjen."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Knappen Hjælpefunktioner er angivet til <xliff:g id="SERVICE">%1$s</xliff:g>. Hvis du vil bruge forstørrelse, skal du trykke på knappen Hjælpefunktioner, holde fingeren nede og derefter vælge forstørrelse."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Genvej til hjælpefunktioner"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Genvej via lydstyrkeknapperne"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Genvejstjeneste"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Tillad fra låseskærm"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Når genvejen er slået til, kan du starte en hjælpefunktion ved at trykke på begge lydstyrkeknapper i tre sekunder."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Når genvejen er slået til, kan du starte en hjælpefunktion ved at trykke på begge lydstyrkeknapper i tre sekunder."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Tekst med stor kontrast"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Opdater skærmforstørrelse automatisk"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Opdater skærmforstørrelsen på appovergange"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Kan påvirke ydeevnen"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klik, efter markøren er stoppet"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Forsinkelse forud for klik"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"TIL"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"FRA"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Vis i Hurtige indstillinger"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> valgte ud af <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> ud af <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Markér alle"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Administrer dataabonnement"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Dataforbrug"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Appens dataforbrug"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Mobilselskabets dataopgørelse kan variere afhængigt af din enhed."</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilnetværk"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Forbrugsbaserede Wi-Fi-netværk"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Hvis du vil vælge forbrugsbaserede netværk, skal du slå Wi-Fi til."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatisk"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Forbrugsafregnet"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Ubegrænset brug til en fast pris"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Mobilselskabets dataopgørelse kan variere afhængigt af din enhed."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Nødopkald"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Tilbage til opkald"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Opkaldsstyring"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Nødudsendelser"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Nødalarmer"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Netværksudbydere"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Adgangspunkter (APN)"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Udvidet 4G LTE-tilstand"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Foretrukket SIM-kort til"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Spørg hver gang"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Du har ikke valgt endnu"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Valg af SIM-kort"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Indstillinger"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="one">Vis %d skjult element</item>
@@ -2792,7 +2802,7 @@
     <string name="keywords_unification" msgid="1922900767659821025">"arbejdsprofil, administreret profil, samle, samling, arbejde, profil"</string>
     <string name="keywords_gesture" msgid="3526905012224714078">"bevægelser"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"betal, tryk, betalinger"</string>
-    <string name="keywords_backup" msgid="470070289135403022">"sikkerhedskopiering, sikkerhedskopiér"</string>
+    <string name="keywords_backup" msgid="470070289135403022">"backup, sikkerhedskopiér"</string>
     <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"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>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Appunderretninger"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Underretningskategori"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Vigtighed"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Lad appen bestemme"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Tillad lyd"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Vis aldrig underretninger"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Ingen lyd eller pop op-visning"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Ingen lyd"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Med lyd"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Med lyd og pop op-visning"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Pop op-visning"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Lav"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Middel"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Høj"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Haster"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Tillad lyd"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Undlad at give lyd, vibrere eller vise disse underretninger på den aktuelle skærm."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Tillad afbrydelser"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Lad appen give lyd, vibrere og/eller vise underretninger på skærmen"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Lille vigtighed"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Middel vigtighed"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Stor vigtighed"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"integreret billede i"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Integreret billede"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Tillad integreret billede"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Giv tilladelse til at oprette et vindue med integreret billede, mens appen er åben, eller efter du lukker den (f.eks. for at fortsætte med at se en video). Dette vindue vises oven på andre apps, du bruger."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Giv tilladelse til at denne app opretter et vindue med integreret billede, mens appen er åben, eller efter du lukker den (f.eks. for at fortsætte med at se en video). Dette vindue vises oven på andre apps, du bruger."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Adgang til \"Forstyr ikke\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ingen installerede apps har anmodet om adgang, når indstillingen \"Forstyr ikke\" er aktiveret."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Indlæser apps..."</string>
@@ -3026,7 +3037,7 @@
       <item quantity="other">Skift til Kun alarmer i <xliff:g id="DURATION">%1$d</xliff:g> minutter (indtil <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
     </plurals>
     <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
-      <item quantity="one">Skift til Kun alarmer i <xliff:g id="DURATION">%1$d</xliff:g> timer indtil <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Skift til Kun alarmer i <xliff:g id="DURATION">%1$d</xliff:g> time indtil <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
       <item quantity="other">Skift til Kun alarmer i <xliff:g id="DURATION">%1$d</xliff:g> timer indtil <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Skift til Kun alarmer frem til <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
@@ -3040,7 +3051,7 @@
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Når skærmen er tændt"</string>
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Når skærmen er slukket"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Når skærmen er tændt eller slukket"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Indstillinger for underretninger"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Underretningsindstillinger"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send feedback om denne enhed"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Indtast administratorpinkoden"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Til"</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Overførsel af filer"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Overførsel af billeder (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Brug enheden som MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Sms-spejling"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Baggrundstjek"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Fuld baggrundsadgang"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Brug tekst fra skærmen"</string>
@@ -3337,7 +3349,7 @@
     <string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> er standard"</string>
     <string name="location_on_summary" msgid="5127631544018313587">"TIL/<xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
     <string name="location_off_summary" msgid="6474350053215707957">"FRA"</string>
-    <string name="backup_disabled" msgid="485189128759595412">"Sikkerhedskopiering er slået fra"</string>
+    <string name="backup_disabled" msgid="485189128759595412">"Backup er slået fra"</string>
     <string name="about_summary" msgid="924181828102801010">"Opdateret til Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="disabled_by_policy_title" msgid="627023216027648534">"Handlingen er ikke tilladt"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="7399450998356045023">"Lydstyrken kan ikke ændres"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Angiv tidsplan for Nattelys"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Gul farvetone på skærmen, der gør det nemmere at falde i søvn"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Nattelys er slået til"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Farvetonen på skærmen er gul. Dette kan hjælpe dig med at falde i søvn."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Forslag"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Brug køligere skærmfarver"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Du skal slå skærmen fra, før du kan anvende farveændringer"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Genstart enheden for at anvende ændringen i forbindelse med Overvågning af telefoni"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Camera HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Genstart enheden for at anvende ændringen i forbindelse med Camera HAL HDR+"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kameraets lasersensor"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatiske systemopdateringer"</string>
     <string name="usage" msgid="2977875522080448986">"Forbrug"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobildataforbrug"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Dataadvarsel"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Angiv datagrænse"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datagrænse"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> brugt i perioden <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> brugt <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurer"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Andre apps, der er inkluderet i forbruget"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Ryd og konvertér"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Nulstil antalsbegrænsning i ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Antalsbegrænsning i ShortcutManager er nulstillet"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Konfigurer underretninger for låseskærm"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Bestem selv, hvilke oplysninger der vises på din 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="8483187649355540109">"Support og tips"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Ingen installerede apps har anmodet om adgang til overtakseret sms"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Overtakseret sms kan koste dig penge, som opkræves via din mobilregning. Hvis du aktiverer tilladelsen for en app, kan du sende overtakserede sms-beskeder ved hjælp af denne app."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Adgang til overtakseret sms"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Kan ikke ses af andre enheder"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Deaktiveret"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Forbundet med <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Forbundet med flere enheder"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Demotilstand for systemets brugerflade"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Instant apps"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Åbn links i apps – selv hvis de ikke er installeret"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Instant apps"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Instant apps-konto"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Præferencer for Instant Apps"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installerede aps"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Din lagerplads administreres nu af lageradministratoren"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Konti for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"\"Konstant VPN\" er aktiveret på din personlige profil"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"\"Konstant VPN\" er aktiveret på din arbejdsprofil"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP-proxy er konfigureret"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Pålidelige loginoplysninger"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Pålidelige loginoplysninger"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Pålidelige loginoplysninger på din personlige profil"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Pålidelige loginoplysninger på din arbejdsprofil"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">Mindst <xliff:g id="COUNT_1">%d</xliff:g> CA-certifikat</item>
       <item quantity="other">Mindst <xliff:g id="COUNT_1">%d</xliff:g> CA-certifikater</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Oplysninger om mobilselskab"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktivér mobilselskab"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Hvad er nyt og spændende?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Se de fem mest populære funktioner"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Få en rundvisning på din nye telefon"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Få en rundvisning på din nye tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Få en rundvisning på din nye enhed"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Denne funktion er ikke tilgængelig på denne enhed"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Status for IMS-registrering"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Registreret"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Ikke registreret"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e91c879..a0c14d6 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -165,7 +165,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s möchte auf deine Nachrichten zugreifen. Möchtest du %2$s den Zugriff erlauben?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Anfrage wegen Zugriff auf SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> möchte auf deine SIM-Karte zugreifen. Wenn du den Zugriff auf die SIM-Karte gewährst, wird die Datenverbindung auf deinem Gerät für die Dauer der Verbindung deaktiviert. Möchtest du <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> den Zugriff erlauben?"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Für andere Geräte sichtbar als \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\""</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Für andere Geräte als \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" sichtbar"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Meine Geräte"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Neues Gerät koppeln"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum &amp; Uhrzeit"</string>
@@ -371,6 +371,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Weiter"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Fingerabdruck überspringen?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Die Fingerabdruck-Einrichtung dauert nur ein, zwei Minuten. Wenn du sie jetzt überspringst, kannst du sie später über die Einstellungen nachholen."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Displaysperre überspringen?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Die Geräteschutzfunktionen werden nicht aktiviert. Du kannst dann nicht verhindern, dass andere Personen dieses Tablet verwenden, falls es verloren geht, gestohlen oder zurückgesetzt wird."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Die Geräteschutzfunktionen werden nicht aktiviert. Du kannst dann nicht verhindern, dass andere Personen dieses Gerät verwenden, falls es verloren geht, gestohlen oder zurückgesetzt wird."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Die Geräteschutzfunktionen werden nicht aktiviert. Du kannst dann nicht verhindern, dass andere Personen dieses Smartphone verwenden, falls es verloren geht, gestohlen oder zurückgesetzt wird."</string>
@@ -410,6 +413,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Du hast die maximale Anzahl an Fingerabdrücken hinzugefügt"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Es können keine Fingerabdrücke mehr hinzugefügt werden"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Alle Fingerabdrücke entfernen?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> entfernen"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Möchtest du diesen Fingerabdruck löschen?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Du kannst dann deine Fingerabdrücke nicht mehr verwenden, um dein Smartphone zu entsperren, Käufe zu autorisieren oder dich in Apps anzumelden"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Du kannst deine Fingerabdrücke nicht mehr verwenden, um dein Arbeitsprofil zu entsperren, Käufe zu autorisieren oder dich in Apps für die Arbeit anzumelden"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Ja, entfernen"</string>
@@ -454,7 +459,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Tablet schützen"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Gerät schützen"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Smartphone schützen"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Richte eine alternative Displaysperre ein, um die Sicherheit zu erhöhen."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Richte eine alternative Displaysperre ein, um die Sicherheit zu erhöhen."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Du kannst verhindern, dass andere Personen dieses Tablet ohne deine Erlaubnis verwenden, indem du die Geräteschutzfunktionen aktivierst. Wähle eine Displaysperre aus."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Du kannst verhindern, dass andere Personen dieses Gerät ohne deine Erlaubnis verwenden, indem du die Geräteschutzfunktionen aktivierst. Wähle eine Displaysperre aus."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Du kannst verhindern, dass andere Personen dieses Smartphone ohne deine Erlaubnis verwenden, indem du die Geräteschutzfunktionen aktivierst. Wähle eine Displaysperre aus."</string>
@@ -496,35 +501,35 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Geräteschutz entfernen?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Profilschutz entfernen?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Die Geräteschutzeinstellungen funktionieren ohne dein Muster nicht."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Die Geräteschutzeinstellungen funktionieren ohne dein Muster nicht.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Die Geräteschutzeinstellungen funktionieren ohne dein Muster nicht.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Deine gespeicherten Fingerabdrücke werden ebenfalls von diesem Gerät entfernt und du kannst mit ihnen weder dein Smartphone entsperren noch Käufe autorisieren oder dich in Apps anmelden.\""</string>
+</xliff:g>Deine gespeicherten Fingerabdrücke werden ebenfalls von diesem Gerät entfernt und du kannst mit ihnen weder dein Smartphone entsperren noch Käufe autorisieren oder dich in Apps anmelden."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Die Geräteschutzeinstellungen funktionieren ohne deine PIN nicht."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Die Geräteschutzeinstellungen funktionieren ohne deine PIN nicht.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Die Geräteschutzeinstellungen funktionieren ohne deine PIN nicht.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Deine gespeicherten Fingerabdrücke werden ebenfalls von diesem Gerät entfernt und du kannst mit ihnen weder dein Smartphone entsperren noch Käufe autorisieren oder dich in Apps anmelden.\""</string>
+</xliff:g>Deine gespeicherten Fingerabdrücke werden ebenfalls von diesem Gerät entfernt und du kannst mit ihnen weder dein Smartphone entsperren noch Käufe autorisieren oder dich in Apps anmelden."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Die Geräteschutzeinstellungen funktionieren ohne dein Passwort nicht."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Die Geräteschutzeinstellungen funktionieren ohne dein Passwort nicht.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Die Geräteschutzeinstellungen funktionieren ohne dein Passwort nicht.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Deine gespeicherten Fingerabdrücke werden ebenfalls von diesem Gerät entfernt und du kannst mit ihnen weder dein Smartphone entsperren noch Käufe autorisieren oder dich in Apps anmelden.\""</string>
+</xliff:g>Deine gespeicherten Fingerabdrücke werden ebenfalls von diesem Gerät entfernt und du kannst mit ihnen weder dein Smartphone entsperren noch Käufe autorisieren oder dich in Apps anmelden."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Die Geräteschutzeinstellungen funktionieren ohne deine Displaysperre nicht."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Die Geräteschutzeinstellungen funktionieren ohne deine Displaysperre nicht.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Die Geräteschutzeinstellungen funktionieren ohne deine Displaysperre nicht.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Deine gespeicherten Fingerabdrücke werden ebenfalls von diesem Gerät entfernt und du kannst mit ihnen weder dein Smartphone entsperren noch Käufe autorisieren oder dich in Apps anmelden.\""</string>
+</xliff:g>Deine gespeicherten Fingerabdrücke werden ebenfalls von diesem Gerät entfernt und du kannst mit ihnen weder dein Smartphone entsperren noch Käufe autorisieren oder dich in Apps anmelden."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Die Profilschutzeinstellungen funktionieren ohne dein Muster nicht."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Die Profilschutzeinstellungen funktionieren ohne dein Muster nicht.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Die Profilschutzeinstellungen funktionieren ohne dein Muster nicht.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Deine gespeicherten Fingerabdrücke werden ebenfalls aus diesem Profil entfernt und du kannst mit ihnen weder dein Profil entsperren noch Käufe autorisieren oder dich in Apps anmelden."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Die Profilschutzeinstellungen funktionieren ohne deine PIN nicht."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Die Profilschutzeinstellungen funktionieren ohne deine PIN nicht.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Die Profilschutzeinstellungen funktionieren ohne deine PIN nicht.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Deine gespeicherten Fingerabdrücke werden ebenfalls aus deinem Profil gelöscht und du kannst mit ihnen weder dein Profil entsperren noch Käufe autorisieren oder dich in Apps anmelden."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Die Profilschutzeinstellungen funktionieren ohne dein Passwort nicht."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Die Profilschutzeinstellungen funktionieren ohne dein Passwort nicht.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Die Profilschutzeinstellungen funktionieren ohne dein Passwort nicht.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Deine gespeicherten Fingerabdrücke werden ebenfalls aus diesem Profil entfernt und du kannst mit ihnen weder dein Profil entsperren noch Käufe autorisieren oder dich in Apps anmelden."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Die Profilschutzeinstellungen funktionieren ohne deine Displaysperre nicht."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Die Profilschutzeinstellungen funktionieren ohne deine Displaysperre nicht.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Die Profilschutzeinstellungen funktionieren ohne deine Displaysperre nicht.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Deine gespeicherten Fingerabdrücke werden ebenfalls aus diesem Profil entfernt und du kannst mit ihnen weder dein Profil entsperren noch Käufe autorisieren oder dich in Apps anmelden."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Ja, entfernen"</string>
@@ -585,6 +590,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Aufsteigende, absteigende oder wiederholte Ziffernfolgen sind unzulässig"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Abbrechen"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Löschen"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Abbrechen"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Weiter"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Die Einrichtung ist abgeschlossen."</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS verfügbar"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS verfügbar)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Gib dein Netzwerkpasswort ein."</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"WLAN eines Mobilfunkanbieters"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Über <xliff:g id="NAME">%1%s</xliff:g> verbinden"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Zur Verbesserung der Standortgenauigkeit und zu anderen Zwecken möchte <xliff:g id="APP_NAME">%1$s</xliff:g> die Netzwerküberprüfung aktivieren, auch wenn das WLAN deaktiviert ist.\n\nMöchtest du dies für alle Apps zulassen, die eine Überprüfung durchführen möchten?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Rufe im Überlaufmenü \"Erweitert\" auf, um diese Option zu deaktivieren."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Zulassen"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Verbinden"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Netzwerkverbindung konnte nicht hergestellt werden."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Entfernen"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Ändern"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Netzwerk konnte nicht entfernt werden."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Speichern"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Netzwerk konnte nicht gespeichert werden."</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Erweiterte WLAN-Einstellungen"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-Adresse"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-Adresse"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Netzwerkinfo"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnetzmaske"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-Adressen"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Einladung ablehnen?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Möchtest du die Einladung zum Verbinden mit <xliff:g id="PEER_NAME">%1$s</xliff:g> ablehnen?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Diese Gruppe entfernen?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Mobiler WLAN-Hotspot"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"WLAN-Hotspot"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Internetverbindung und Inhalte werden nicht für andere Geräte freigegeben"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Internetverbindung dieses Tablets wird über Hotspot freigegeben"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Internetverbindung dieses Smartphones wird über Hotspot freigegeben"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Es werden Inhalte per App geteilt. Wenn du eine Internetverbindung freigeben möchtest, deaktiviere den Hotspot und aktiviere ihn dann neu"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"WLAN-Name"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Name des Hotspots"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> wird aktiviert..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Andere Geräte können sich mit <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> verbinden"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"WLAN-Passwort"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Passwort des Hotspots"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Band für Zugangspunkt"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Mit einem Hotspot kannst du ein WLAN für andere Geräte einrichten. Die Internetverbindung wird über deine mobilen Daten hergestellt, darum können zusätzliche Kosten anfallen."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"In Apps können über einen Hotspot Inhalte mit Geräten in der Nähe geteilt werden."</string>
@@ -938,7 +947,7 @@
     <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 WLANs 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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Adresse, die Notdiensten bei einem Notruf über WLAN als dein Standort angezeigt wird"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Töne"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Lautstärke"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Suche"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Sucheinstellungen und Suchverlauf verwalten"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Keine Ergebnisse"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Verlauf löschen"</string>
     <string name="display_settings" msgid="7965901687241669598">"Display"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Display automatisch drehen"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Kräftige Farben"</string>
@@ -1002,7 +1012,7 @@
     <string name="brightness" msgid="8480105032417444275">"Helligkeit"</string>
     <string name="brightness_title" msgid="5746272622112982836">"Helligkeit"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Helligkeit des Bildschirms anpassen"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptive Helligkeit"</string>
+    <string name="auto_brightness_title" msgid="6341042882350279391">"Automatische Helligkeit"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Helligkeit an Lichtverhältnisse anpassen"</string>
     <string name="auto_brightness_summary_off" msgid="2802336459335410626">"Deaktiviert"</string>
     <string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Bevorzugte Helligkeit ist sehr niedrig"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Standard-APN-Einstellungen werden wiederhergestellt"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Auf Standard zurücksetzen"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Zurücksetzen auf Standard-APN-Einstellungen abgeschlossen"</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Zurücksetzen"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Netzwerkeinstellungen zurücksetzen"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Optionen zurücksetzen"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Netzwerk, Apps oder Gerät können zurückgesetzt werden"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"WLAN, mobile Daten &amp; Bluetooth zurücksetzen"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Dadurch werden sämtliche Netzwerkeinstellungen zurückgesetzt, einschließlich:\n\n"<li>"WLAN"</li>\n<li>"Mobile Daten"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Einstellungen zurücksetzen"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Alle Netzwerkeinstellungen zurücksetzen? Diese Aktion kann nicht rückgängig gemacht werden!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Zurücksetzen?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Das Zurücksetzen der Netzwerkeinstellungen ist für diesen Nutzer nicht verfügbar."</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Die Netzwerkeinstellungen wurden zurückgesetzt."</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Auf Werkszustand zurücksetzen"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> Konten werden zurückgesetzt</item>
-      <item quantity="one">1 Konto wird zurückgesetzt</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Interner Speicher &amp; alle Daten werden zurückgesetzt"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Alle Daten löschen (auf Werkseinstellungen zurücksetzen)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" deines Tablets gelöscht, u. a.\n\n"<li>"dein Google-Konto"</li>\n<li>"System- und App-Daten sowie entsprechende Einstellungen"</li>\n<li>"heruntergeladene Apps"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" deines Telefons gelöscht, u. a.\n\n"<li>"dein Google-Konto"</li>\n<li>"System- und App-Daten sowie entsprechende Einstellungen"</li>\n<li>"heruntergeladene Apps"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du bist zurzeit in folgenden Konten angemeldet:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Sicherheitsinformationen"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Es ist keine Datenverbindung vorhanden. Rufe %s von einem beliebigen, mit dem Internet verbundenen Computer auf, um diese Informationen jetzt anzuzeigen."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Wird geladen..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Passwort festlegen"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Displaysperre einrichten"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Richte aus Sicherheitsgründen ein Passwort ein"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Passwort festlegen, um Fingerabdruck zu verwenden"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Muster wählen"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Muster festlegen, um Fingerabdruck zu verwenden"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PIN festlegen"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Richte aus Sicherheitsgründen eine PIN ein"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"PIN festlegen, um Fingerabdruck zu verwenden"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Passwort bestätigen"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Passwort noch einmal eingeben"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Muster bestätigen"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PIN bestätigen"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"PIN noch einmal eingeben"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Die Passwörter stimmen nicht überein."</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Die PINs stimmen nicht überein."</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Sperre einrichten"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Gib zum Fortfahren das Muster deines Arbeitsprofils ein"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Gib zum Fortfahren die PIN deines Arbeitsprofils ein"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Gib zum Fortfahren das Passwort deines Arbeitsprofils ein"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Gib zum Fortfahren das Muster für dein Gerät ein. Dieses wird nach dem Neustart benötigt."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Gib zum Fortfahren die PIN für dein Gerät ein. Diese wird nach dem Neustart benötigt."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Gib zum Fortfahren das Passwort für dein Gerät an. Dieses wird nach dem Neustart benötigt."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Gib zum Fortfahren das Muster deines Arbeitsprofils ein. Dieses wird nach dem Geräteneustart benötigt."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Gib zum Fortfahren die PIN deines Arbeitsprofils ein. Diese wird nach dem Geräteneustart benötigt."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Gib zum Fortfahren das Passwort deines Arbeitsprofils ein. Dieses wird nach dem Geräteneustart benötigt."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Verwende das Muster für dein Gerät, um die Sicherheit zu erhöhen"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Gib die PIN für dein Gerät ein, um die Sicherheit zu erhöhen"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Gib dein Gerätepasswort ein, um die Sicherheit zu erhöhen"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Verwende das Muster deines Arbeitsprofils, um die Sicherheit zu erhöhen"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Gib die PIN deines Arbeitsprofils ein, um die Sicherheit zu erhöhen"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Gib das Passwort deines Arbeitsprofils ein, um die Sicherheit zu erhöhen"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Dein Smartphone auf die Werkseinstellungen zurückgesetzt. Gib dein früheres Muster ein."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Dein Smartphone auf die Werkseinstellungen zurückgesetzt. Gib deine frühere PIN ein."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Dein Smartphone wurde auf die Werkseinstellungen zurückgesetzt. Gib dein früheres Passwort ein."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Muster bestätigen"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"PIN bestätigen"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Passwort bestätigen"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Falsche PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Falsches Passwort"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Falsches Muster"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Widget erstellen und Zugriff erlauben?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Nach der Erstellung des Widgets hat <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> Zugriff auf alle von ihm angezeigten Daten."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> immer das Erstellen von Widgets und den Zugriff auf ihre Daten erlauben"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> T <xliff:g id="HOURS">%2$d</xliff:g> Std. <xliff:g id="MINUTES">%3$d</xliff:g> Min. <xliff:g id="SECONDS">%4$d</xliff:g> Sek."</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> Std. <xliff:g id="MINUTES">%2$d</xliff:g> Min. <xliff:g id="SECONDS">%3$d</xliff:g> Sek."</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> Min. <xliff:g id="SECONDS">%2$d</xliff:g> Sek."</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> Sek."</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> T <xliff:g id="HOURS">%2$d</xliff:g> Std. <xliff:g id="MINUTES">%3$d</xliff:g> Min."</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> Std. <xliff:g id="MINUTES">%2$d</xliff:g> Min."</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> Min."</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Nutzungsstatistik"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Nutzungsstatistik"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sortieren nach:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Screenreader, Display, Interaktionssteuerung"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Anzeigeeinstellungen"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Du kannst dieses Gerät an deine Bedürfnisse anpassen. Diese Funktionen der Bedienungshilfen kannst du später in den Einstellungen ändern."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Schriftgröße ändern"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Schriftgröße ändern"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Screenreader"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audiodienste und Text auf dem Bildschirm"</string>
     <string name="display_category_title" msgid="685461049938269166">"Bildschirm"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Um zu zoomen"</b>", kannst du einfach dreimal schnell auf das Display tippen.\n"<ul><li>"Ziehe mindestens zwei Finger über das Display, um zu scrollen."</li>\n<li>"Ziehe mindestens zwei Finger zusammen, wenn du den Zoom anpassen möchtest."</li></ul>\n\n<b>"Um einen Bereich vorübergehend heranzuzoomen"</b>", tippe dreimal schnell auf das Display und halte deinen Finger beim dritten Tippen auf das Display gedrückt.\n"<ul><li>"Ziehe den Finger über das Display, um dich auf dem Display hin- und herzubewegen."</li>\n<li>"Um wieder herauszuzoomen, hebe den Finger an."</li></ul>\n\n"Auf der Tastatur und in der Navigationsleiste kann nicht gezoomt werden."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Wenn die Option \"Vergrößerung\" aktiviert wird, kannst du über die Schaltfläche für die Bedienungshilfen unten auf dem Display schnell Vergrößerungen durchführen.\n\n"<b>"Wenn du zoomen möchtest"</b>", tippe auf die Schaltfläche für die Bedienungshilfen und anschließend auf einen beliebigen Punkt auf dem Display.\n"<ul><li>"Ziehe mindestens zwei Finger über das Display, um zu scrollen."</li>\n<li>"Ziehe mindestens zwei Finger zusammen, wenn du den Zoom anpassen möchtest."</li></ul>\n\n<b>"Um einen Bereich vorübergehend heranzuzoomen"</b>", tippe auf die Schaltfläche für die Bedienungshilfen, tippe anschließend auf einen beliebigen Punkt auf dem Display und halte ihn.\n"<ul><li>"Ziehe den Finger über das Display, um dich auf dem Display hin- und herzubewegen."</li>\n<li>"Um wieder herauszuzoomen, hebe den Finger an."</li></ul>\n\n"Auf der Tastatur und in der Navigationsleiste kann nicht gezoomt werden."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Die Schaltfläche für die Bedienungshilfen ist auf <xliff:g id="SERVICE">%1$s</xliff:g> gestellt. Um die Vergrößerung nutzen zu können, tippe &amp; halte die Schaltfläche für die Bedienungshilfen gedrückt und wähle anschließend \"Vergrößerung\" aus."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Kurzbefehl für Bedienungshilfen"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Verknüpfung für Lautstärketaste"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Verknüpfter Dienst"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Auf dem Sperrbildschirm erlauben"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Wenn die Verknüpfung aktiviert ist, kannst du die beiden Lautstärketasten drei Sekunden lang gedrückt halten, um eine Bedienungshilfe zu starten."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Wenn die Verknüpfung aktiviert ist, kannst du Bedienungshilfen starten, indem du die beiden Lautstärketasten drei Sekunden lang gedrückt hältst."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Text mit hohem Kontrast"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Vergrößerung autom. aktualisieren"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Vergrößerung bei App-Übergängen aktualisieren"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Kann sich auf die Leistung auswirken"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klicken, wenn Zeiger stillsteht"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Verzögerung vor Klick"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"AKTIVIERT"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DEAKTIVIERT"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"In Schnelleinstellungen anzeigen"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> von <xliff:g id="TOTAL">%2$d</xliff:g> ausgewählt"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> von <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Alles auswählen"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Verträge verwalten"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datennutzung"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Datennutzung durch Apps"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Dein Mobilfunkanbieter berechnet die Datennutzung eventuell anders als das Gerät."</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilfunknetze"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Kostenpflichtige WLANs"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Um kostenpflichtige Netzwerke auszuwählen, aktiviere WLAN."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatisch"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Kostenpflichtig"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Nicht kostenpflichtig"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Dein Mobilfunkanbieter berechnet die Datennutzung eventuell anders als das Gerät."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Notruf"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Zurück zum Anruf"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Anrufverwaltung"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Notfall-Broadcasts"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Notfallbenachrichtigungen"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Netzbetreiber"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Zugangspunkte (APNs)"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Erweiterter 4G LTE-Modus"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Bevorzugte SIM für"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Jedes Mal fragen"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Auswahl erforderlich"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"SIM-Auswahl"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Einstellungen"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">%d ausgeblendete Elemente anzeigen</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"App-Benachrichtigungen"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Benachrichtigungskategorie"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Wichtigkeit"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Entscheidung der App überlassen"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Akustisches Signal erlauben"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Niemals Benachrichtigungen anzeigen"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Kein akustisches Signal und keine visuelle Unterbrechung"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Kein Ton"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Akustisches Signal ausgeben"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Akustisches Signal und Bildschirmbenachrichtigung"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Bildschirmbenachrichtigung"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Niedrig"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Mittel"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Hoch"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Dringend"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Ton erlauben"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Diese Benachrichtigungen nicht auf dem aktuellen Bildschirm einblenden und keinen Ton sowie keine Vibration dafür erzeugen."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Unterbrechungen zulassen"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Die App darf Töne sowie Vibrationen erzeugen und/oder Pop-up-Benachrichtigungen auf dem Bildschirm einblenden"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Geringe Wichtigkeit"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Mittlere Wichtigkeit"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Hohe Wichtigkeit"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"bib, bild in bild, bild, in"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Bild im Bild"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Bild im Bild zulassen"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Während die App geöffnet ist oder nachdem du sie verlässt (z. B. um ein Video weiter anzusehen) öffnet die App ein Bild-im-Bild-Fenster. Das Fenster wird über anderen Apps eingeblendet, die du gerade verwendest."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Während die App geöffnet ist oder nachdem du sie verlässt (z. B. um ein Video weiter anzusehen), öffnet die App ein Bild-im-Bild-Fenster. Das Fenster wird über anderen Apps eingeblendet, die du gerade verwendest."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Zugriff während \"Nicht stören\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Keine installierte App hat während \"Nicht stören\" Zugriff angefordert."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Apps werden geladen..."</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Dateien übertragen"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Fotos übertragen (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Gerät als MIDI verwenden"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS spiegeln"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Hintergrundprüfung"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Vollständiger Zugriff auf Hintergrund"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Text auf Bildschirm verwenden"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Zeitplan für Nachtlicht einrichten"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Display als Einschlafhilfe gelb färben"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Das Nachtlicht ist eingeschaltet"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Der Bildschirm ist gelb gefärbt. Das kann dir beim Einschlafen helfen."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Vorschläge"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Kältere Displayfarben verwenden"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Deaktiviere den Bildschirm, um die neue Farbeinstellung zu übernehmen"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Gerät neu starten, damit die Änderungen bei Telephony Monitor wirksam werden"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Gerät neu starten, damit die Änderungen bei Kamera HAL HDR+ wirksam werden"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kamera-Lasersensor"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatische Systemupdates"</string>
     <string name="usage" msgid="2977875522080448986">"Nutzung"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobile Datennutzung"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Warnlimit für mobile Daten"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Datenlimit festlegen"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datenlimit"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> im Zeitraum <xliff:g id="ID_2">%2$s</xliff:g> genutzt"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"Datennutzung im Zeitraum <xliff:g id="ID_2">%2$s</xliff:g>: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurieren"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Weitere bei der Nutzung mitgerechnete Apps"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Löschen und wechseln"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Zugriffsbegrenzung im ShortcutManager zurücksetzen"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Zugriffsbegrenzung im ShortcutManager zurückgesetzt"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Sperrbildschirm-Benachr. verwalten"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Infos auf Sperrbildschirm festlegen"</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="8483187649355540109">"Support &amp; Tipps"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Keine installierte App hat Zugriff auf Premium-SMS angefordert."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Bei Premium-SMS können Kosten entstehen, die über den Mobilfunkanbieter abgerechnet werden. Wenn du für eine App Premium-SMS zulässt, kannst du aus ihr Premium-SMS versenden."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Zugriff auf Premium-SMS"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Für andere Geräte nicht sichtbar"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Aus"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Mit <xliff:g id="ID_1">%1$s</xliff:g> verbunden"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Mit mehreren Geräten verbunden"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Demomodus der System-UI"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Instant-Apps"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Links in Apps öffnen, selbst wenn diese nicht installiert sind"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Instant-Apps"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Instant-Apps-Konto"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Android Instant Apps-Einstellungen"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installierte Apps"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Dein Speicher wird jetzt vom Speichermanager verwaltet"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Konten für <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Durchgehend aktives VPN wurde für dein persönliches Profil aktiviert"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Durchgehend aktives VPN wurde für dein Arbeitsprofil aktiviert"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globaler HTTP-Proxy wurde eingerichtet"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Vertrauenswürdige Anmeldedaten"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Vertrauenswürdige Anmeldedaten"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Vertrauenswürdige Anmeldedaten in deinem privaten Profil"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Vertrauenswürdige Anmeldedaten in deinem Arbeitsprofil"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Mindestens <xliff:g id="COUNT_1">%d</xliff:g> CA-Zertifikate</item>
       <item quantity="one">Mindestens <xliff:g id="COUNT_0">%d</xliff:g> CA-Zertifikat</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informationen zur Nutzerverwaltung durch den Anbieter"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Nutzerverwaltung durch den Anbieter auslösen"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Was gibt\'s Neues?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Die fünf besten Funktionen"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Lass dir zeigen, was dein neues Smartphone alles kann"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Lass dir zeigen, was dein neues Tablet alles kann"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Lass dir zeigen, was dein neues Gerät alles kann"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Diese Funktion ist auf diesem Gerät nicht verfügbar"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS-Registrierungsstatus"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Registriert"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Nicht registriert"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 0a4ddbb..b4ce2a0 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s επιθυμεί να αποκτήσει πρόσβαση στα μηνύματά σας. Παραχώρηση πρόσβασης σε %2$s;"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Αίτημα πρόσβασης SIM"</string>
     <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="bluetooth_device_name_summary" msgid="4757990010751789977">"Ορατή ως \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" σε άλλες συσκευές"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Ορατή ως \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" σε άλλες συσκευές"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Οι συσκευές σας"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Σύζευξη νέας συσκευής"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Ημερομηνία &amp; ώρα"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"Επόμενο"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Παράβλεψη δακτ. αποτυπώματος;"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Απαιτούνται ένα έως δύο λεπτά για τη ρύθμιση δακτυλικού αποτυπώματος. Εάν παραβλέψετε αυτό το βήμα, μπορείτε να προσθέσετε το δακτυλικό αποτύπωμά σας αργότερα στις ρυθμίσεις."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Παράβλεψη κλειδώματος οθόνης;"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Οι λειτουργίες προστασίας συσκευής δεν θα ενεργοποιηθούν. Δεν θα μπορείτε να αποτρέψετε άλλους χρήστες από τη χρήση αυτού του tablet εάν χαθεί, κλαπεί ή επαναφερθεί."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Οι λειτουργίες προστασίας συσκευής δεν θα ενεργοποιηθούν. Δεν θα μπορείτε να αποτρέψετε άλλους χρήστες από τη χρήση αυτής της συσκευής εάν χαθεί, κλαπεί ή επαναφερθεί."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Οι λειτουργίες προστασίας συσκευής δεν θα ενεργοποιηθούν. Δεν θα μπορείτε να αποτρέψετε άλλους χρήστες από τη χρήση αυτού του τηλεφώνου εάν χαθεί, κλαπεί ή επαναφερθεί."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Έχετε προσθέσει τον μέγιστο αριθμό δακτυλικών αποτυπωμάτων"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Δεν είναι δυνατή η προσθήκη περισσότερων δακτυλικών αποτυπωμάτων"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Κατάργηση όλων των δακτυλικών αποτυπωμάτων;"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Κατάργηση \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Θέλετε να διαγράψετε αυτό το δακτυλικό αποτύπωμα;"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Δεν θα μπορείτε να χρησιμοποιήσετε τα δακτυλικά σας αποτυπώματα για να ξεκλειδώσετε το τηλέφωνό σας, να εξουσιοδοτήσετε αγορές ή να συνδεθείτε μαζί τους σε εφαρμογές"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Δεν θα μπορείτε να χρησιμοποιήσετε τα δακτυλικά σας αποτυπώματα για να ξεκλειδώσετε το προφίλ εργασίας σας, να εξουσιοδοτήσετε αγορές ή να συνδεθείτε σε εφαρμογές εργασίας"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Ναι, κατάργηση"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Προστατέψτε το tablet σας"</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="5585650064305600578">"Για πρόσθετη ασφάλεια, ρυθμίστε μια εφεδρική μέθοδο κλειδώματος οθόνης"</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Για πρόσθετη ασφάλεια, ρυθμίστε μια εφεδρική μέθοδο κλειδώματος οθόνης"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Αποτρέψτε άλλους από τη χρήση αυτού του tablet χωρίς την άδειά σας ενεργοποιώντας τις λειτουργίες προστασίας συσκευής. Επιλέξτε το κλείδωμα οθόνης που θέλετε να χρησιμοποιήσετε."</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>
@@ -497,37 +502,37 @@
     <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_fingerprint" msgid="8212242533942400457">"Οι λειτουργίες προστασίας της συσκευής δεν θα λειτουργούν χωρίς το μοτίβο σας.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Οι λειτουργίες προστασίας συσκευής δεν θα λειτουργούν χωρίς το μοτίβο σας.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Τα αποθηκευμένα μοναδικά χαρακτηριστικά σας θα καταργηθούν επίσης από αυτήν τη συσκευή και δεν θα έχετε τη δυνατότητα να ξεκλειδώσετε το τηλέφωνό σας, να εξουσιοδοτήσετε αγορές ή να συνδεθείτε σε εφαρμογές με αυτά\"."</string>
+</xliff:g>Τα αποθηκευμένα δακτυλικά αποτυπώματά σας θα καταργηθούν επίσης από αυτήν τη συσκευή και δεν θα μπορείτε να ξεκλειδώσετε το τηλέφωνό σας, να εξουσιοδοτήσετε αγορές ή να συνδεθείτε σε εφαρμογές με αυτά."</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">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Οι λειτουργίες προστασίας συσκευής δεν θα λειτουργούν χωρίς τον αριθμό σας PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Τα αποθηκευμένα μοναδικά χαρακτηριστικά σας θα καταργηθούν επίσης από αυτήν τη συσκευή και δεν θα έχετε τη δυνατότητα να ξεκλειδώσετε το τηλέφωνό σας, να εξουσιοδοτήσετε αγορές ή να συνδεθείτε σε εφαρμογές με αυτά\"."</string>
+</xliff:g>Τα αποθηκευμένα δακτυλικά αποτυπώματά σας θα καταργηθούν επίσης από αυτήν τη συσκευή και δεν θα μπορείτε να ξεκλειδώσετε το τηλέφωνό σας, να εξουσιοδοτήσετε αγορές ή να συνδεθείτε σε εφαρμογές με αυτά."</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Οι λειτουργίες προστασίας συσκευής δεν θα λειτουργούν χωρίς τον κωδικό πρόσβασής σας.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Τα αποθηκευμένα μοναδικά χαρακτηριστικά σας θα καταργηθούν επίσης από αυτήν τη συσκευή και δεν θα έχετε τη δυνατότητα να ξεκλειδώσετε το τηλέφωνό σας, να εξουσιοδοτήσετε αγορές ή να συνδεθείτε σε εφαρμογές με αυτά\"."</string>
+</xliff:g>Τα αποθηκευμένα δακτυλικά αποτυπώματά σας θα καταργηθούν επίσης από αυτήν τη συσκευή και δεν θα μπορείτε να ξεκλειδώσετε το τηλέφωνό σας, να εξουσιοδοτήσετε αγορές ή να συνδεθείτε σε εφαρμογές με αυτά."</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Οι λειτουργίες προστασίας συσκευής δεν θα λειτουργούν χωρίς το κλείδωμα οθόνης σας.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Τα αποθηκευμένα μοναδικά χαρακτηριστικά σας θα καταργηθούν επίσης από αυτήν τη συσκευή και δεν θα έχετε τη δυνατότητα να ξεκλειδώσετε το τηλέφωνό σας, να εξουσιοδοτήσετε αγορές ή να συνδεθείτε σε εφαρμογές με αυτά\"."</string>
+</xliff:g>Τα αποθηκευμένα δακτυλικά αποτυπώματά σας θα καταργηθούν επίσης από αυτήν τη συσκευή και δεν θα μπορείτε να ξεκλειδώσετε το τηλέφωνό σας, να εξουσιοδοτήσετε αγορές ή να συνδεθείτε σε εφαρμογές με αυτά."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Οι λειτουργίες προστασίας προφίλ δεν θα λειτουργούν χωρίς το μοτίβο σας."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Οι λειτουργίες προστασίας προφίλ δεν θα λειτουργούν χωρίς το μοτίβο σας.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Οι λειτουργίες προστασίας προφίλ δεν θα λειτουργούν χωρίς το μοτίβο σας.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Θα καταργηθούν επίσης από αυτό το προφίλ τα δακτυλικά αποτυπώματα που έχετε αποθηκεύσει και δεν θα μπορείτε να ξεκλειδώσετε το προφίλ σας, να εξουσιοδοτείτε αγορές ή να έχετε πρόσβαση σε εφαρμογές με αυτά\"."</string>
+</xliff:g>Τα αποθηκευμένα δακτυλικά αποτυπώματά σας θα καταργηθούν επίσης από αυτό το προφίλ και δεν θα μπορείτε να ξεκλειδώσετε το προφίλ σας, να εξουσιοδοτήσετε αγορές ή να συνδεθείτε σε εφαρμογές με αυτά."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Οι λειτουργίες προστασίας προφίλ δεν θα λειτουργούν χωρίς το PIN σας."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Οι λειτουργίες προστασίας προφίλ δεν θα λειτουργούν χωρίς το PIN σας.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Οι λειτουργίες προστασίας προφίλ δεν θα λειτουργούν χωρίς τον αριθμό σας PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Θα καταργηθούν επίσης από αυτό το προφίλ τα δακτυλικά αποτυπώματα που έχετε αποθηκεύσει και δεν θα μπορείτε να ξεκλειδώσετε το προφίλ σας, να εξουσιοδοτείτε αγορές ή να έχετε πρόσβαση σε εφαρμογές με αυτά\"."</string>
+</xliff:g>Τα αποθηκευμένα δακτυλικά αποτυπώματά σας θα καταργηθούν επίσης από αυτό το προφίλ και δεν θα μπορείτε να ξεκλειδώσετε το προφίλ σας, να εξουσιοδοτήσετε αγορές ή να συνδεθείτε σε εφαρμογές με αυτά."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Οι λειτουργίες προστασίας προφίλ δεν θα λειτουργούν χωρίς τον κωδικό πρόσβασής σας."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Οι λειτουργίες προστασίας προφίλ δεν θα λειτουργούν χωρίς τον κωδικό πρόσβασής σας.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Οι λειτουργίες προστασίας προφίλ δεν θα λειτουργούν χωρίς τον κωδικό πρόσβασής σας.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Θα καταργηθούν επίσης από αυτό το προφίλ τα δακτυλικά αποτυπώματα που έχετε αποθηκεύσει και δεν θα μπορείτε να ξεκλειδώσετε το προφίλ σας, να εξουσιοδοτείτε αγορές ή να έχετε πρόσβαση σε εφαρμογές με αυτά\"."</string>
+</xliff:g>Τα αποθηκευμένα δακτυλικά αποτυπώματά σας θα καταργηθούν επίσης από αυτό το προφίλ και δεν θα μπορείτε να ξεκλειδώσετε το προφίλ σας, να εξουσιοδοτήσετε αγορές ή να συνδεθείτε σε εφαρμογές με αυτά."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Οι λειτουργίες προστασίας προφίλ δεν θα λειτουργούν χωρίς το κλείδωμα οθόνης σας."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Οι λειτουργίες προστασίας προφίλ δεν θα λειτουργούν χωρίς το κλείδωμα οθόνης σας.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Οι λειτουργίες προστασίας προφίλ δεν θα λειτουργούν χωρίς το κλείδωμα οθόνης σας.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Θα καταργηθούν επίσης από αυτό το προφίλ τα δακτυλικά αποτυπώματα που έχετε αποθηκεύσει και δεν θα μπορείτε να ξεκλειδώσετε το προφίλ σας, να εξουσιοδοτείτε αγορές ή να έχετε πρόσβαση σε εφαρμογές με αυτά\"."</string>
+</xliff:g>Τα αποθηκευμένα δακτυλικά αποτυπώματά σας θα καταργηθούν επίσης από αυτό το προφίλ και δεν θα μπορείτε να ξεκλειδώσετε το προφίλ σας, να εξουσιοδοτήσετε αγορές ή να συνδεθείτε σε εφαρμογές με αυτά."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Ναι, κατάργηση"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Αλλαγή μοτίβου ξεκλειδώματος"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Αλλαγή αριθμού PIN ξεκλειδώματος"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Δεν επιτρέπεται η αύξουσα, φθίνουσα ή επαναλαμβανόμενη ακολουθία ψηφίων"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ΟΚ"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Ακύρωση"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Διαγραφή"</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>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Διαθέσιμο WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Διαθέσιμο WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Εισαγάγετε κωδικό πρόσβασης δικτύου"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Δίκτυο Wi‑Fi εταιρείας κιν. τηλεφωνίας"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Σύνδεση μέσω <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Για τη βελτίωση της ακρίβειας της τοποθεσίας σας και για άλλους σκοπούς, η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> επιθυμεί να ενεργοποιήσει τη σάρωση δικτύων, ακόμη και όταν το Wi-Fi είναι απενεργοποιημένο.\n\nΝα επιτρέπεται αυτή η ενέργεια για όλες τις εφαρμογές που επιθυμούν σάρωση;"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Για να το απενεργοποιήσετε, μεταβείτε στις Σύνθετες ρυθμίσεις, στο μενού υπερχείλισης."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Να επιτρέπεται"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Σύνδεση"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Αποτυχία σύνδεσης στο δίκτυο"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Διαγραφή"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Τροποποίηση"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Αποτυχία κατάργησης απομνημόνευσης δικτύου"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Αποθήκευση"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Αποτυχία αποθήκευσης δικτύου"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Σύνθετο Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Διεύθυνση MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Διεύθυνση IP"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Πληροφορίες δικτύου"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Μάσκα υποδικτύου"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Διευθύνσεις IPv6"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Ακύρωση πρόσκλησης;"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Θέλετε να ακυρώσετε την πρόσκληση για τη σύνδεση με τη συσκευή <xliff:g id="PEER_NAME">%1$s</xliff:g>;"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Διαγραφή αυτής της ομάδας;"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Φορητό σημείο πρόσβασης Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Σημείο πρόσβασης Wi-Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Δεν γίνεται κοινή χρήση διαδικτύου ή περιεχομένου με άλλες συσκευές"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Γίνεται κοινή χρήση της σύνδεσης αυτού του tablet στο διαδίκτυο μέσω σημείου πρόσβασης Wi-Fi"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Γίνεται κοινή χρήση της σύνδεσης αυτού του τηλεφώνου στο διαδίκτυο μέσω σημείου πρόσβασης Wi-Fi"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Η εφαρμογή μοιράζεται περιεχόμενο. Για να μοιραστείτε τη σύνδεση στο διαδίκτυο, απενεργοποιήστε το σημείο πρόσβασης Wi-Fi και, στη συνέχεια, ενεργοποιήστε το"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Όνομα Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Όνομα σημείου πρόσβασης Wi-Fi"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Ενεργοποίηση σημείου πρόσβασης Wi-Fi <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Είναι δυνατή η σύνδεση άλλων συσκευών στο σημείο πρόσβασης Wi-Fi <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Κωδικός πρόσβασης Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Κωδικός σημείου πρόσβασης Wi-Fi"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Ζώνη σημείου πρόσβασης"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Χρησιμοποιήστε σημείο πρόσβασης Wi-Fi, για να δημιουργήσετε ένα δίκτυο Wi-Fi για τις άλλες συσκευές σας. Το σημείο πρόσβασης Wi-Fi παρέχει πρόσβαση στο διαδίκτυο χρησιμοποιώντας τη σύνδεση δεδομένων κινητής τηλεφωνίας. Ενδέχεται να ισχύουν επιπρόσθετες χρεώσεις δεδομένων κινητής τηλεφωνίας."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Οι εφαρμογές μπορούν να δημιουργούν ένα σημείο πρόσβασης Wi-Fi, για να μοιράζονται περιεχόμενο με κοντινές συσκευές."</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Όταν είναι ενεργοποιημένη η λειτουργία κλήσης μέσω Wi-Fi, το τηλέφωνό σας μπορεί να δρομολογεί κλήσεις μέσω δικτύων Wi-Fi ή του δικτύου της εταιρείας κινητής τηλεφωνίας, ανάλογα με την προτίμησή σας και την ισχύ του κάθε σήματος. Πριν ενεργοποιήσετε τη λειτουργία, ρωτήστε την εταιρεία κινητής τηλεφωνίας για να μάθετε σχετικά με τις χρεώσεις και άλλες λεπτομέρειες."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Ενημέρωση διεύθυνσης έκτακτης ανάγκης"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"Η διεύθυνση που χρησιμοποιείται από τις υπηρεσίες έκτακτης ανάγκης, ως η τοποθεσία σας εάν πραγματοποιήσετε μια κλήση στο 911 χρησιμοποιώντας Wi-Fi"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"Η διεύθυνση που θα χρησιμοποιηθεί από τις υπηρεσίες έκτακτης ανάγκης ως η τοποθεσία σας εάν πραγματοποιήσετε μια κλήση έκτακτης ανάγκης μέσω Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Προβολή"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ήχος"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Ρυθμίσεις έντασης"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Αναζήτηση"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Διαχείριση ρυθμίσεων αναζήτησης και ιστορικού"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Δεν υπάρχουν αποτελέσματα"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Διαγραφή ιστορικού"</string>
     <string name="display_settings" msgid="7965901687241669598">"Προβολή"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Αυτόματη περιστροφή οθόνης"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Έντονα χρώματα"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Επαναφορά προεπιλεγμένων ρυθμίσεων APN."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Επαναφορά στις προεπιλογές"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Η επαναφορά των προεπιλογών APN ολοκληρώθηκε."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Επαναφορά"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Επ/ρά ρυθμίσεων δ."</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Επαναφορά επιλογών"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Μπορεί να γίνει επαναφορά δικτύου, εφαρμογών ή συσκευής"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Επαναφ. Wi-Fi/mobile/Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Με αυτόν τον τρόπο θα γίνει επαναφορά όλων των ρυθμίσεων δικτύου, μεταξύ των οποίων για:\n\n"<li>"Wi‑Fi"</li>\n<li>"Δεδομένα κινητής τηλεφωνίας"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Επαναφορά ρυθμίσεων"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Επαναφορά όλων των ρυθμίσεων δικτύου; Δεν είναι δυνατή η αναίρεση αυτής της ενέργειας!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Να γίνει επαναφορά;"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Η επαναφορά δικτύου δεν είναι διαθέσιμη γι\' αυτόν το χρήστη"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Έγινε επαναφορά των ρυθμίσεων δικτύου."</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Επ/φορά εργοστ/κών δεδ."</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other">Θα γίνει επαναφορά <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> λογαριασμών</item>
-      <item quantity="one">Θα γίνει επαναφορά 1 λογαριασμού</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Θα γίνει επαναφορά του εσωτερικού αποθηκευτικού χώρου και όλων των δεδομένων"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Διαγραφή δεδ. (επαναφορά)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Με αυτόν τον τρόπο, θα διαγραφούν όλα τα δεδομένα από τον "<b>"εσωτερικό χώρο αποθήκευσης"</b>" της συσκευής σας tablet, συμπεριλαμβανομένων:\n\nΤων δεδομένων και των ρυθμίσεων συστήματος "<li>"του Λογαριασμού σας Google "</li>\n<li></li>\n<li>"Ληφθείσες εφαρμογές"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Με αυτόν τον τρόπο, θα διαγραφούν όλα τα δεδομένα από τον "<b>"εσωτερικό χώρο αποθήκευσης"</b>" της συσκευής σας tablet, συμπεριλαμβανομένων:\n\nΤων δεδομένων και των ρυθμίσεων συστήματος "<li>"του Λογαριασμού σας Google "</li>\n<li></li>\n<li>"Ληφθείσες εφαρμογές"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Αυτήν τη στιγμή είστε συνδεδεμένοι στους παρακάτω λογαριασμούς:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Πληροφορίες ασφάλειας"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Δεν είστε συνδεδεμένοι σε υπηρεσία δεδομένων. Για να προβάλετε αυτές τις πληροφορίες τώρα, μεταβείτε στο %s από οποιονδήποτε υπολογιστή με σύνδεση στο Διαδίκτυο."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Φόρτωση..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Επιλέξτε τον κωδικό πρ/σης"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ορισμός κλειδώματος οθόνης"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Για λόγους ασφαλείας, ορίστε έναν κωδικό πρόσβασης"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Για χρήση δακτ. αποτ. ορίστε κωδ. πρόσβ."</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Επιλέξτε το μοτίβο σας"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Για χρήση δακτ. αποτ. ορίστε μοτίβο"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Επιλέξτε τον αριθμό PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Για λόγους ασφαλείας, ορίστε έναν αριθμό PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Για χρήση δακτ. αποτ. ορίστε αρ. PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Επιβεβαιώστε τον κωδικό πρόσβασης"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Εισαγάγετε ξανά τον κωδικό πρόσβασής σας"</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_pin_header" msgid="7744513791910572550">"Εισαγάγετε ξανά τον αριθμό 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>
@@ -1483,12 +1490,18 @@
     <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_strong_auth_required_device_pattern" msgid="530802132223800623">"Για πρόσθετη ασφάλεια, εισαγάγετε το μοτίβο της συσκευής σας"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Για πρόσθετη ασφάλεια, εισαγάγετε τον αριθμό PIN της συσκευής σας"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Για πρόσθετη ασφάλεια, εισαγάγετε τον κωδικό πρόσβασης της συσκευής σας"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Για πρόσθετη ασφάλεια, εισαγάγετε το μοτίβο εργασίας σας"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Για πρόσθετη ασφάλεια, εισαγάγετε τον αριθμό PIN εργασίας σας"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Για πρόσθετη ασφάλεια, εισαγάγετε τον κωδικό πρόσβασης εργασίας σας"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Έγινε επαναφορά των εργοστασιακών ρυθμίσεων του τηλεφώνου. Εισαγάγετε το παλιό μοτίβο."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Έγινε επαναφορά των εργοστασιακών ρυθμίσεων του τηλεφώνου. Εισαγάγετε τον παλιό κωδικό PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Έγινε επαναφορά των εργοστασιακών ρυθμίσεων του τηλεφώνου. Εισαγάγετε τον παλιό κωδικό πρόσβασης."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Επαλήθευση μοτίβου"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Επιβεβαίωση κωδικού PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Επαλήθευση κωδικού πρόσβασης"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Λανθασμένος κωδικός PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Λανθασμένος κωδικός πρόσβασης"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Λάθος μοτίβο"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Να γίνει δημιουργία γραφικού στοιχείου και να επιτρέπεται η πρόσβαση;"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Αφού δημιουργήσετε το γραφικό στοιχείο, ο κεντρικός υπολογιστής <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> θα μπορεί να αποκτά πρόσβαση σε όλα τα δεδομένα που προβάλλει."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Να επιτρέπεται πάντα στον κεντρικό υπολογιστή <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> η δημιουργία γραφικών στοιχείων και η πρόσβαση στα δεδομένα τους"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>η <xliff:g id="HOURS">%2$d</xliff:g>ω <xliff:g id="MINUTES">%3$d</xliff:g>λ <xliff:g id="SECONDS">%4$d</xliff:g>δ"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>ω <xliff:g id="MINUTES">%2$d</xliff:g>λ <xliff:g id="SECONDS">%3$d</xliff:g>δ"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>λ <xliff:g id="SECONDS">%2$d</xliff:g>δ"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>δ"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"Στατιστικά χρήσης"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Στατιστικά χρήσης"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Ταξινόμηση με βάση:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Στοιχεία ελέγχου αναγνωστών οθόνης, οθόνης, αλληλεπίδρασης"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Ρυθμίσεις όρασης"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Μπορείτε να προσαρμόσετε αυτήν τη συσκευή σύμφωνα με τις ανάγκες σας. Οι λειτουργίες προσβασιμότητας μπορούν να τροποποιηθούν αργότερα από τις ρυθμίσεις."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Αύξηση μεγέθους γραμματοσειράς"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Αλλαγή μεγέθους γραμματοσειράς"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Αναγνώστες οθόνης"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Ήχος και κείμενο στην οθόνη"</string>
     <string name="display_category_title" msgid="685461049938269166">"Οθόνη"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><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_screen_magnification_navbar_summary" msgid="1996584694050087161">"Όταν είναι ενεργοποιημένη η μεγέθυνση, χρησιμοποιήστε το κουμπί Προσβασιμότητας που βρίσκεται στο κάτω τμήμα της οθόνης, για να κάνετε γρήγορη μεγέθυνση.\n\n"<b>"Για να κάνετε εστίαση"</b>", πατήστε το κουμπί Προσβασιμότητας και έπειτα πατήστε οπουδήποτε στην οθόνη.\n"<ul><li>"Σύρετε 2 ή περισσότερα δάχτυλα για να κάνετε κύλιση"</li>\n<li>"Πλησιάστε 2 ή περισσότερα δάχτυλα για να προσαρμόσετε την εστίαση"</li></ul>\n\n<b>"Για προσωρινή εστίαση"</b>", πατήστε το εικονίδιο Προσβασιμότητας και έπειτα αγγίξτε παρατεταμένα οπουδήποτε στην οθόνη.\n"<ul><li>"Σύρετε για να την μετακινήσετε σε οποιοδήποτε σημείο της οθόνης"</li>\n<li>"Ανασηκώστε το δάχτυλο για να κάνετε σμίκρυνση"</li></ul>\n\n"Δεν είναι δυνατή η μεγέθυνση στο πληκτρολόγιο ή στη γραμμή πλοήγησης."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Το κουμπί Προσβασιμότητας έχει οριστεί σε <xliff:g id="SERVICE">%1$s</xliff:g>. Για να χρησιμοποιήσετε τη μεγέθυνση, αγγίξτε παρατεταμένα το κουμπί Προσβασιμότητας και έπειτα επιλέξτε να κάνετε μεγέθυνση."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Συντόμευση προσβασιμότητας"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Συντόμευση κουμπιού έντασης ήχου"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Υπηρεσία συντόμευσης"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Να επιτρέπεται από οθ. κλειδώματος"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Όταν είναι ενεργή η συντόμευση, μπορείτε να πατήσετε και τα δύο κουμπιά έντασης ήχου για 3 δευτερόλεπτα, για να ξεκινήσει μια λειτουργία προσβασιμότητας."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Όταν είναι ενεργή η συντόμευση, μπορείτε να πατήσετε και τα δύο κουμπιά έντασης ήχου για 3 δευτερόλεπτα, για να ξεκινήσει μια λειτουργία προσβασιμότητας."</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">"Αυτόματη ενημέρωση μεγέθυνσης οθόν."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Ενημέρωση μεγέθυνσης οθόνης στις μεταβάσεις εφαρμ."</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Ενδέχεται να επηρεάσει την απόδοση"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Κλικ αφού σταμ/σει ο δείκ."</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Καθυστέρηση πριν από το κλικ"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ΕΝΕΡΓΟΠΟΙΗΣΗ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ΑΠΕΝΕΡΓΟΠΟΙΗΣΗ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Εμφάνιση στις Γρήγορες ρυθμίσεις"</string>
@@ -2358,6 +2363,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Διαχείριση προγραμμάτων"</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>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Δίκτυα κινητής τηλεφωνίας"</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_metered_auto" msgid="1262028400911918865">"Αυτόματα"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Με περιορισμούς"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Χωρίς περιορισμούς"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Ο υπολογισμός δεδ.της εταιρείας κιν.τηλ. μπορεί να διαφέρει από τη συσκευή σας."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Κλήση έκτακτης ανάγκης"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Επιστροφή στην κλήση"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Διαχειριστής κλήσεων"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Εκπομπές έκτακτης ανάγκης"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Ειδοποιήσεις έκτακτης ανάγκης"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Εταιρείες δικτύου"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Ονόματα σημείων πρόσβασης"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Βελτιωμένη λειτουργία 4G LTE"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Προτιμώμενη SIM για"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Ερώτηση κάθε φορά"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Απαιτείται επιλογή"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Επιλογή SIM"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Ρυθμίσεις"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">Εμφάνιση %d κρυφών στοιχείων</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Ειδοπ/σεις εφ/γών"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Κατηγορία ειδοποιήσεων"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Βαρύτητα"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Να αποφασίσει η εφαρμογή"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Να επιτρέπεται ο ήχος"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Να μην εμφανίζονται ποτέ ειδοποιήσεις"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Χωρίς ηχητική ή οπτική διακοπή"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Χωρίς ήχο"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Αναπαραγωγή ήχου"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Αναπαραγωγή ήχου και εμφάνιση στην οθόνη"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Εμφάνιση στην οθόνη"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Χαμηλή"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Μεσαία"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Υψηλή"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Επείγον"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Να επιτρέπεται ο ήχος"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Να μην συνοδεύονται αυτές οι ειδοποιήσεις από ήχο, δόνηση ή προβολή σε αναδυόμενο παράθυρο κατά την προβολή τους στην τρέχουσα οθόνη."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Να επιτρέπονται οι διακοπές"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Επιτρέψτε στην εφαρμογή να εμφανίζει ειδοποιήσεις με ήχο, δόνηση ή/και αναδυόμενο παράθυρο στην οθόνη"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Μικρής βαρύτητας"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Μεσαίας βαρύτητας"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Μεγάλης βαρύτητας"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip picture in"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Λειτουργία Picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Να επιτρέπεται η λειτουργία picture-in-picture"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Να επιτρέπεται σε αυτήν την εφαρμογή να δημιουργεί ένα παράθυρο picture-in-picture ενώ η εφαρμογή είναι ανοικτή ή αφού αποχωρήσετε από αυτή (για παράδειγμα, για να συνεχίσετε να παρακολουθείτε ένα βίντεο). Αυτό το παράθυρο εμφανίζεται στο επάνω μέρος άλλων εφαρμογών που χρησιμοποιείτε."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Να επιτρέπεται σε αυτήν την εφαρμογή να δημιουργεί ένα παράθυρο παράθεσης εικόνων ενώ η εφαρμογή είναι ανοικτή ή αφού αποχωρήσετε από αυτήν (για παράδειγμα, για να συνεχίσετε να παρακολουθείτε κάποιο βίντεο). Αυτό το παράθυρο εμφανίζεται στην κορυφή άλλων εφαρμογών που χρησιμοποιείτε."</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>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Μεταφορά αρχείων"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Μεταφορά φωτογραφιών (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Χρήση συσκευής ως MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS mirroring"</string>
     <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>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Ρύθμιση χρονοδιαγράμματος Νυχτερινού φωτισμού"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Αλλαγή χρωματισμού οθόνης σε ζεστό κίτρινο για να αποκοιμηθείτε πιο εύκολα"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Νυχτερινός φωτισμός ενεργός"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Το χρώμα της οθόνης γίνεται ζεστό κίτρινο. Αυτό μπορεί να σας βοηθήσει να αποκοιμηθείτε."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Προτάσεις"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Χρήση πιο ψυχρών χρωμάτων οθόνης"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Για να εφαρμόσετε μια αλλαγή στο χρώμα, απενεργοποιήστε την οθόνη"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Για να πραγματοποιήσετε αλλαγές στην παρακολούθηση τηλεφωνίας, επανεκκινήστε τη συσκευή"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HDR+ HAL κάμερας"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Για να πραγματοποιήσετε αλλαγές στο HDR+ HAL κάμερας, επανεκκινήστε τη συσκευή"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Αισθητήρας λέιζερ κάμερας"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Αυτόματες ενημερώσεις συστήματος"</string>
     <string name="usage" msgid="2977875522080448986">"Χρήση"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Χρήση δεδ. κιν. τηλεφ."</string>
@@ -3410,7 +3427,7 @@
     <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="data_usage_template" msgid="2923744765873163859">"Χρησιμοποιήθηκαν <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">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Διαγραφή και μετατροπή"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Επαναφορά ορίου ρυθμού ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Έγινε επαναφορά του ορίου ρυθμού ShortcutManager"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Έλεγχος ειδοποιήσεων κλειδώματος οθόνης"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Έλεγχος πληροφοριών στην οθόνη κλειδώματος"</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="8483187649355540109">"Υποστήριξη και συμβουλές"</string>
@@ -3487,7 +3504,7 @@
     <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 Premium"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Μη ορατό σε άλλες συσκευές"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Ανενεργό"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Σε σύνδεση στη συσκευή <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Σε σύνδεση σε πολλές συσκευές"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Λειτουργία επίδειξης διεπαφής χρήστη συστήματος"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Instant Εφαρμογές"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Άνοιγμα συνδέσμων σε εφαρμογές, ακόμα και αν δεν είναι εγκατεστημένες"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Instant Εφαρμογές"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Λογαριασμός Instant Εφαρμογών"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Προτιμήσεις Instant Εφαρμογών"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Εγκατεστημένες εφαρμογές"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Στο εξής, γίνεται διαχείριση του αποθηκευτικού σας χώρου από τον διαχειριστή αποθηκευτικού χώρου"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Λογαριασμοί για τον χρήστη <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Η λειτουργία \"Μονίμως ενεργό VPN\" είναι ενεργοποιημένη στο προσωπικό προφίλ σας"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Η λειτουργία \"Μονίμως ενεργό VPN\" είναι ενεργοποιημένη στο προφίλ εργασίας σας"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Ο γενικός διακομιστής μεσολάβησης HTTP ορίστηκε"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Αξιόπιστα διαπιστευτήρια"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Αξιόπιστα διαπιστευτήρια"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Αξιόπιστα διαπιστευτήρια στο προσωπικό προφίλ σας"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Αξιόπιστα διαπιστευτήρια στο προφίλ εργασίας σας"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Τουλάχιστον <xliff:g id="COUNT_1">%d</xliff:g> πιστοποιητικά CA</item>
       <item quantity="one">Τουλάχιστον <xliff:g id="COUNT_0">%d</xliff:g> πιστοποιητικό CA</item>
@@ -3658,7 +3677,7 @@
       <item quantity="one">Εφαρμογή κάμερας</item>
     </plurals>
     <string name="default_calendar_app_title" msgid="3545972964391065220">"Εφαρμογή ημερολογίου"</string>
-    <string name="default_contacts_app_title" msgid="3497370557378660098">"Εφαρμογή επαφών"</string>
+    <string name="default_contacts_app_title" msgid="3497370557378660098">"Εφαρμογή Επαφές"</string>
     <plurals name="default_email_app_title" formatted="false" msgid="42826975161049245">
       <item quantity="other">Εφαρμογές ηλεκτρ. ταχυδρομείου</item>
       <item quantity="one">Εφαρμογή ηλεκτρ. ταχυδρομείου</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Πληροφορίες παροχής εταιρείας κινητής τηλεφωνίας"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Ενεργοποίηση παροχής εταιρείας κινητής τηλεφωνίας"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Τι νέο και συναρπαστικό υπάρχει;"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Δείτε τις κορυφαίες 5 λειτουργίες"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Περιηγηθείτε στο νέο τηλέφωνό σας"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Περιηγηθείτε στο νέο σας tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Περιηγηθείτε στη νέα συσκευή σας"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Αυτή η λειτουργία δεν είναι διαθέσιμη σε αυτήν τη συσκευή"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Κατάσταση εγγραφής υπηρεσίας IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Εγγεγραμμένη"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Μη εγγεγραμμένη"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index fee6d55..a708b37 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s wants to access your messages. Give access to %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM access request"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> wants to access your SIM card. Granting access to the SIM card will disable data connectivity on your device for the duration of the connection. Give access to <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visible as \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' to other devices"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible as “<xliff:g id="DEVICE_NAME">^1</xliff:g>” to other devices"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Your devices"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Pair new device"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Date &amp; time"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Next"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Skip fingerprint?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Fingerprint setup only takes a minute or two. If you skip this, you can add your fingerprint later in settings."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Skip screen lock?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Device protection features won’t be turned on. You won’t be able to prevent others from using this tablet if it’s lost, stolen or reset."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Device protection features won’t be turned on. You won’t be able to prevent others from using this device if it’s lost, stolen or reset."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Device protection features won’t be turned on. You won’t be able to prevent others from using this phone if it’s lost, stolen or reset."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"You’ve added the maximum number of fingerprints"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Can’t add more fingerprints"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Remove all fingerprints?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Remove \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Do you want to delete this fingerprint?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"You won\'t be able to use your fingerprints to unlock your phone, authorise purchases or sign in to apps with them"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"You won\'t be able to use your fingerprints to unlock your work profile, authorise purchases or sign in to work apps"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Yes, remove"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protect your tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protect your device"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protect your phone"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"For added security, set up a backup screen lock."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"For added security, set up a backup screen lock."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Prevent others from using this tablet without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Prevent others from using this device without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Prevent others from using this phone without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
@@ -497,37 +502,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Remove device protection?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Remove profile protection?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Device protection features will not work without your pattern."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Device protection features will not work without your pattern.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Device protection features will not work without your pattern.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Your saved fingerprints will also be removed from this device and you wont be able to unlock your phone, authorise purchases, or sign in to apps with them.\""</string>
+</xliff:g>Your saved fingerprints will also be removed from this device and you won\'t be able to unlock your phone, authorise purchases or sign in to apps with them."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Device protection features will not work without your PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Device protection features will not work without your PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Device protection features will not work without your PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Your saved fingerprints will also be removed from this device and you wont be able to unlock your phone, authorise purchases, or sign in to apps with them.\""</string>
+</xliff:g>Your saved fingerprints will also be removed from this device and you won\'t be able to unlock your phone, authorise purchases or sign in to apps with them."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Device protection features will not work without your password."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Device protection features will not work without your password.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Device protection features will not work without your password.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Your saved fingerprints will also be removed from this device and you wont be able to unlock your phone, authorise purchases, or sign in to apps with them.\""</string>
+</xliff:g>Your saved fingerprints will also be removed from this device and you won\'t be able to unlock your phone, authorise purchases or sign in to apps with them."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Device protection features will not work without your screen lock."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Device protection features will not work without your screen lock.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Device protection features will not work without your screen lock.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Your saved fingerprints will also be removed from this device and you wont be able to unlock your phone, authorise purchases, or sign in to apps with them.\""</string>
+</xliff:g>Your saved fingerprints will also be removed from this device and you won\'t be able to unlock your phone, authorise purchases or sign in to apps with them."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Profile protection features will not work without your pattern."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Profile protection features will not work without your pattern.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Profile protection features will not work without your pattern.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Your saved fingerprints will also be removed from this profile and you wont be able to unlock your profile, authorise purchases or sign in to apps with them.\""</string>
+</xliff:g>Your saved fingerprints will also be removed from this profile and you won\'t be able to unlock your profile, authorise purchases or sign in to apps with them."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Profile protection features will not work without your PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Profile protection features will not work without your PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Profile protection features will not work without your PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Your saved fingerprints will also be removed from this profile and you wont be able to unlock your profile, authorise purchases or sign in to apps with them.\""</string>
+</xliff:g>Your saved fingerprints will also be removed from this profile and you won\'t be able to unlock your profile, authorise purchases or sign in to apps with them."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Profile protection features will not work without your password."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Profile protection features will not work without your password.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Profile protection features will not work without your password.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Your saved fingerprints will also be removed from this profile and you wont be able to unlock your profile, authorise purchases or sign in to apps with them.\""</string>
+</xliff:g>Your saved fingerprints will also be removed from this profile and you won\'t be able to unlock your profile, authorise purchases or sign in to apps with them."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Profile protection features will not work without your screen lock."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Profile protection features will not work without your screen lock.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Profile protection features will not work without your screen lock.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Your saved fingerprints will also be removed from this profile and you wont be able to unlock your profile, authorise purchases or sign in to apps with them.\""</string>
+</xliff:g>Your saved fingerprints will also be removed from this profile and you won\'t be able to unlock your profile, authorise purchases or sign in to apps with them."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Yes, remove"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Change unlock pattern"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Change unlock PIN"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Ascending, descending or repeated sequence of digits isn\'t allowed"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancel"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Clear"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancel"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Next"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Set up is complete."</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS available"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS available)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Enter your network password"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Operator Wi‑Fi network"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Connect via <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"To improve location accuracy and for other purposes, <xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on network scanning, even when Wi-Fi is off.\n\nAllow this for all apps that want to scan?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"To turn this off, go to Advanced in the overflow menu."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Allow"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Connect"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Failed to connect to network"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Forget"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modify"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Failed to forget network"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Save"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Failed to save network"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Advanced Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC address"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP address"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Network info"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet mask"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 addresses"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Cancel invitation"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Do you want to cancel invitation to connect with <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Forget this group?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Portable Wi‑Fi hotspot"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi hotspot"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Not sharing Internet or content with other devices"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Sharing this tablet’s Internet connection via hotspot"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Sharing this phone’s Internet connection via hotspot"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"App is sharing content. To share Internet connection, turn hotspot off, then on"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi name"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Hotspot name"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Turning on <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Other devices can connect to <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi‑Fi password"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Hotspot password"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP band"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Use hotspot to create a Wi‑Fi network for your other devices. Hotspot provides Internet using your mobile data connection. Additional mobile data charges may apply."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Apps can create a hotspot to share content with nearby devices."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Address used by emergency services as your location if you make an emergency call using Wi‑Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Search"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Manage search settings and history"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"No results"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Clear history"</string>
     <string name="display_settings" msgid="7965901687241669598">"Display"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Auto-rotate screen"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Vivid colours"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Restoring default APN settings."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Reset to default"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Reset default APN settings completed"</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Reset"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Network settings reset"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Reset options"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Network, apps or device can be reset"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Reset Wi-Fi, mobile &amp; Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"This will reset all network settings, including:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobile data"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Reset settings"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Reset all network settings? You can\'t undo this action!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Reset?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Network reset is not available for this user"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Network settings have been reset"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Factory data reset"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> accounts will be reset</item>
-      <item quantity="one">1 account will be reset</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Internal storage &amp; all data will be reset"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Erase all data (factory reset)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"This will erase all data from your tablet\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"This will erase all data from your phone\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"You are currently signed in to the following accounts:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Safety information"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"You don\'t have a data connection. To view this information now, go to %s from any computer connected to the Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Loading…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Choose your password"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Set a screen lock"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"For security, set a password"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"To use fingerprint, set password"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Choose your pattern"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"To use fingerprint, set pattern"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Choose your PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"For security, set a PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"To use fingerprint, set PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirm your password"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Re-enter your password"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirm your pattern"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirm your PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Re-enter your PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Passwords don\'t match"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PINs don\'t match"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Unlock selection"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Use your work pattern to continue"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Enter your work PIN to continue"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Enter your work password to continue"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Use your device pattern to continue. Required after device restarts."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Enter your device PIN to continue. Required after device restarts."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Enter your device password to continue. Required after device restarts."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Use your work pattern to continue. Required after device restarts."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Enter your work PIN to continue. Required after device restarts."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Enter your work password to continue. Required after device restarts."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"For added security, use your device pattern"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"For added security, enter your device PIN"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"For added security, enter your device password"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"For added security, use your work pattern"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"For added security, enter your work PIN"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"For added security, enter your work password"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Your phone was reset to factory settings. To use this phone, enter your previous pattern."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Your phone was reset to factory settings. To use this phone, enter your previous PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Your phone was reset to factory settings. To use this phone, enter your previous password."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verify pattern"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verify PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verify password"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Wrong PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Wrong password"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Wrong pattern"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Create widget and allow access?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"After you create the widget, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> can access all the data that it displays."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Always allow <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> to create widgets and access their data"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Usage statistics"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Usage statistics"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sort by:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Screen readers, display, interaction controls"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Vision settings"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"You can customise this device to fit your needs. These accessibility features can be changed later in Settings."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Increase font size"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Change font size"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Screen readers"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio &amp; on-screen text"</string>
     <string name="display_category_title" msgid="685461049938269166">"Display"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"To zoom"</b>", quickly tap the screen 3 times.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", quickly tap the screen 3 times and hold down your finger on the third tap.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can\'t zoom in on the keyboard and navigation bar."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"When magnification is turned on, use the Accessibility button at the bottom of the screen to quickly magnify.\n\n"<b>"To zoom"</b>", tap the Accessibility button, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", tap the Accessibility button, then touch &amp; hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"The accessibility button is set to <xliff:g id="SERVICE">%1$s</xliff:g>. To use magnification, touch &amp; hold the accessibility button, then select magnification."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Accessibility shortcut"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Volume key shortcut"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Shortcut service"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Allow from lock screen"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"When the shortcut is on, you can press both volume buttons for 3 seconds to start an accessibility feature."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"When the shortcut is on, you can press both volume keys for 3 seconds to start an accessibility feature."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"High-contrast text"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Auto update screen magnification"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Update screen magnification on app transitions"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"May affect performance"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Click after cursor stops moving"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Delay before click"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ON"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"OFF"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Show in Quick Settings"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"selected <xliff:g id="NUMBER">%1$d</xliff:g> out of <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> out of <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Select all"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Manage plans"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Data usage"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"App data usage"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operator data accounting may differ from your device."</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobile networks"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Metered Wi‑Fi networks"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"To select metered networks, turn Wi‑Fi on."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatic"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Metered"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Not metered"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Operator data accounting may differ from your device."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Emergency call"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Return to call"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Call Manager"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Emergency broadcasts"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Emergency alerts"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Network operators"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Access point names"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Enhanced 4G LTE Mode"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Preferred SIM for"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Ask every time"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Selection required"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"SIM selection"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Settings"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">Show %d hidden items</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"App notifications"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Notification category"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importance"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Let the app decide"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Allow sound"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Never show notifications"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"No sound or visual interruption"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"No sound"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Make sound"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Make sound and pop up on screen"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Pop on screen"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Low"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Medium"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"High"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgent"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Allow sound"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Don\'t make sound, vibrate or peek these notifications into view on the current screen."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Allow interruptions"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Let the app make sound, vibrate and/or pop notifications on screen"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Low importance"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Medium importance"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"High importance"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip picture in"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Allow picture-in-picture"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Allow this app to create a picture-in-picture window while the app is open or after you leave it (for example, to continue watching a video). This window displays on top of other apps that you\'re using."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Allow this app to create a picture-in-picture window while the app is open or after you leave it (for example, to continue watching a video). This window displays on top of other apps that you\'re using."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Do Not Disturb access"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"No installed apps have requested Do Not Disturb access"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transferring files"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transferring photos (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Using device as MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS Mirroring"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Background check"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Full background access"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Use text from screen"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Set Night Light schedule"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Tint screen amber to help you fall asleep"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Night Light is on"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Screen is tinted amber. This may help you fall asleep."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Suggestions"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Use cooler display colours"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"To apply colour change, turn off screen"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"To apply telephony monitor change, reboot device"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Camera HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"To apply Camera HAL HDR+ change, reboot device"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Camera Laser Sensor"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatic system updates"</string>
     <string name="usage" msgid="2977875522080448986">"Usage"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobile data usage"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Data warning"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Set data limit"</string>
     <string name="data_limit" msgid="1885406964934590552">"Data limit"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> used between <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> used <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configure"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Other apps included in usage"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Wipe and convert"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Reset ShortcutManager rate-limiting"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager rate-limiting has been reset"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Control lock screen notifications"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Control info on lock screen"</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="8483187649355540109">"Support &amp; tips"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"No installed apps have requested Premium SMS access"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium SMS may cost you money and will add up to your mobile bills. If you enable permission for an app, you will be able to send premium SMS using that app."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Premium SMS access"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Not visible to other devices"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Off"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connected to <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connected to multiple devices"</string>
     <string name="demo_mode" msgid="2798762752209330277">"System UI demo mode"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Instant apps"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Open links in apps, even if they’re not installed"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Instant apps"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Instant apps account"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Instant Apps preferences"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installed apps"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Your storage is now being managed by the storage manager"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Accounts for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Always-on VPN turned on in your personal profile"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Always-on VPN turned on in your work profile"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP proxy set"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Trusted credentials"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Trusted credentials"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Trusted credentials in your personal profile"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Trusted credentials in your work profile"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Minimum <xliff:g id="COUNT_1">%d</xliff:g> CA certificates</item>
       <item quantity="one">Minimum <xliff:g id="COUNT_0">%d</xliff:g> CA certificate</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operator Provisioning Info"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Operator Provisioning"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"What\'s new and exciting?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Check out the top 5 features"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Take a tour of your new phone"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Take a tour of your new tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Take a tour of your new device"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"This feature is not available on this device"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS registration state"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Registered"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Not registered"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index fee6d55..a708b37 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s wants to access your messages. Give access to %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM access request"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> wants to access your SIM card. Granting access to the SIM card will disable data connectivity on your device for the duration of the connection. Give access to <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visible as \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' to other devices"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible as “<xliff:g id="DEVICE_NAME">^1</xliff:g>” to other devices"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Your devices"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Pair new device"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Date &amp; time"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Next"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Skip fingerprint?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Fingerprint setup only takes a minute or two. If you skip this, you can add your fingerprint later in settings."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Skip screen lock?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Device protection features won’t be turned on. You won’t be able to prevent others from using this tablet if it’s lost, stolen or reset."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Device protection features won’t be turned on. You won’t be able to prevent others from using this device if it’s lost, stolen or reset."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Device protection features won’t be turned on. You won’t be able to prevent others from using this phone if it’s lost, stolen or reset."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"You’ve added the maximum number of fingerprints"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Can’t add more fingerprints"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Remove all fingerprints?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Remove \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Do you want to delete this fingerprint?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"You won\'t be able to use your fingerprints to unlock your phone, authorise purchases or sign in to apps with them"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"You won\'t be able to use your fingerprints to unlock your work profile, authorise purchases or sign in to work apps"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Yes, remove"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protect your tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protect your device"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protect your phone"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"For added security, set up a backup screen lock."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"For added security, set up a backup screen lock."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Prevent others from using this tablet without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Prevent others from using this device without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Prevent others from using this phone without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
@@ -497,37 +502,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Remove device protection?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Remove profile protection?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Device protection features will not work without your pattern."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Device protection features will not work without your pattern.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Device protection features will not work without your pattern.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Your saved fingerprints will also be removed from this device and you wont be able to unlock your phone, authorise purchases, or sign in to apps with them.\""</string>
+</xliff:g>Your saved fingerprints will also be removed from this device and you won\'t be able to unlock your phone, authorise purchases or sign in to apps with them."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Device protection features will not work without your PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Device protection features will not work without your PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Device protection features will not work without your PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Your saved fingerprints will also be removed from this device and you wont be able to unlock your phone, authorise purchases, or sign in to apps with them.\""</string>
+</xliff:g>Your saved fingerprints will also be removed from this device and you won\'t be able to unlock your phone, authorise purchases or sign in to apps with them."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Device protection features will not work without your password."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Device protection features will not work without your password.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Device protection features will not work without your password.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Your saved fingerprints will also be removed from this device and you wont be able to unlock your phone, authorise purchases, or sign in to apps with them.\""</string>
+</xliff:g>Your saved fingerprints will also be removed from this device and you won\'t be able to unlock your phone, authorise purchases or sign in to apps with them."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Device protection features will not work without your screen lock."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Device protection features will not work without your screen lock.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Device protection features will not work without your screen lock.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Your saved fingerprints will also be removed from this device and you wont be able to unlock your phone, authorise purchases, or sign in to apps with them.\""</string>
+</xliff:g>Your saved fingerprints will also be removed from this device and you won\'t be able to unlock your phone, authorise purchases or sign in to apps with them."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Profile protection features will not work without your pattern."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Profile protection features will not work without your pattern.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Profile protection features will not work without your pattern.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Your saved fingerprints will also be removed from this profile and you wont be able to unlock your profile, authorise purchases or sign in to apps with them.\""</string>
+</xliff:g>Your saved fingerprints will also be removed from this profile and you won\'t be able to unlock your profile, authorise purchases or sign in to apps with them."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Profile protection features will not work without your PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Profile protection features will not work without your PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Profile protection features will not work without your PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Your saved fingerprints will also be removed from this profile and you wont be able to unlock your profile, authorise purchases or sign in to apps with them.\""</string>
+</xliff:g>Your saved fingerprints will also be removed from this profile and you won\'t be able to unlock your profile, authorise purchases or sign in to apps with them."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Profile protection features will not work without your password."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Profile protection features will not work without your password.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Profile protection features will not work without your password.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Your saved fingerprints will also be removed from this profile and you wont be able to unlock your profile, authorise purchases or sign in to apps with them.\""</string>
+</xliff:g>Your saved fingerprints will also be removed from this profile and you won\'t be able to unlock your profile, authorise purchases or sign in to apps with them."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Profile protection features will not work without your screen lock."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Profile protection features will not work without your screen lock.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Profile protection features will not work without your screen lock.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Your saved fingerprints will also be removed from this profile and you wont be able to unlock your profile, authorise purchases or sign in to apps with them.\""</string>
+</xliff:g>Your saved fingerprints will also be removed from this profile and you won\'t be able to unlock your profile, authorise purchases or sign in to apps with them."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Yes, remove"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Change unlock pattern"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Change unlock PIN"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Ascending, descending or repeated sequence of digits isn\'t allowed"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancel"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Clear"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancel"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Next"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Set up is complete."</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS available"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS available)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Enter your network password"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Operator Wi‑Fi network"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Connect via <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"To improve location accuracy and for other purposes, <xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on network scanning, even when Wi-Fi is off.\n\nAllow this for all apps that want to scan?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"To turn this off, go to Advanced in the overflow menu."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Allow"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Connect"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Failed to connect to network"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Forget"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modify"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Failed to forget network"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Save"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Failed to save network"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Advanced Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC address"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP address"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Network info"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet mask"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 addresses"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Cancel invitation"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Do you want to cancel invitation to connect with <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Forget this group?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Portable Wi‑Fi hotspot"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi hotspot"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Not sharing Internet or content with other devices"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Sharing this tablet’s Internet connection via hotspot"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Sharing this phone’s Internet connection via hotspot"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"App is sharing content. To share Internet connection, turn hotspot off, then on"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi name"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Hotspot name"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Turning on <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Other devices can connect to <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi‑Fi password"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Hotspot password"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP band"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Use hotspot to create a Wi‑Fi network for your other devices. Hotspot provides Internet using your mobile data connection. Additional mobile data charges may apply."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Apps can create a hotspot to share content with nearby devices."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Address used by emergency services as your location if you make an emergency call using Wi‑Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Search"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Manage search settings and history"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"No results"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Clear history"</string>
     <string name="display_settings" msgid="7965901687241669598">"Display"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Auto-rotate screen"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Vivid colours"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Restoring default APN settings."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Reset to default"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Reset default APN settings completed"</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Reset"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Network settings reset"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Reset options"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Network, apps or device can be reset"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Reset Wi-Fi, mobile &amp; Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"This will reset all network settings, including:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobile data"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Reset settings"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Reset all network settings? You can\'t undo this action!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Reset?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Network reset is not available for this user"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Network settings have been reset"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Factory data reset"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> accounts will be reset</item>
-      <item quantity="one">1 account will be reset</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Internal storage &amp; all data will be reset"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Erase all data (factory reset)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"This will erase all data from your tablet\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"This will erase all data from your phone\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"You are currently signed in to the following accounts:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Safety information"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"You don\'t have a data connection. To view this information now, go to %s from any computer connected to the Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Loading…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Choose your password"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Set a screen lock"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"For security, set a password"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"To use fingerprint, set password"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Choose your pattern"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"To use fingerprint, set pattern"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Choose your PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"For security, set a PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"To use fingerprint, set PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirm your password"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Re-enter your password"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirm your pattern"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirm your PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Re-enter your PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Passwords don\'t match"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PINs don\'t match"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Unlock selection"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Use your work pattern to continue"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Enter your work PIN to continue"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Enter your work password to continue"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Use your device pattern to continue. Required after device restarts."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Enter your device PIN to continue. Required after device restarts."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Enter your device password to continue. Required after device restarts."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Use your work pattern to continue. Required after device restarts."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Enter your work PIN to continue. Required after device restarts."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Enter your work password to continue. Required after device restarts."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"For added security, use your device pattern"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"For added security, enter your device PIN"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"For added security, enter your device password"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"For added security, use your work pattern"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"For added security, enter your work PIN"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"For added security, enter your work password"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Your phone was reset to factory settings. To use this phone, enter your previous pattern."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Your phone was reset to factory settings. To use this phone, enter your previous PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Your phone was reset to factory settings. To use this phone, enter your previous password."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verify pattern"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verify PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verify password"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Wrong PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Wrong password"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Wrong pattern"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Create widget and allow access?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"After you create the widget, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> can access all the data that it displays."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Always allow <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> to create widgets and access their data"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Usage statistics"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Usage statistics"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sort by:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Screen readers, display, interaction controls"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Vision settings"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"You can customise this device to fit your needs. These accessibility features can be changed later in Settings."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Increase font size"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Change font size"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Screen readers"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio &amp; on-screen text"</string>
     <string name="display_category_title" msgid="685461049938269166">"Display"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"To zoom"</b>", quickly tap the screen 3 times.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", quickly tap the screen 3 times and hold down your finger on the third tap.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can\'t zoom in on the keyboard and navigation bar."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"When magnification is turned on, use the Accessibility button at the bottom of the screen to quickly magnify.\n\n"<b>"To zoom"</b>", tap the Accessibility button, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", tap the Accessibility button, then touch &amp; hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"The accessibility button is set to <xliff:g id="SERVICE">%1$s</xliff:g>. To use magnification, touch &amp; hold the accessibility button, then select magnification."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Accessibility shortcut"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Volume key shortcut"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Shortcut service"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Allow from lock screen"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"When the shortcut is on, you can press both volume buttons for 3 seconds to start an accessibility feature."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"When the shortcut is on, you can press both volume keys for 3 seconds to start an accessibility feature."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"High-contrast text"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Auto update screen magnification"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Update screen magnification on app transitions"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"May affect performance"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Click after cursor stops moving"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Delay before click"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ON"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"OFF"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Show in Quick Settings"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"selected <xliff:g id="NUMBER">%1$d</xliff:g> out of <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> out of <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Select all"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Manage plans"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Data usage"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"App data usage"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operator data accounting may differ from your device."</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobile networks"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Metered Wi‑Fi networks"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"To select metered networks, turn Wi‑Fi on."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatic"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Metered"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Not metered"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Operator data accounting may differ from your device."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Emergency call"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Return to call"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Call Manager"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Emergency broadcasts"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Emergency alerts"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Network operators"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Access point names"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Enhanced 4G LTE Mode"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Preferred SIM for"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Ask every time"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Selection required"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"SIM selection"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Settings"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">Show %d hidden items</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"App notifications"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Notification category"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importance"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Let the app decide"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Allow sound"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Never show notifications"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"No sound or visual interruption"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"No sound"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Make sound"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Make sound and pop up on screen"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Pop on screen"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Low"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Medium"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"High"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgent"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Allow sound"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Don\'t make sound, vibrate or peek these notifications into view on the current screen."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Allow interruptions"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Let the app make sound, vibrate and/or pop notifications on screen"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Low importance"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Medium importance"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"High importance"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip picture in"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Allow picture-in-picture"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Allow this app to create a picture-in-picture window while the app is open or after you leave it (for example, to continue watching a video). This window displays on top of other apps that you\'re using."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Allow this app to create a picture-in-picture window while the app is open or after you leave it (for example, to continue watching a video). This window displays on top of other apps that you\'re using."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Do Not Disturb access"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"No installed apps have requested Do Not Disturb access"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transferring files"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transferring photos (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Using device as MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS Mirroring"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Background check"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Full background access"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Use text from screen"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Set Night Light schedule"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Tint screen amber to help you fall asleep"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Night Light is on"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Screen is tinted amber. This may help you fall asleep."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Suggestions"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Use cooler display colours"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"To apply colour change, turn off screen"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"To apply telephony monitor change, reboot device"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Camera HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"To apply Camera HAL HDR+ change, reboot device"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Camera Laser Sensor"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatic system updates"</string>
     <string name="usage" msgid="2977875522080448986">"Usage"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobile data usage"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Data warning"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Set data limit"</string>
     <string name="data_limit" msgid="1885406964934590552">"Data limit"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> used between <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> used <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configure"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Other apps included in usage"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Wipe and convert"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Reset ShortcutManager rate-limiting"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager rate-limiting has been reset"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Control lock screen notifications"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Control info on lock screen"</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="8483187649355540109">"Support &amp; tips"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"No installed apps have requested Premium SMS access"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium SMS may cost you money and will add up to your mobile bills. If you enable permission for an app, you will be able to send premium SMS using that app."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Premium SMS access"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Not visible to other devices"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Off"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connected to <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connected to multiple devices"</string>
     <string name="demo_mode" msgid="2798762752209330277">"System UI demo mode"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Instant apps"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Open links in apps, even if they’re not installed"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Instant apps"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Instant apps account"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Instant Apps preferences"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installed apps"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Your storage is now being managed by the storage manager"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Accounts for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Always-on VPN turned on in your personal profile"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Always-on VPN turned on in your work profile"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP proxy set"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Trusted credentials"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Trusted credentials"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Trusted credentials in your personal profile"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Trusted credentials in your work profile"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Minimum <xliff:g id="COUNT_1">%d</xliff:g> CA certificates</item>
       <item quantity="one">Minimum <xliff:g id="COUNT_0">%d</xliff:g> CA certificate</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operator Provisioning Info"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Operator Provisioning"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"What\'s new and exciting?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Check out the top 5 features"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Take a tour of your new phone"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Take a tour of your new tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Take a tour of your new device"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"This feature is not available on this device"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS registration state"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Registered"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Not registered"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index fee6d55..a708b37 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s wants to access your messages. Give access to %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM access request"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> wants to access your SIM card. Granting access to the SIM card will disable data connectivity on your device for the duration of the connection. Give access to <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visible as \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' to other devices"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible as “<xliff:g id="DEVICE_NAME">^1</xliff:g>” to other devices"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Your devices"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Pair new device"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Date &amp; time"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Next"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Skip fingerprint?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Fingerprint setup only takes a minute or two. If you skip this, you can add your fingerprint later in settings."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Skip screen lock?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Device protection features won’t be turned on. You won’t be able to prevent others from using this tablet if it’s lost, stolen or reset."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Device protection features won’t be turned on. You won’t be able to prevent others from using this device if it’s lost, stolen or reset."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Device protection features won’t be turned on. You won’t be able to prevent others from using this phone if it’s lost, stolen or reset."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"You’ve added the maximum number of fingerprints"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Can’t add more fingerprints"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Remove all fingerprints?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Remove \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Do you want to delete this fingerprint?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"You won\'t be able to use your fingerprints to unlock your phone, authorise purchases or sign in to apps with them"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"You won\'t be able to use your fingerprints to unlock your work profile, authorise purchases or sign in to work apps"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Yes, remove"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protect your tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protect your device"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protect your phone"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"For added security, set up a backup screen lock."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"For added security, set up a backup screen lock."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Prevent others from using this tablet without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Prevent others from using this device without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Prevent others from using this phone without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
@@ -497,37 +502,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Remove device protection?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Remove profile protection?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Device protection features will not work without your pattern."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Device protection features will not work without your pattern.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Device protection features will not work without your pattern.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Your saved fingerprints will also be removed from this device and you wont be able to unlock your phone, authorise purchases, or sign in to apps with them.\""</string>
+</xliff:g>Your saved fingerprints will also be removed from this device and you won\'t be able to unlock your phone, authorise purchases or sign in to apps with them."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Device protection features will not work without your PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Device protection features will not work without your PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Device protection features will not work without your PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Your saved fingerprints will also be removed from this device and you wont be able to unlock your phone, authorise purchases, or sign in to apps with them.\""</string>
+</xliff:g>Your saved fingerprints will also be removed from this device and you won\'t be able to unlock your phone, authorise purchases or sign in to apps with them."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Device protection features will not work without your password."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Device protection features will not work without your password.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Device protection features will not work without your password.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Your saved fingerprints will also be removed from this device and you wont be able to unlock your phone, authorise purchases, or sign in to apps with them.\""</string>
+</xliff:g>Your saved fingerprints will also be removed from this device and you won\'t be able to unlock your phone, authorise purchases or sign in to apps with them."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Device protection features will not work without your screen lock."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Device protection features will not work without your screen lock.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Device protection features will not work without your screen lock.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Your saved fingerprints will also be removed from this device and you wont be able to unlock your phone, authorise purchases, or sign in to apps with them.\""</string>
+</xliff:g>Your saved fingerprints will also be removed from this device and you won\'t be able to unlock your phone, authorise purchases or sign in to apps with them."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Profile protection features will not work without your pattern."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Profile protection features will not work without your pattern.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Profile protection features will not work without your pattern.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Your saved fingerprints will also be removed from this profile and you wont be able to unlock your profile, authorise purchases or sign in to apps with them.\""</string>
+</xliff:g>Your saved fingerprints will also be removed from this profile and you won\'t be able to unlock your profile, authorise purchases or sign in to apps with them."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Profile protection features will not work without your PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Profile protection features will not work without your PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Profile protection features will not work without your PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Your saved fingerprints will also be removed from this profile and you wont be able to unlock your profile, authorise purchases or sign in to apps with them.\""</string>
+</xliff:g>Your saved fingerprints will also be removed from this profile and you won\'t be able to unlock your profile, authorise purchases or sign in to apps with them."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Profile protection features will not work without your password."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Profile protection features will not work without your password.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Profile protection features will not work without your password.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Your saved fingerprints will also be removed from this profile and you wont be able to unlock your profile, authorise purchases or sign in to apps with them.\""</string>
+</xliff:g>Your saved fingerprints will also be removed from this profile and you won\'t be able to unlock your profile, authorise purchases or sign in to apps with them."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Profile protection features will not work without your screen lock."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Profile protection features will not work without your screen lock.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Profile protection features will not work without your screen lock.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Your saved fingerprints will also be removed from this profile and you wont be able to unlock your profile, authorise purchases or sign in to apps with them.\""</string>
+</xliff:g>Your saved fingerprints will also be removed from this profile and you won\'t be able to unlock your profile, authorise purchases or sign in to apps with them."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Yes, remove"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Change unlock pattern"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Change unlock PIN"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Ascending, descending or repeated sequence of digits isn\'t allowed"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancel"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Clear"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancel"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Next"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Set up is complete."</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS available"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS available)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Enter your network password"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Operator Wi‑Fi network"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Connect via <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"To improve location accuracy and for other purposes, <xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on network scanning, even when Wi-Fi is off.\n\nAllow this for all apps that want to scan?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"To turn this off, go to Advanced in the overflow menu."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Allow"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Connect"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Failed to connect to network"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Forget"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modify"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Failed to forget network"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Save"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Failed to save network"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Advanced Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC address"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP address"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Network info"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet mask"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 addresses"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Cancel invitation"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Do you want to cancel invitation to connect with <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Forget this group?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Portable Wi‑Fi hotspot"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi hotspot"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Not sharing Internet or content with other devices"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Sharing this tablet’s Internet connection via hotspot"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Sharing this phone’s Internet connection via hotspot"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"App is sharing content. To share Internet connection, turn hotspot off, then on"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi name"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Hotspot name"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Turning on <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Other devices can connect to <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi‑Fi password"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Hotspot password"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP band"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Use hotspot to create a Wi‑Fi network for your other devices. Hotspot provides Internet using your mobile data connection. Additional mobile data charges may apply."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Apps can create a hotspot to share content with nearby devices."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Address used by emergency services as your location if you make an emergency call using Wi‑Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Search"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Manage search settings and history"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"No results"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Clear history"</string>
     <string name="display_settings" msgid="7965901687241669598">"Display"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Auto-rotate screen"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Vivid colours"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Restoring default APN settings."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Reset to default"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Reset default APN settings completed"</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Reset"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Network settings reset"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Reset options"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Network, apps or device can be reset"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Reset Wi-Fi, mobile &amp; Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"This will reset all network settings, including:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobile data"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Reset settings"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Reset all network settings? You can\'t undo this action!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Reset?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Network reset is not available for this user"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Network settings have been reset"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Factory data reset"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> accounts will be reset</item>
-      <item quantity="one">1 account will be reset</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Internal storage &amp; all data will be reset"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Erase all data (factory reset)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"This will erase all data from your tablet\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"This will erase all data from your phone\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"You are currently signed in to the following accounts:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Safety information"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"You don\'t have a data connection. To view this information now, go to %s from any computer connected to the Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Loading…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Choose your password"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Set a screen lock"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"For security, set a password"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"To use fingerprint, set password"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Choose your pattern"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"To use fingerprint, set pattern"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Choose your PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"For security, set a PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"To use fingerprint, set PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirm your password"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Re-enter your password"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirm your pattern"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirm your PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Re-enter your PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Passwords don\'t match"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PINs don\'t match"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Unlock selection"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Use your work pattern to continue"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Enter your work PIN to continue"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Enter your work password to continue"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Use your device pattern to continue. Required after device restarts."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Enter your device PIN to continue. Required after device restarts."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Enter your device password to continue. Required after device restarts."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Use your work pattern to continue. Required after device restarts."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Enter your work PIN to continue. Required after device restarts."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Enter your work password to continue. Required after device restarts."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"For added security, use your device pattern"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"For added security, enter your device PIN"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"For added security, enter your device password"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"For added security, use your work pattern"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"For added security, enter your work PIN"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"For added security, enter your work password"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Your phone was reset to factory settings. To use this phone, enter your previous pattern."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Your phone was reset to factory settings. To use this phone, enter your previous PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Your phone was reset to factory settings. To use this phone, enter your previous password."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verify pattern"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verify PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verify password"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Wrong PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Wrong password"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Wrong pattern"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Create widget and allow access?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"After you create the widget, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> can access all the data that it displays."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Always allow <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> to create widgets and access their data"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Usage statistics"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Usage statistics"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sort by:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Screen readers, display, interaction controls"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Vision settings"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"You can customise this device to fit your needs. These accessibility features can be changed later in Settings."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Increase font size"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Change font size"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Screen readers"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio &amp; on-screen text"</string>
     <string name="display_category_title" msgid="685461049938269166">"Display"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"To zoom"</b>", quickly tap the screen 3 times.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", quickly tap the screen 3 times and hold down your finger on the third tap.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can\'t zoom in on the keyboard and navigation bar."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"When magnification is turned on, use the Accessibility button at the bottom of the screen to quickly magnify.\n\n"<b>"To zoom"</b>", tap the Accessibility button, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", tap the Accessibility button, then touch &amp; hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"The accessibility button is set to <xliff:g id="SERVICE">%1$s</xliff:g>. To use magnification, touch &amp; hold the accessibility button, then select magnification."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Accessibility shortcut"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Volume key shortcut"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Shortcut service"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Allow from lock screen"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"When the shortcut is on, you can press both volume buttons for 3 seconds to start an accessibility feature."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"When the shortcut is on, you can press both volume keys for 3 seconds to start an accessibility feature."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"High-contrast text"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Auto update screen magnification"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Update screen magnification on app transitions"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"May affect performance"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Click after cursor stops moving"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Delay before click"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ON"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"OFF"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Show in Quick Settings"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"selected <xliff:g id="NUMBER">%1$d</xliff:g> out of <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> out of <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Select all"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Manage plans"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Data usage"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"App data usage"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operator data accounting may differ from your device."</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobile networks"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Metered Wi‑Fi networks"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"To select metered networks, turn Wi‑Fi on."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatic"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Metered"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Not metered"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Operator data accounting may differ from your device."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Emergency call"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Return to call"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Call Manager"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Emergency broadcasts"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Emergency alerts"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Network operators"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Access point names"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Enhanced 4G LTE Mode"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Preferred SIM for"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Ask every time"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Selection required"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"SIM selection"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Settings"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">Show %d hidden items</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"App notifications"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Notification category"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importance"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Let the app decide"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Allow sound"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Never show notifications"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"No sound or visual interruption"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"No sound"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Make sound"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Make sound and pop up on screen"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Pop on screen"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Low"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Medium"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"High"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgent"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Allow sound"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Don\'t make sound, vibrate or peek these notifications into view on the current screen."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Allow interruptions"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Let the app make sound, vibrate and/or pop notifications on screen"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Low importance"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Medium importance"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"High importance"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip picture in"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Allow picture-in-picture"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Allow this app to create a picture-in-picture window while the app is open or after you leave it (for example, to continue watching a video). This window displays on top of other apps that you\'re using."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Allow this app to create a picture-in-picture window while the app is open or after you leave it (for example, to continue watching a video). This window displays on top of other apps that you\'re using."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Do Not Disturb access"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"No installed apps have requested Do Not Disturb access"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transferring files"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transferring photos (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Using device as MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS Mirroring"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Background check"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Full background access"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Use text from screen"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Set Night Light schedule"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Tint screen amber to help you fall asleep"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Night Light is on"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Screen is tinted amber. This may help you fall asleep."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Suggestions"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Use cooler display colours"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"To apply colour change, turn off screen"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"To apply telephony monitor change, reboot device"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Camera HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"To apply Camera HAL HDR+ change, reboot device"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Camera Laser Sensor"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatic system updates"</string>
     <string name="usage" msgid="2977875522080448986">"Usage"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobile data usage"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Data warning"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Set data limit"</string>
     <string name="data_limit" msgid="1885406964934590552">"Data limit"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> used between <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> used <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configure"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Other apps included in usage"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Wipe and convert"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Reset ShortcutManager rate-limiting"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager rate-limiting has been reset"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Control lock screen notifications"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Control info on lock screen"</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="8483187649355540109">"Support &amp; tips"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"No installed apps have requested Premium SMS access"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium SMS may cost you money and will add up to your mobile bills. If you enable permission for an app, you will be able to send premium SMS using that app."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Premium SMS access"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Not visible to other devices"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Off"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connected to <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connected to multiple devices"</string>
     <string name="demo_mode" msgid="2798762752209330277">"System UI demo mode"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Instant apps"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Open links in apps, even if they’re not installed"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Instant apps"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Instant apps account"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Instant Apps preferences"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installed apps"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Your storage is now being managed by the storage manager"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Accounts for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Always-on VPN turned on in your personal profile"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Always-on VPN turned on in your work profile"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP proxy set"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Trusted credentials"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Trusted credentials"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Trusted credentials in your personal profile"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Trusted credentials in your work profile"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Minimum <xliff:g id="COUNT_1">%d</xliff:g> CA certificates</item>
       <item quantity="one">Minimum <xliff:g id="COUNT_0">%d</xliff:g> CA certificate</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operator Provisioning Info"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Operator Provisioning"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"What\'s new and exciting?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Check out the top 5 features"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Take a tour of your new phone"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Take a tour of your new tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Take a tour of your new device"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"This feature is not available on this device"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS registration state"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Registered"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Not registered"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 276e082..6daf781 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s quiere acceder a tus mensajes. ¿Quieres permitir el acceso a %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitud de acceso a SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"El dispositivo <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> quiere acceder a tu tarjeta SIM. Al otorgar el acceso a la tarjeta SIM, inhabilitarás la conectividad de datos en el dispositivo por el tiempo que dure la conexión. Otorga el acceso al dispositivo <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>."</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visible como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para otros dispositivos"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para otros dispositivos"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Tus dispositivos"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Sincronizar dispositivo nuevo"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Fecha y hora"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Siguiente"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"¿Omitir huella digital?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"La configuración de la huella digital solo toma unos minutos. Si omites este paso, puedes agregarla más tarde en la configuración."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"¿Omitir bloqueo de pantalla?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otras personas usen esta tablet si la pierdes, te la roban o se restablece."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otras personas lo usen si lo pierdes, te lo roban o se restablece."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otras personas usen este teléfono si lo pierdes, te lo roban o se restablece."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Agregaste la cantidad máxima permitida de huellas digitales"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"No se pueden agregar más huellas digitales"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"¿Quitar las huellas digitales?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Quitar \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\""</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"¿Quieres borrar esta huella digital?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"No podrás usar tus huellas digitales para desbloquear el teléfono, autorizar compras ni acceder a las apps"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"No podrás usar tus huellas digitales para desbloquear tu perfil de trabajo, autorizar compras ni acceder a apps de trabajo"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Sí, deseo quitarlas"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protege tu tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protege tu dispositivo"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protege el teléfono"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Para mayor seguridad, establece un bloqueo de pantalla secundario"</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Para mayor seguridad, establece un bloqueo de pantalla secundario."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activa las funciones de protección del dispositivo para impedir que terceros usen esta tablet sin tu permiso. Elige el bloqueo de pantalla que quieres usar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activa las funciones de protección del dispositivo para impedir que terceros lo usen sin tu permiso. Elige el bloqueo de pantalla que quieres usar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activa las funciones de protección del dispositivo para impedir que terceros usen este teléfono sin tu permiso. Elige el bloqueo de pantalla que quieres usar."</string>
@@ -497,37 +502,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"¿Deseas quitar la protección del dispositivo?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"¿Quieres quitar la protección del perfil?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Las funciones de protección del dispositivo no funcionarán sin el patrón."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Las funciones de protección del dispositivo no funcionarán sin el patrón.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Las funciones de protección del dispositivo no podrán usarse sin tu patrón.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>También se quitarán del dispositivo las huellas digitales guardadas, y no podrás desbloquear el teléfono, autorizar compras ni acceder a las aplicaciones con ellas."</string>
+</xliff:g>También se quitarán las huellas digitales guardadas del dispositivo, por lo que no podrás usarlas para desbloquear el teléfono, autorizar compras ni acceder a las apps."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Las funciones de protección del dispositivo no funcionarán sin el PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Las funciones de protección del dispositivo no funcionarán sin el PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Las funciones de protección del dispositivo no podrán usarse sin tu PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>También se quitarán del dispositivo las huellas digitales guardadas, y no podrás desbloquear el teléfono, autorizar compras ni acceder a las aplicaciones con ellas."</string>
+</xliff:g>También se quitarán las huellas digitales guardadas del dispositivo, por lo que no podrás usarlas para desbloquear el teléfono, autorizar compras ni acceder a las apps."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Las funciones de protección del dispositivo no funcionarán sin la contraseña."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Las funciones de protección del dispositivo no funcionarán sin la contraseña.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Las funciones de protección del dispositivo no podrán usarse sin tu contraseña.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>También se quitarán del dispositivo las huellas digitales guardadas, y no podrás desbloquear el teléfono, autorizar compras ni acceder a las aplicaciones con ellas."</string>
+</xliff:g>También se quitarán las huellas digitales guardadas del dispositivo, por lo que no podrás usarlas para desbloquear el teléfono, autorizar compras ni acceder a las apps."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Las funciones de protección del dispositivo no funcionarán sin el bloqueo de pantalla."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Las funciones de protección del dispositivo no funcionarán sin el bloqueo de pantalla.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Las funciones de protección del dispositivo no podrán usarse sin el bloqueo de pantalla.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>También se quitarán del dispositivo las huellas digitales guardadas, y no podrás desbloquear el teléfono, autorizar compras ni acceder a las aplicaciones con ellas."</string>
+</xliff:g>También se quitarán las huellas digitales guardadas del dispositivo, por lo que no podrás usarlas para desbloquear el teléfono, autorizar compras ni acceder a las apps."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Las funciones de protección del perfil no podrán usarse sin tu patrón."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Las funciones de protección del perfil no podrán usarse sin tu patrón.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Las funciones de protección del perfil no podrán usarse sin tu patrón.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>También se quitarán las huellas digitales guardadas de este perfil y no podrás usarlas para desbloquear tu perfil, autorizar compras ni acceder a las apps.\""</string>
+</xliff:g>También se quitarán las huellas digitales guardadas de este perfil, por lo que no podrás usarlas para desbloquear tu perfil, autorizar compras ni acceder a las apps."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Las funciones de protección del perfil no podrán usarse sin tu PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Las funciones de protección del perfil no podrán usarse sin tu PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Las funciones de protección del perfil no podrán usarse sin tu PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>También se quitarán las huellas digitales guardadas de este perfil y no podrás usarlas para desbloquear tu perfil, autorizar compras ni acceder a las apps.\""</string>
+</xliff:g>También se quitarán las huellas digitales guardadas de este perfil, por lo que no podrás usarlas para desbloquear tu perfil, autorizar compras ni acceder a las apps."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Las funciones de protección del perfil no podrán usarse sin tu contraseña."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Las funciones de protección del perfil no podrán usarse sin tu contraseña.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Las funciones de protección del perfil no podrán usarse sin tu contraseña.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>También se quitarán las huellas digitales guardadas de este perfil y no podrás usarlas para desbloquear tu perfil, autorizar compras ni acceder a las apps.\""</string>
+</xliff:g>También se quitarán las huellas digitales guardadas de este perfil, por lo que no podrás usarlas para desbloquear tu perfil, autorizar compras ni acceder a las apps."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Las funciones de protección del perfil no podrán usarse sin tu bloqueo de pantalla."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Las funciones de protección del perfil no podrán usarse sin tu bloqueo de pantalla.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Las funciones de protección del perfil no podrán usarse sin el bloqueo de pantalla.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>También se quitarán las huellas digitales guardadas del perfil  y no podrás usarlas para desbloquear el perfil, autorizar compras ni acceder a las apps.\""</string>
+</xliff:g>También se quitarán las huellas digitales guardadas de este perfil, por lo que no podrás usarlas para desbloquear tu perfil, autorizar compras ni acceder a las apps."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Sí, deseo quitarla"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Cambiar patrón de desbloqueo"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambiar PIN de desbloqueo"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"No se permiten secuencias de dígitos ascendentes, descendentes ni repetidas"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Aceptar"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancelar"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Borrar"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancelar"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Siguiente"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Se completó la configuración."</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WSP disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WSP disponible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ingresa la contraseña de la red."</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Red Wi‑Fi del proveedor"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Conectarse mediante <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para mejorar la precisión de la ubicación y para otros fines, <xliff:g id="APP_NAME">%1$s</xliff:g> quiere activar la búsqueda de redes, incluso cuando la conexión Wi-Fi esté desactivada.\n\n¿Quieres permitir esto para todas las aplicaciones que deseen buscar redes?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Para desactivar la opción, accede a la sección Avanzada del menú ampliado."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"No se pudo establecer conexión con la red."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Olvidar"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modificar"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"No se pudo borrar la red."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Guardar"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"No se pudo guardar la red."</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Config. avanzada de Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Dirección MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Dirección IP"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Información de la red"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Máscara de subred"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Direcciones IPv6"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"¿Quieres cancelar la invitación?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"¿Quieres cancelar la invitación para conectarte con <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"¿Deseas borrar este grupo?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Hotspot Wi-Fi portátil"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Zona Wi-Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"No compartir Internet ni contenido con otros dispositivos"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Compartiendo la conexión a Internet de esta tablet por hotspot"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Compartiendo la conexión a Internet de este teléfono por hotspot"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"La app está compartiendo contenido. Para compartir la conexión a Internet, desactiva el hotspot y vuelve a activarlo"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nombre de Wi-Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Nombre del hotspot"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Activando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Otros dispositivos pueden conectarse a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Contraseña de Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Contraseña del hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Usa el hotspot para crear una red Wi‑Fi para otros dispositivos. El hotspot brinda acceso a Internet mediante tu conexión de datos móviles. Es posible que se apliquen cargos adicionales de datos móviles."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Las apps pueden crear un hotspot para compartir contenido con dispositivos cercanos."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Dirección que los servicios de emergencia usarán como tu ubicación si realizas una llamada de emergencia mediante Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sonido"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumen"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Buscar"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Administrar la configuración y el historial de búsqueda"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Sin resultados"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Borrar historial"</string>
     <string name="display_settings" msgid="7965901687241669598">"Pantalla"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotar automáticamente la pantalla"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Colores intensos"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Restaurando la configuración APN predeterminada"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Restablecer valores predeterminados"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Se restableció la configuración predeterminada de APN."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Restablecer"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Restablecer configuración de red"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Opciones de restablecimiento"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Se pueden restablecer las redes, las apps y los dispositivos"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Restablecer configuración de Wi-Fi, datos móviles y Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Se restablecerán las opciones de configuración de todas las redes, incluidos:\n\n"<li>"Wi‑Fi"</li>\n<li>"Datos móviles"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Restablecer configuración"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"¿Quieres restablecer la configuración de red? Esta acción no se puede deshacer."</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"¿Restablecer?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"El restablecimiento de la red no está disponible para este usuario."</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Se restableció la configuración de red."</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Restablecer valores de fábrica"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other">Se restablecerán <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> cuentas</item>
-      <item quantity="one">Se restablecerá 1 cuenta</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Se restablecerán el almacenamiento interno y todos los datos"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Borrar todos los datos (restablecer la configuración de fábrica)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Esto borrará todos los datos del "<b>"almacenamiento interno"</b>" de tu tablet, por ejemplo:\n\n"<li>"tu cuenta de Google"</li>\n<li>"los datos y la configuración del sistema y de las aplicaciones"</li>\n<li>"las aplicaciones descargadas"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del dispositivo, por ejemplo:\n\n"<li>"La cuenta de Google"</li>\n<li>"Datos de apps y configuraciones"</li>\n<li>"Apps descargadas"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Accediste a las siguientes cuentas:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Información de seguridad"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"No tienes una conexión de datos. Para ver esta información ahora, visita %s desde cualquier computadora conectada a Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Cargando…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Elige la contraseña"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Establece un bloqueo de pantalla"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Por motivos de seguridad, establece una contraseña"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Configura tu contraseña"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Elige un patrón"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Configura el patrón"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Elige el PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Por motivos de seguridad, establece un PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Configura el PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirma la contraseña."</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Vuelve a ingresar tu contraseña"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirma el patrón"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirma el PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Vuelve a ingresar el PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Las contraseñas no coinciden."</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Los PIN no coinciden."</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Desbloquear la selección"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Para continuar, usa el patrón de tu perfil de trabajo"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Para continuar, ingresa el PIN de tu perfil de trabajo"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Para continuar, ingresa la contraseña de tu perfil de trabajo"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Para continuar, usa el patrón de tu dispositivo. Se requiere al reiniciarlo."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Para continuar, ingresa el PIN de tu dispositivo. Se requiere al reiniciarlo."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Para continuar, ingresa la contraseña de tu dispositivo. Se requiere al reiniciarlo."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Para continuar, usa el patrón de tu perfil de trabajo. Se requiere al reiniciar el dispositivo."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Para continuar, ingresa el PIN de tu perfil de trabajo. Se requiere al reiniciar el dispositivo."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Para continuar, ingresa tu contraseña de trabajo. Se requiere al reiniciar el dispositivo."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Para mayor seguridad, usa el patrón de tu dispositivo"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Para mayor seguridad, ingresa el PIN de tu dispositivo"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Para mayor seguridad, ingresa la contraseña de tu dispositivo"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Para mayor seguridad, usa el patrón de tu perfil de trabajo"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Para mayor seguridad, ingresa el PIN de tu perfil de trabajo"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Para mayor seguridad, ingresa la contraseña de tu perfil de trabajo"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Se restableció la configuración de fábrica del teléfono. Para usarlo, ingresa el patrón anterior."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Se restableció la configuración de fábrica del teléfono. Para usarlo, ingresa el PIN anterior."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Se restableció la configuración de fábrica del teléfono. Para usarlo, ingresa contraseña anterior."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verificar patrón"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verificar PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verificar contraseña"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN incorrecto"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Contraseña incorrecta"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Patrón incorrecto"</string>
@@ -1588,7 +1601,7 @@
     <string name="reset_app_preferences" msgid="1321050641018356925">"Restablecer preferencias"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"¿Restablecer?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Se restablecerán las preferencias de:\n\n "<li>"Apps inhabilitadas"</li>\n" "<li>"Notificaciones de apps inhabilitadas"</li>\n" "<li>"Apps predeterminadas para realizar acciones"</li>\n" "<li>"Restricciones de datos en segundo plano para apps"</li>\n" "<li>"Restricciones de permisos"</li>\n\n" No se perderán los datos de las apps."</string>
-    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Restablecer aplicaciones"</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Restablecer apps"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Administrar el espacio"</string>
     <string name="filter" msgid="2018011724373033887">"Filtro"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Elegir opciones de filtro"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"¿Deseas crear el widget y permitir el acceso?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Después de crear el widget, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> podrá acceder a todos los datos que muestre."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Permitir siempre que <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> pueda crear widgets y acceder a sus datos"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>días <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>min <xliff:g id="SECONDS">%4$d</xliff:g>seg"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>min <xliff:g id="SECONDS">%3$d</xliff:g>seg"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> seg"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> seg"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> min"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Estadísticas de uso"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Estadísticas de uso"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Ordenar por:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Lectores de pantalla, pantalla, controles de interacción"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Configuración de visión"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Puedes personalizar este dispositivo para que se adapte a tus necesidades. Estas funciones de accesibilidad pueden cambiarse más tarde en Configuración."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Aumentar el tamaño de la fuente"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Cambiar tamaño de fuente"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Lectores de pantalla"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio y texto en pantalla"</string>
     <string name="display_category_title" msgid="685461049938269166">"Pantalla"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Para ampliar"</b>", presiona la pantalla 3 veces rápidamente \n"<ul><li>"Arrastra 2 o más dedos para desplazarte."</li>\n<li>"Pellizca con 2 o más dedos para ajustar el zoom."</li></ul>\n\n<b>"Para hacer zoom de manera temporal"</b>", presiona la pantalla 3 veces rápidamente y mantén presionado la última vez.\n"<ul><li>"Arrastra el dedo para moverte por la pantalla."</li>\n<li>"Levanta el dedo para alejar la imagen."</li></ul>\n\n"No puedes acercar con el teclado ni en la barra de navegación."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Cuando se activa la ampliación, usa el botón de Accesibilidad en la parte inferior de la pantalla para ampliar rápidamente.\n\n"<b>"Para acercar"</b>", presiona el botón de Accesibilidad y, luego, presiona cualquier lugar de la pantalla.\n"<ul><li>"Arrastra 2 o más dedos para desplazarte."</li>\n<li>"Pellizca con 2 o más dedos para ajustar el zoom."</li></ul>\n\n<b>"Para hacer zoom de manera temporal"</b>", presiona el botón de Accesibilidad y, luego, mantén presionado cualquier lugar de la pantalla.\n"<ul><li>"Arrastra el dedo para moverte por la pantalla."</li>\n<li>"Levanta el dedo para alejar la imagen."</li></ul>\n\n"No puedes hacer acercar con el teclado ni en la barra de navegación."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"El botón de Accesibilidad está configurado para <xliff:g id="SERVICE">%1$s</xliff:g>. Para ampliar, mantén presionado el botón y, luego, selecciona ampliación."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Acceso directo"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Combinación de teclas de volumen"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Servicio de combinación de teclas"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Habilitar en pantalla bloqueada"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Si activas la combinación de teclas, podrás presionar los dos botones de volumen durante 3 segundos para iniciar una función de accesibilidad."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Si activas la combinación de teclas, podrás presionar ambas teclas de volumen durante 3 segundos para iniciar una función de accesibilidad."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Texto de alto contraste"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Actualizar automáticamente la ampliación de pantalla"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Actualizar la ampliación de pantalla al cambiar de aplicaciones"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Puede afectar el rendimiento"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clic cuando deja de moverse el puntero"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Tiempo de espera antes del clic"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ACTIVADO"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESACTIVADO"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Mostrar en Configuración rápida"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Se seleccionaron <xliff:g id="NUMBER">%1$d</xliff:g> de entre <xliff:g id="TOTAL">%2$d</xliff:g>."</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Seleccionar todo"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Administrar planes"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de datos"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Uso datos de aplicación"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"La forma en que el proveedor contabiliza los datos puede variar en tu dispositivo."</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Redes móviles"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Redes Wi‑Fi sin tarifa plana"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Para seleccionar redes sin tarifa plana, activa el Wi-Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automático"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Sin tarifa plana"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Con tarifa plana"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"La forma en que el proveedor calcula los datos puede variar en tu dispositivo."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Llamada de emergencia"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Regresar a llamada"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Administrador de llamadas"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Transmisiones de emergencia"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Alertas de emergencia"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Proveedores de red"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Nombres de puntos de acceso"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Modo 4G LTE mejorado"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"SIM preferida para"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Preguntar siempre"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Selección requerida"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Selección de SIM"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Configuración"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">Mostrar %d elementos ocultos</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificaciones de aplicaciones"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoría de notificaciones"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importancia"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Permitir que la app decida"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Permitir sonido"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"No mostrar notificaciones"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"No emitir sonido ni mostrar"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Sin sonido"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Emitir sonido"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Emitir sonido y mostrar en pantalla"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Mostrar en la pantalla"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Baja"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Media"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Alta"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgente"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Permitir sonido"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"No emitir sonido, vibrar ni mostrar estas notificaciones en la pantalla actual."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Permitir interrupciones"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Permite que la app emita sonidos, vibre y muestre notificaciones en pantalla"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Poca importancia"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Mediana importancia"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Importancia alta"</string>
@@ -2920,7 +2931,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"imagen en imagen"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Imagen en imagen"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Permitir imagen en imagen"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Permite que esta app cree una ventana de imagen en imagen mientras esté abierta o cuando salgas (por ejemplo, para seguir viendo un video). Esta ventana se mostrará sobre otras apps que estés usando."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Permite que esta app cree una ventana de imagen en imagen mientras esté abierta o después de que hayas salido de ella (por ejemplo, para seguir viendo un video). Esta ventana se muestra sobre otras apps que estés usando."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acceso en No molestar"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ninguna aplicación instalada solicitó acceso en No molestar."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicaciones…"</string>
@@ -3159,7 +3170,7 @@
     <string name="system_default_app" msgid="3091113402349739037">"(Predeterminada de sistema)"</string>
     <string name="apps_storage" msgid="4353308027210435513">"Almacenamiento de apps"</string>
     <string name="usage_access" msgid="5479504953931038165">"Acceso a datos de uso"</string>
-    <string name="permit_usage_access" msgid="4012876269445832300">"Permitir acceso datos de uso"</string>
+    <string name="permit_usage_access" msgid="4012876269445832300">"Apps con acceso de uso"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Preferencias de uso de la aplicación"</string>
     <string name="usage_access_description" msgid="1352111094596416795">"El acceso a los datos de uso permite que una aplicación realice un seguimiento de las otras aplicaciones que usas y con qué frecuencia lo haces, además de tu proveedor, configuración de idioma y otros detalles."</string>
     <string name="memory_settings_title" msgid="7490541005204254222">"Memoria"</string>
@@ -3223,6 +3234,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transferir archivos"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transferir fotos (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Usar el dispositivo como MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Duplicación de SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Verificación en segundo plano"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Acceso en segundo plano completo"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Utilizar el texto de la pantalla"</string>
@@ -3365,6 +3377,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="night_display_suggestion_title" msgid="6602129097059325291">"Programar Luz nocturna"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Tono ámbar para la noche"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"\"Luz nocturna\" activada"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"La pantalla tiene un tono ámbar que te ayudará a conciliar el sueño."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Sugerencias"</string>
@@ -3383,6 +3397,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Usar colores de pantalla más fríos"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar el cambio de color, apaga la pantalla"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Para aplicar el cambio de Telephony Monitor, reinicia el dispositivo"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Cámara HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Para aplicar el cambio a la cámara HAL HDR+, reinicia el dispositivo"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor láser de la cámara"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Actualizaciones automáticas del sistema"</string>
     <string name="usage" msgid="2977875522080448986">"Uso"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Uso de datos móviles"</string>
@@ -3408,7 +3425,7 @@
     <string name="data_warning" msgid="209133958008062117">"Advertencia de datos"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Establecer límite de datos"</string>
     <string name="data_limit" msgid="1885406964934590552">"Límite de datos"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"Datos usados entre <xliff:g id="ID_2">%2$s</xliff:g>: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"Se usaron <xliff:g id="ID_1">%1$s</xliff:g> en el período: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configurar"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Otras apps incluidas en el uso de datos"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3477,7 +3494,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Borrar y convertir"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Restablecer la limitación de frecuencia de ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Se restableció la limitación de frecuencia de ShortcutManager"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlar notific. en pantalla bloqueada"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Controlar los datos que aparecen en la 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="8483187649355540109">"Asistencia"</string>
@@ -3485,7 +3502,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Ninguna app que instalaste solicitó acceso a SMS premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"SMS Premium podría implicar cargos en la factura de tu proveedor. Si otorgaste permiso a alguna app, podrás enviar SMS premium con esa app."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Acceso a SMS premium"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"No visible para otros dispositivos"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Inhabilitado"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Conectado a <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Conectado a varios dispositivos"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Modo demostración de la IU del sistema"</string>
@@ -3587,7 +3604,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Apps instantáneas"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Abre vínculos en apps, incluso aunque no estén instaladas"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Apps instantáneas"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Cuenta para apps instantáneas"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Preferencias de las Apps instantáneas"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Apps instaladas"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Tu almacenamiento ahora está a cargo del administrador de almacenamiento"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Cuentas de <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3634,7 +3651,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Se activó la función \"VPN siempre activada\" en tu perfil personal"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Se activó la función \"VPN siempre activada\" en tu perfil de trabajo"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Se estableció el proxy HTTP global"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Credenciales de confianza"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Credenciales de confianza"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Credenciales de confianza en tu perfil personal"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Credenciales de confianza en tu perfil de trabajo"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Al menos <xliff:g id="COUNT_1">%d</xliff:g> certificados de CA</item>
       <item quantity="one">Al menos <xliff:g id="COUNT_0">%d</xliff:g> certificado de CA</item>
@@ -3697,7 +3716,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Información del aprovisionamiento del proveedor"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Activar aprovisionamiento del proveedor"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"¿Cuáles son las novedades y qué es lo más emocionante?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Descubre las 5 características principales"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Descubre tu nuevo teléfono"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Descubre tu nueva tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Descubre tu nuevo dispositivo"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"La función no está disponible en este dispositivo"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Estado de registro de IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrado"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Sin registrar"</string>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index bd5e0d9..5909302 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -466,7 +466,7 @@
     <item msgid="6652164677254579050">"En caché (vacío)"</item>
   </string-array>
   <string-array name="color_picker">
-    <item msgid="7631642672260600032">"Turquesa"</item>
+    <item msgid="7631642672260600032">"Verde azulado"</item>
     <item msgid="8332294763632946560">"Azul"</item>
     <item msgid="2023216417616991392">"Índigo"</item>
     <item msgid="3170497246594232819">"Violeta"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 30e4c8a..c688ae5 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s quiere acceder a tus mensajes. ¿Quieres permitir el acceso a %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitud de acceso de SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> quiere acceder a tu tarjeta SIM. Si lo permites, se inhabilitará la conexión de datos del dispositivo durante la conexión. Conceder acceso a <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visible como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para otros dispositivos"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para otros dispositivos"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Tus dispositivos"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Vincular dispositivo nuevo"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Fecha y hora"</string>
@@ -372,9 +372,12 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Siguiente"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otros usuarios utilicen este tablet si lo pierdes, te lo roban o se restablecen sus datos de fábrica."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otros usuarios lo utilicen si lo pierdes, te lo roban o se restablecen sus datos de fábrica."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otros usuarios utilicen este teléfono si lo pierdes, te lo roban o se restablecen sus datos de fábrica."</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"¿Saltar huella digital?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Solo tardarás un minuto o dos en configurar la huella digital. Si te saltas este paso, puedes añadir tu huella digital en otro momento desde los ajustes."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"¿Saltar bloqueo de pantalla?"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otros usuarios utilicen este tablet si lo pierdes, te lo roban o se restablecen su estado de fábrica."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otros usuarios lo utilicen si lo pierdes, te lo roban o se restablecen su estado de fábrica."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otros usuarios utilicen este teléfono si lo pierdes, te lo roban o se restablecen su estado de fábrica."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otros usuarios utilicen este tablet si lo pierdes o te lo roban."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otros usuarios lo utilicen si lo pierdes o te lo roban."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otros usuarios utilicen este teléfono si lo pierdes o te lo roban."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Has añadido el número máximo de huellas digitales"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"No se pueden añadir más huellas digitales"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"¿Quitar todas las huellas?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Eliminar \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\""</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"¿Quieres eliminar esta huella digital?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"No podrás utilizar tus huellas digitales para desbloquear el teléfono, autorizar compras o iniciar sesión en las aplicaciones"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"No puedes utilizar tus huellas digitales para desbloquear el perfil de trabajo, autorizar compras o iniciar sesión en aplicaciones de trabajo"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Sí, quitar"</string>
@@ -419,8 +424,8 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Cifrar tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Cifrar teléfono"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Cifrado"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"Puedes cifrar tus cuentas, los ajustes, las aplicaciones descargadas y sus datos, archivos multimedia y otros archivos. Después de cifrar el tablet, siempre que hayas configurado una pantalla de bloqueo (es decir, un patrón, una contraseña o un PIN numérico), tendrás que desbloquear la pantalla para descifrar el tablet cada vez que lo enciendas. También puedes descifrar el dispositivo restableciendo los datos de fábrica, pero se borrarán todos tus datos.\n\nEl proceso de cifrado tarda 1 hora o más. Debes iniciar el proceso con la batería cargada y mantener el tablet enchufado. Si se interrumpe el proceso, perderás tus datos de forma total o parcial"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"Puedes cifrar tus cuentas, los ajustes, las aplicaciones descargadas y sus datos, archivos multimedia y otros archivos. Después de cifrar el teléfono, siempre que hayas configurado una pantalla de bloqueo (es decir, un patrón, una contraseña o un PIN numérico), tendrás que desbloquear la pantalla para descifrar el teléfono cada vez que lo enciendas. También puedes descifrar el dispositivo restableciendo los datos de fábrica, pero se borrarán todos tus datos.\n\nEl proceso de cifrar tarda 1 hora o más. Debes iniciar el proceso con la batería cargada y mantener el teléfono enchufado. Si se interrumpe el proceso, perderás tus datos de forma total o parcial."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"Puedes cifrar tus cuentas, los ajustes, las aplicaciones descargadas y sus datos, archivos multimedia y otros archivos. Después de cifrar el tablet, siempre que hayas configurado una pantalla de bloqueo (es decir, un patrón, una contraseña o un PIN numérico), tendrás que desbloquear la pantalla para descifrar el tablet cada vez que lo enciendas. También puedes descifrar el dispositivo restableciendo el estado de fábrica, pero se borrarán todos tus datos.\n\nEl proceso de cifrado tarda 1 hora o más. Debes iniciar el proceso con la batería cargada y mantener el tablet enchufado. Si se interrumpe el proceso, perderás tus datos de forma total o parcial"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"Puedes cifrar tus cuentas, los ajustes, las aplicaciones descargadas y sus datos, archivos multimedia y otros archivos. Después de cifrar el teléfono, siempre que hayas configurado una pantalla de bloqueo (es decir, un patrón, una contraseña o un PIN numérico), tendrás que desbloquear la pantalla para descifrar el teléfono cada vez que lo enciendas. También puedes descifrar el dispositivo restableciendo el estado de fábrica, pero se borrarán todos tus datos.\n\nEl proceso de cifrar tarda 1 hora o más. Debes iniciar el proceso con la batería cargada y mantener el teléfono enchufado. Si se interrumpe el proceso, perderás tus datos de forma total o parcial."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Cifrar tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Cifrar teléfono"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Carga la batería y vuelve a intentarlo."</string>
@@ -440,11 +445,11 @@
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Advertencia: Se borrarán los datos del dispositivo después de otros <xliff:g id="COUNT">^1</xliff:g> intentos fallidos para desbloquearlo"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Escribe tu contraseña"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Error en el cifrado"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"El proceso de cifrado se ha interrumpido y no se puede completar. No podrás volver a acceder a los datos del tablet. \n\nDebes restablecer los datos de fábrica para volver a usar el tablet. Cuando configures el tablet después de este proceso, podrás restaurar los datos de los que hayas hecho una copia de seguridad en tu cuenta de Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"El cifrado se ha interrumpido y no se puede completar. No podrás volver a acceder a los datos del teléfono. \n\nDebes restablecer los datos de fábrica para volver a usar el teléfono. Cuando configures el teléfono después de este proceso, podrás restaurar los datos de los que hayas hecho una copia de seguridad en tu cuenta de Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"El proceso de cifrado se ha interrumpido y no se puede completar. No podrás volver a acceder a los datos del tablet. \n\nDebes restablecer el estado de fábrica para volver a usar el tablet. Cuando configures el tablet después de este proceso, podrás restaurar los datos de los que hayas hecho una copia de seguridad en tu cuenta de Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"El cifrado se ha interrumpido y no se puede completar. No podrás volver a acceder a los datos del teléfono. \n\nDebes restablecer el estado de fábrica para volver a usar el teléfono. Cuando configures el teléfono después de este proceso, podrás restaurar los datos de los que hayas hecho una copia de seguridad en tu cuenta de Google."</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"Descifrado incorrecto"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"La contraseña que has introducido es correcta pero, lamentablemente, tus datos están dañados. \n\nPara seguir utilizando el tablet, debes restablecer los datos de fábrica. Al configurar el dispositivo después de este proceso, podrás restaurar los datos incluidos en la copia de seguridad de tu cuenta de Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"La contraseña que has introducido es correcta pero, lamentablemente, tus datos están dañados. \n\nPara seguir utilizando el teléfono, debes restablecer los datos de fábrica. Al configurar el dispositivo después de este proceso, podrás restaurar los datos incluidos en la copia de seguridad de tu cuenta de Google."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"La contraseña que has introducido es correcta pero, lamentablemente, tus datos están dañados. \n\nPara seguir utilizando el tablet, debes restablecer el estado de fábrica. Al configurar el dispositivo después de este proceso, podrás restaurar los datos incluidos en la copia de seguridad de tu cuenta de Google."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"La contraseña que has introducido es correcta pero, lamentablemente, tus datos están dañados. \n\nPara seguir utilizando el teléfono, debes restablecer el estado de fábrica. Al configurar el dispositivo después de este proceso, podrás restaurar los datos incluidos en la copia de seguridad de tu cuenta de Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Cambiar método de entrada"</string>
     <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Establecer el bloqueo de pantalla"</string>
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protege tu dispositivo"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protege tu tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protege tu dispositivo"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protege tu teléfono"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Para mayor seguridad, configura un bloqueo de pantalla para la copia de seguridad."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Para mayor seguridad, configura un bloqueo de pantalla para la copia de seguridad."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activa las funciones de protección del dispositivo para evitar que otros utilicen el tablet sin tu permiso. Elige el bloqueo de pantalla que quieras utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activa las funciones de protección del dispositivo para evitar que otros lo utilicen sin tu permiso. Elige el bloqueo de pantalla que quieras utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activa las funciones de protección del dispositivo para evitar que otros utilicen el teléfono sin tu permiso. Elige el bloqueo de pantalla que quieras utilizar."</string>
@@ -497,37 +502,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"¿Quitar protección del dispositivo?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"¿Quieres quitar la protección del perfil?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Las funciones de protección del dispositivo no funcionarán sin tu patrón."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Las funciones de protección del dispositivo no funcionarán sin tu patrón.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Las funciones de protección del dispositivo no funcionarán sin el patrón.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Las huellas digitales guardadas también se eliminarán de este dispositivo y no podrás desbloquear el teléfono, autorizar compras ni iniciar sesión en las aplicaciones con ellas."</string>
+</xliff:g>Las huellas digitales guardadas también se eliminarán de este dispositivo y no podrás utilizarlas para desbloquear el teléfono, autorizar compras ni iniciar sesión en las aplicaciones."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Las funciones de protección del dispositivo no funcionarán sin tu PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Las funciones de protección del dispositivo no funcionarán sin tu PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Las funciones de protección del dispositivo no funcionarán sin el PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Las huellas digitales guardadas también se eliminarán de este dispositivo y no podrás desbloquear el teléfono, autorizar compras ni iniciar sesión en las aplicaciones con ellas."</string>
+</xliff:g>Las huellas digitales guardadas también se eliminarán de este dispositivo y no podrás utilizarlas para desbloquear el teléfono, autorizar compras ni iniciar sesión en las aplicaciones."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Las funciones de protección del dispositivo no funcionarán sin tu contraseña."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Las funciones de protección del dispositivo no funcionarán sin tu contraseña.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Las funciones de protección del dispositivo no funcionarán sin la contraseña.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Las huellas digitales guardadas también se eliminarán de este dispositivo y no podrás desbloquear el teléfono, autorizar compras ni iniciar sesión en las aplicaciones con ellas."</string>
+</xliff:g>Las huellas digitales guardadas también se eliminarán de este dispositivo y no podrás utilizarlas para desbloquear el teléfono, autorizar compras ni iniciar sesión en las aplicaciones."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Las funciones de protección del dispositivo no funcionarán sin tu bloqueo de pantalla."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Las funciones de protección del dispositivo no funcionarán sin tu bloqueo de pantalla.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Las funciones de protección del dispositivo no funcionarán sin el bloqueo de pantalla.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Las huellas digitales guardadas también se eliminarán de este dispositivo y no podrás desbloquear el teléfono, autorizar compras ni iniciar sesión en las aplicaciones con ellas."</string>
+</xliff:g>Las huellas digitales guardadas también se eliminarán de este dispositivo y no podrás utilizarlas para desbloquear el teléfono, autorizar compras ni iniciar sesión en las aplicaciones."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Las funciones de protección del perfil no funcionan sin el patrón."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Las funciones de protección del perfil no funcionan sin el patrón.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Las funciones de protección del perfil no funcionarán sin el patrón.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Las huellas digitales guardadas también se eliminarán del perfil y no podrás utilizarlas para desbloquearlo, autorizar compras ni iniciar sesión en aplicaciones."</string>
+</xliff:g>Las huellas digitales guardadas también se eliminarán de este perfil y no podrás utilizarlas para desbloquearlo, autorizar compras ni iniciar sesión en las aplicaciones."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Las funciones de protección del perfil no funcionan sin el PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Las funciones de protección del perfil no funcionan sin el PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Las funciones de protección del perfil no funcionarán sin el PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Las huellas digitales guardadas también se eliminarán del perfil y no podrás utilizarlas para desbloquearlo, autorizar compras ni iniciar sesión en aplicaciones."</string>
+</xliff:g>Las huellas digitales guardadas también se eliminarán de este perfil y no podrás utilizarlas para desbloquearlo, autorizar compras ni iniciar sesión en las aplicaciones."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Las funciones de protección del perfil no funcionan sin la contraseña."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Las funciones de protección del perfil no funcionan sin la contraseña.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Las funciones de protección del perfil no funcionarán sin la contraseña.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Las huellas digitales guardadas también se eliminarán del perfil y no podrás utilizarlas para desbloquearlo, autorizar compras ni iniciar sesión en aplicaciones."</string>
+</xliff:g>Las huellas digitales guardadas también se eliminarán de este perfil y no podrás utilizarlas para desbloquearlo, autorizar compras ni iniciar sesión en las aplicaciones."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Las funciones de protección del perfil no funcionan sin el bloqueo de pantalla."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Las funciones de protección del perfil no funcionan sin el bloqueo de pantalla.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Las funciones de protección del perfil no funcionarán sin el bloqueo de pantalla.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Las huellas digitales guardadas también se eliminarán del perfil y no podrás utilizarlas para desbloquearlo, autorizar compras ni iniciar sesión en aplicaciones."</string>
+</xliff:g>Las huellas digitales guardadas también se eliminarán del perfil y no podrás utilizarlas para desbloquearlo, autorizar compras ni iniciar sesión en las aplicaciones."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Sí, quitar"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Cambiar patrón desbloqueo"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambiar PIN de desbloqueo"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"No se permite utilizar una secuencia ascendente, descendente ni repetida de dígitos"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Aceptar"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancelar"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Borrar"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancelar"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Siguiente"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Se ha completado la configuración."</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introduce la contraseña de tu red"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Red Wi‑Fi del operador"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Conectar a través de <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para mejorar la precisión de la ubicación y para otros fines, <xliff:g id="APP_NAME">%1$s</xliff:g> quiere activar la búsqueda de redes aunque la conexión Wi-Fi esté desactivada.\n\n¿Permitir para todas las aplicaciones que quieran buscar redes?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Para desactivar esta opción, accede a las opciones avanzadas del menú adicional."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Error al conectar a la red"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Olvidar"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modificar"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Error al olvidar la red"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Guardar"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Error al guardar la red"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Ajustes avanzados de Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Dirección MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Dirección IP"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Información de red"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Máscara de subred"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Direcciones IPv6"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"¿Quieres cancelar la invitación?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"¿Quieres cancelar la invitación para conectar con <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"¿Olvidar este grupo?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Crear punto de acceso Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Punto de acceso Wi-Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"No se está compartiendo la conexión a Internet ni el contenido con otros dispositivos"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Se está compartiendo la conexión a Internet de este tablet mediante un punto de acceso"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Se está compartiendo la conexión a Internet de este teléfono mediante un punto de acceso"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"La aplicación está compartiendo contenido. Para compartir la conexión a Internet, desactiva el punto de acceso y vuelve a activarlo."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nombre de Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Nombre del punto de acceso"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Activando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Otros dispositivos pueden conectarse a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Contraseña de Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Contraseña del punto de acceso"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda de punto de acceso"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Utiliza un punto de acceso con el fin de crear una red Wi-Fi para otros dispositivos. Los puntos de acceso ofrecen acceso a Internet mediante tu conexión de datos móviles. Es posible que se apliquen cargos adicionales por el uso de datos."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Las aplicaciones pueden crear un punto de acceso para compartir contenido con dispositivos cercanos."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Dirección que utilizan los servicios de emergencia como tu ubicación si hacer una llamada de emergencia por Wi‑Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sonido"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumen"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Búsqueda"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Administrar historial y configuración de búsqueda"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Sin resultados"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Borrar historial"</string>
     <string name="display_settings" msgid="7965901687241669598">"Pantalla"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Girar pantalla automáticamente"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Colores intensos"</string>
@@ -1324,21 +1334,17 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Restaurando la configuración de APN predeterminada"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Restablecer ajustes"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Se ha restablecido la configuración predeterminada de APN."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Restablecer ajustes"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Restablecer ajustes de red"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Opciones de recuperación"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Se puede recuperar la configuración de la red, de las aplicaciones o del dispositivo"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Recuperar ajustes de Wi-Fi, red móvil y Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Se recuperarán todos los ajustes de red, como:\n\n"<li>"Wi‑Fi"</li>\n<li>"Datos móviles"</li>\n<li>"Bluetooth"</li></string>
-    <string name="reset_network_button_text" msgid="2035676527471089853">"Restablecer ajustes"</string>
-    <string name="reset_network_final_desc" msgid="6388371121099245116">"¿Quieres restablecer todos los ajustes de red? Esta acción no se puede deshacer."</string>
-    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Restablecer ajustes"</string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Recuperar ajustes"</string>
+    <string name="reset_network_final_desc" msgid="6388371121099245116">"¿Quieres recuperar todos los ajustes de red? Esta acción no se puede deshacer."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Recuperar ajustes"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"¿Restablecer?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Este usuario no puede restablecer la red"</string>
-    <string name="reset_network_complete_toast" msgid="787829973559541880">"Se han restablecido los ajustes de red"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Restablecer datos de fábrica"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other">Se borrarán los ajustes de <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> cuentas</item>
-      <item quantity="one">Se borrarán los ajustes de 1 cuenta</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Se restaurarán todos los datos y el almacenamiento interno"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Se han recuperado los ajustes de red"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Borrar todos los datos (recuperar estado de fábrica)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del tablet, como:\n\n"<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del teléfono, como:\n\n"<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Has iniciado sesión en las cuentas que se indican a continuación:\n"</string>
@@ -1361,7 +1367,7 @@
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Borrar todo"</string>
     <string name="master_clear_failed" msgid="2503230016394586353">"No se ha reiniciado el sistema porque el servicio Borrado del sistema no está disponible."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"¿Restablecer?"</string>
-    <string name="master_clear_not_available" msgid="1000370707967468909">"Este usuario no puede restablecer los datos de fábrica"</string>
+    <string name="master_clear_not_available" msgid="1000370707967468909">"Este usuario no puede restablecer el estado de fábrica"</string>
     <string name="master_clear_progress_title" msgid="5194793778701994634">"Borrando"</string>
     <string name="master_clear_progress_text" msgid="6559096229480527510">"Espera..."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Ajustes de llamadas"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Información de seguridad"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"No tienes conexión de datos. Para ver esta información, accede a %s desde cualquier ordenador conectado a Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Cargando…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Elige tu contraseña"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Establece el bloqueo de pantalla"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Por seguridad, establece una contraseña"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Para usar la huella, añade una contraseña"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Elige un patrón"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Para usar huellas, añade un patrón"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Elige tu PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Por seguridad, establece un PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Para usar la huella, añade un PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirma tu contraseña"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Vuelve a introducir tu contraseña"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirma el patrón"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirma el PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Vuelve a introducir tu PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Las contraseñas no coinciden"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Los números PIN no coinciden"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Método de desbloqueo"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Utiliza tu patrón del trabajo para continuar"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Introduce tu PIN del trabajo para continuar"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Introduce la contraseña de tu perfil de trabajo para continuar"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Utiliza el patrón del dispositivo para continuar (paso necesario después de reiniciar)."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Introduce el PIN del dispositivo para continuar (paso necesario después de reiniciar)."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Introduce la contraseña del dispositivo para continuar (paso necesario después de reiniciar)."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Utiliza el patrón de tu perfil de trabajo para continuar (paso necesario después de reiniciar)."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Introduce el PIN de tu perfil de trabajo para continuar (paso necesario después de reiniciar)."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Introduce la contraseña del perfil de trabajo para continuar (paso necesario después de reiniciar)."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Para mayor seguridad, utiliza el patrón del dispositivo"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Para mayor seguridad, introduce el PIN del dispositivo"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Para mayor seguridad, introduce la contraseña del dispositivo"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Para mayor seguridad, utiliza el patrón del perfil de trabajo"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Para mayor seguridad, introduce el PIN del perfil de trabajo"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Para mayor seguridad, introduce la contraseña del perfil de trabajo"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Se han recuperado los ajustes de fábrica del teléfono. Para usarlo, introduce tu antiguo patrón."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Se han recuperado los ajustes de fábrica del teléfono. Para usarlo, introduce tu antiguo PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Se han recuperado los ajustes de fábrica del teléfono. Para usarlo, introduce tu antigua contraseña."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verificar patrón"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verificar PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verificar contraseña"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN incorrecto"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Contraseña incorrecta"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Patrón incorrecto"</string>
@@ -1714,7 +1727,7 @@
     <string name="language_settings" msgid="8758655933029560944">"Idiomas e introducción de texto"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Idiomas e introducción de texto"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Asistencia de entrada"</string>
-    <string name="keyboard_settings_category" msgid="8275523930352487827">"Teclado y métodos de introducción"</string>
+    <string name="keyboard_settings_category" msgid="8275523930352487827">"Teclado e introducción de texto"</string>
     <string name="phone_language" msgid="7116581601133118044">"Idiomas"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Corrección automática"</string>
@@ -1729,7 +1742,7 @@
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Este corrector ortográfico puede registrar todo lo que escribas, incluidos datos personales, como las contraseñas y los números de las tarjetas de crédito. Procede de la aplicación <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. ¿Quieres usar este corrector ortográfico?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Ajustes"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Idioma"</string>
-    <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"Teclado y métodos de introducción"</string>
+    <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"Teclado e introducción de texto"</string>
     <string name="virtual_keyboard_category" msgid="1012830752318677119">"Teclado virtual"</string>
     <string name="available_virtual_keyboard_category" msgid="7645766574969139819">"Teclado virtual disponible"</string>
     <string name="add_virtual_keyboard" msgid="3302152381456516928">"Administrar teclados"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"¿Crear widget y permitir acceso?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Después de crear el widget, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> podrá acceder a todos los datos que muestre."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Permitir que <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> pueda crear widgets y acceder a sus datos siempre"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> min <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> min"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Estadísticas de uso"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Estadísticas de uso"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Ordenar por:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Lectores de pantalla, pantalla, controles de interacción"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Ajustes de visión"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Personaliza este dispositivo para adaptarlo a tus necesidades. Puedes modificar las funciones de accesibilidad posteriormente en Ajustes."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Aumentar el tamaño de la fuente"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Cambiar tamaño de la fuente"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Lectores de pantalla"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio y texto en pantalla"</string>
     <string name="display_category_title" msgid="685461049938269166">"Pantalla"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Para ampliar el contenido"</b>", toca la pantalla tres veces rápidamente.\n"<ul><li>"Arrastra dos o más dedos para desplazarte"</li>\n<li>"Pellizca la pantalla con dos dedos o más para ajustar el zoom"</li></ul>\n\n<b>"Para ampliar elementos de forma temporal"</b>", toca la pantalla tres veces rápidamente y mantenla pulsada en el tercer toque.\n"<ul><li>"Arrastra el dedo para desplazarte por la pantalla"</li>\n<li>"Levanta el dedo para reducir la imagen"</li></ul>\n\n"No se puede ampliar el teclado ni la barra de navegación."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Si la ampliación está activada, utiliza el botón Accesibilidad situado en la parte inferior de la pantalla para ampliarla de forma rápida.\n\n"<b>"Para ampliar,"</b>" solo tienes que tocar el botón Accesibilidad y, a continuación, tocar la parte de la pantalla que quieras ampliar.\n"<ul><li>"Arrastra dos dedos o más para desplazarte"</li>\n<li>"Pellizca la pantalla con dos dedos o más para ajustar el zoom"</li></ul>\n\n<b>"Para ampliar elementos de forma temporal"</b>", toca el botón Accesibilidad y, a continuación, mantén pulsada cualquier parte de la pantalla.\n"<ul><li>"Arrastra el dedo para desplazarte por la pantalla"</li>\n<li>"Levanta el dedo para reducir la imagen"</li></ul>\n\n"No se puede ampliar el teclado ni la barra de navegación."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Se ha definido <xliff:g id="SERVICE">%1$s</xliff:g> como preferencia de Accesibilidad. Para utilizar la ampliación, mantén pulsado el botón Accesibilidad y selecciona esa opción."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Acceso a accesibilidad"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Función de las teclas de volumen"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Servicio del acceso directo"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Permitir en la pantalla de bloqueo"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Si el acceso directo está activado, pulsa los dos botones de volumen durante tres segundos para iniciar una función de accesibilidad."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Si la opción está activada, puedes pulsar ambas teclas de volumen durante 3 segundos para iniciar una función de accesibilidad."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Texto de alto contraste"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Actualizar ampliación automáticamente"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Actualizar ampliación de la pantalla al cambiar aplicaciones"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Puede afectar al rendimiento"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clic después de que el puntero deje de moverse"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Retraso antes del clic"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ACTIVADO"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESACTIVADO"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Mostrar en ajustes rápidos"</string>
@@ -2201,7 +2206,7 @@
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Instalar certificados desde la tarjeta SD"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Eliminar certificados"</string>
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Quitar todos los certificados"</string>
-    <string name="trusted_credentials" msgid="4266945289534242402">"Certificados de confianza"</string>
+    <string name="trusted_credentials" msgid="4266945289534242402">"Credenciales de confianza"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados de CA de confianza"</string>
     <string name="user_credentials" msgid="3719013347787187083">"Credenciales de usuario"</string>
     <string name="user_credentials_summary" msgid="7271228342106080167">"Ver y modificar credenciales almacenadas"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Has seleccionado <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>."</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Seleccionar todo"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Administrar planes"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de datos"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Uso de datos de la aplicación"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"El uso de datos del operador puede ser diferente al calculado por el dispositivo."</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Redes móviles"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Redes Wi-Fi sin tarifa plana"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Para seleccionar redes sin tarifa plana, activa el Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automática"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Sin tarifa plana"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Con tarifa plana"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"El uso de datos del operador puede ser diferente al calculado por el dispositivo."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Llamada de emergencia"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Volver a llamada"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Administrador de llamadas"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Radiodifusiones de emergencia"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Alertas de emergencias"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Operadores de red"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Nombres de punto de acceso"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Modo 4G LTE mejorado"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"SIM preferida para"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Preguntar siempre"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Debes seleccionar una opción"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Selección de SIM"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Ajustes"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">Mostrar %d elementos ocultos</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificaciones de aplicaciones"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoría de notificaciones"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importancia"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Permite que la aplicación decida"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Permitir sonido"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"No mostrar notificaciones nunca"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Sin sonido ni interrupción visual"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Sin sonido"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Emitir sonido"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Emitir sonido y mostrar en pantalla"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Mostrar en pantalla"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Baja"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Media"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Alta"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgente"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Permitir sonido"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"No emitir sonido, vibrar ni mostrar notificaciones en la pantalla actual."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Permitir interrupciones"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Permite que la aplicación emita sonido, vibre o muestre notificaciones en la pantalla"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Poco importante"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Algo importante"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Muy importante"</string>
@@ -2921,8 +2932,8 @@
     <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Las aplicaciones instaladas no admiten el modo Imagen en imagen"</string>
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"imagen PIP en"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Imagen en imagen"</string>
-    <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Permitir pantalla en pantalla"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Permite que la aplicación cree una ventana imagen en imagen mientras esté abierta o después de que hayas salido de ella (por ejemplo, para seguir viendo un vídeo). La ventana se muestra sobre otras aplicaciones que estés utilizando."</string>
+    <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Permitir imagen en imagen"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Permite que la aplicación cree una ventana imagen en imagen mientras esté abierta o después de que hayas salido de ella (por ejemplo, para seguir viendo un vídeo). La ventana se muestra sobre otras aplicaciones que estés utilizando."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acceso a No molestar"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ninguna aplicación instalada ha solicitado acceso de No molestar"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicaciones..."</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transferir archivos"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transferir fotos (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Utilizar el dispositivo como MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Mirroring de SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"comprobación de uso en segundo plano"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Acceso completo en segundo plano"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Usar texto de la pantalla"</string>
@@ -3367,6 +3379,8 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Las datos en segundo plano 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="night_display_suggestion_title" msgid="6602129097059325291">"Definir horario de luz nocturna"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Pantalla ámbar para ayudar a conciliar sueño"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Luz nocturna activada"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"La pantalla adopta un tono ámbar que puede ayudarte a conciliar el sueño."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Sugerencias"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilizar colores de pantalla más fríos"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar el cambio de color, apaga la pantalla"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Para aplicar el cambio al monitor de telefonía, reinicia el dispositivo"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Cámara HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Para aplicar el cambio a la cámara HAL HDR+, reinicia el dispositivo"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor láser de la cámara"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Actualizaciones del sistema automáticas"</string>
     <string name="usage" msgid="2977875522080448986">"Uso"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Uso de datos móviles"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Advertencia de datos"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Establecer límite de datos"</string>
     <string name="data_limit" msgid="1885406964934590552">"Límite de datos"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> usados entre el <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"Usados: <xliff:g id="ID_1">%1$s</xliff:g> (<xliff:g id="ID_2">%2$s</xliff:g>)"</string>
     <string name="configure" msgid="1029654422228677273">"Configurar"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Otras aplicaciones incluidas en el uso"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Borrar y convertir"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Restablecer límite de frecuencia de ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Se ha restablecido el límite de frecuencia de ShortcutManager"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlar notificac. en pantalla bloqueo"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Controlar los datos que aparecen en la pantalla de 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="8483187649355540109">"Ayuda y consejos"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Ninguna aplicación instalada ha solicitado acceso SMS premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Es posible que el envío de SMS premium te cueste dinero y el importe correspondiente se sume a las facturas de tu operador. Si habilitas el permiso para una aplicación, puedes enviar SMS premium con ella."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Acceso a SMS premium"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Invisible para otros dispositivos"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Desactivado"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Conectado a <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Conectado a varios dispositivos"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Modo de demostración de IU del sistema"</string>
@@ -3561,7 +3578,7 @@
     <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Gira el teléfono dos veces para activar el modo selfie"</string>
     <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Gira el tablet dos veces para activar el modo selfie"</string>
     <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Gira el dispositivo dos veces para activar el modo selfie"</string>
-    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Tocar el teléfono dos veces para comprobarlo"</string>
+    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Tocar el teléfono dos veces para consultarlo"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tocar el tablet dos veces para comprobar notificaciones"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Tocar el dispositivo dos veces para comprobar notificaciones"</string>
     <string name="ambient_display_summary" msgid="525662960806416373">"Toca la pantalla dos veces para ver la hora, los iconos de notificación y otra información."</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Aplicaciones instantáneas"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Abre enlaces en aplicaciones aunque no estén instaladas"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Aplicaciones instantáneas"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Cuenta de aplicaciones instantáneas"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Preferencias de Aplicaciones Instantáneas"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplicaciones instaladas"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"El Administrador de Almacenamiento gestiona ahora el almacenamiento"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Cuentas de <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Se ha activado el modo de VPN siempre activada en tu perfil personal"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Se ha activado el modo de VPN siempre activada en tu perfil de trabajo"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Se ha definido el proxy HTTP global"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Credenciales de confianza"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Credenciales de confianza"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Credenciales de confianza en tu perfil personal"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Credenciales de confianza en tu perfil de trabajo"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Como mínimo, <xliff:g id="COUNT_1">%d</xliff:g> certificados de CA</item>
       <item quantity="one">Como mínimo, <xliff:g id="COUNT_0">%d</xliff:g> certificado de CA</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Información de servicios del operador"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Activar servicios del operador"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"¿Cuáles son las fascinantes novedades?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Consulta las 5 funciones principales"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Descubre tu nuevo teléfono"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Descubre tu nuevo tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Descubre tu nuevo dispositivo"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Esta función no está disponible en este dispositivo"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Estado del registro de IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrado"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"No registrado"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 780e906..fa2818e 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s soovib saada juurdepääsu sõnumitele. Kas anda seadmele %2$s juurdepääs?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Juurdepääsutaotlus SIM-kaardile"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Seade <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> soovib juurdepääsu teie SIM-kaardile. Kui annate juurdepääsu SIM-kaardile, keelatakse seadmes ühenduse ajaks andmesideühendus. Juurdepääsu andmine seadmele <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Teistele seadmetele nähtav seadmena „<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Teistele seadmetele nähtav seadmena „<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Teie seadmed"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Uue seadme sidumine"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Kuupäev ja kellaaeg"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Järgmine"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Kas jätta sõrmejälg vahele?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Sõrmejälje seadistamiseks kulub vaid paar minutit. Kui selle vahele jätate, saab sõrmejälje hiljem lisada menüüs Seaded."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Kas jätta ekraanilukk vahele?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Seadme kaitsefunktsioone ei lülitata sisse. Te ei saa tahvelarvuti kaotsimineku, varguse või lähtestamise puhul teistel selle kasutamist takistada."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Seadme kaitsefunktsioone ei lülitata sisse. Te ei saa seadme kaotsimineku, varguse või lähtestamise puhul teistel selle kasutamist takistada."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Seadme kaitsefunktsioone ei lülitata sisse. Te ei saa telefoni kaotsimineku, varguse või lähtestamise puhul teistel selle kasutamist takistada."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Olete lisanud maksimaalse arvu sõrmejälgi"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Rohkem sõrmejälgi ei saa lisada"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Kas eemaldada kõik sõrmejäljed?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Sõrmejälje „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>” eemaldamine"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Kas soovite selle sõrmejälje kustutada?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Te ei saa oma sõrmejälgi kasutades telefoni avada, oste volitada ega rakendustesse sisse logida"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Te ei saa oma sõrmejälgi kasutades tööprofiili avada, oste volitada ega töörakendustesse sisse logida"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Jah, eemalda"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Tahvelarvuti kaitsmine"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Seadme kaitsmine"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Telefoni kaitsmine"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Lisaturvalisuse jaoks seadistage varuekraanilukk."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Lisaturvalisuse huvides seadistage varuekraanilukk."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Aktiveerige seadme kaitsefunktsioonid, et teised ei saaks ilma teie loata tahvelarvutit kasutada. Valige kasutatav ekraanilukk."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Aktiveerige seadme kaitsefunktsioonid, et teised ei saaks ilma teie loata seadet kasutada. Valige kasutatav ekraanilukk."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Aktiveerige seadme kaitsefunktsioonid, et teised ei saaks ilma teie loata telefoni kasutada. Valige kasutatav ekraanilukk."</string>
@@ -497,37 +502,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Kas eemaldada seadme kaitse?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Kas eemaldada profiili kaitsefunktsioonid?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Seadme kaitsefunktsioonid ei tööta ilma teie mustrita."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Seadme kaitsefunktsioonid ei tööta ilma teie mustrita.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Seadme kaitsefunktsioonid ei tööta ilma teie mustrita.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Seadmest eemaldatakse ka teie salvestatud sõrmejäljed ja te ei saa oma telefoni avada, oste volitada ega nendega rakendustesse sisse logida.”"</string>
+</xliff:g>Seadmest eemaldatakse ka teie salvestatud sõrmejäljed ja te ei saa nendega oma telefoni avada, oste volitada ega rakendustesse sisse logida."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Seadme kaitsefunktsioonid ei tööta ilma teie PIN-koodita."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Seadme kaitsefunktsioonid ei tööta ilma teie PIN-koodita.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Seadme kaitsefunktsioonid ei tööta ilma teie PIN-koodita.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Seadmest eemaldatakse ka teie salvestatud sõrmejäljed ja te ei saa oma telefoni avada, oste volitada ega nendega rakendustesse sisse logida.”"</string>
+</xliff:g>Seadmest eemaldatakse ka teie salvestatud sõrmejäljed ja te ei saa nendega oma telefoni avada, oste volitada ega rakendustesse sisse logida."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Seadme kaitsefunktsioonid ei tööta ilma teie paroolita."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Seadme kaitsefunktsioonid ei tööta ilma teie paroolita.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Seadme kaitsefunktsioonid ei tööta ilma teie paroolita.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Seadmest eemaldatakse ka teie salvestatud sõrmejäljed ja te ei saa oma telefoni avada, oste volitada ega nendega rakendustesse sisse logida.”"</string>
+</xliff:g>Seadmest eemaldatakse ka teie salvestatud sõrmejäljed ja te ei saa nendega oma telefoni avada, oste volitada ega rakendustesse sisse logida."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Seadme kaitsefunktsioonid ei tööta ilma teie ekraanilukuta."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Seadme kaitsefunktsioonid ei tööta ilma teie ekraanilukuta.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Seadme kaitsefunktsioonid ei tööta ilma teie ekraanilukuta.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Seadmest eemaldatakse ka teie salvestatud sõrmejäljed ja te ei saa oma telefoni avada, oste volitada ega nendega rakendustesse sisse logida.”"</string>
+</xliff:g>Seadmest eemaldatakse ka teie salvestatud sõrmejäljed ja te ei saa nendega oma telefoni avada, oste volitada ega rakendustesse sisse logida."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Profiili kaitsefunktsioonid ei tööta ilma teie mustrita."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Profiili kaitsefunktsioonid ei tööta ilma teie mustrita.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Profiili kaitsefunktsioonid ei tööta ilma teie mustrita.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Profiililt eemaldatakse ka teie salvestatud sõrmejäljed ja te ei saa nendega oma profiili avada, oste volitada ega rakendustesse sisse logida.”"</string>
+</xliff:g>Profiililt eemaldatakse ka teie salvestatud sõrmejäljed ja te ei saa nendega oma profiili avada, oste volitada ega rakendustesse sisse logida."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Profiili kaitsefunktsioonid ei tööta ilma teie PIN-koodita."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Profiili kaitsefunktsioonid ei tööta ilma teie PIN-koodita.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Profiili kaitsefunktsioonid ei tööta ilma teie PIN-koodita.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Profiililt eemaldatakse ka teie salvestatud sõrmejäljed ja te ei saa nendega oma profiili avada, oste volitada ega rakendustesse sisse logida.”"</string>
+</xliff:g>Profiililt eemaldatakse ka teie salvestatud sõrmejäljed ja te ei saa nendega oma profiili avada, oste volitada ega rakendustesse sisse logida."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Profiili kaitsefunktsioonid ei tööta ilma teie paroolita."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Profiili kaitsefunktsioonid ei tööta ilma teie paroolita.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Profiili kaitsefunktsioonid ei tööta ilma teie paroolita.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Profiililt eemaldatakse ka teie salvestatud sõrmejäljed ja te ei saa nendega oma profiili avada, oste volitada ega rakendustesse sisse logida.”"</string>
+</xliff:g>Profiililt eemaldatakse ka teie salvestatud sõrmejäljed ja te ei saa nendega oma profiili avada, oste volitada ega rakendustesse sisse logida."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Profiili kaitsefunktsioonid ei tööta ilma teie ekraanilukuta."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Profiili kaitsefunktsioonid ei tööta ilma teie ekraanilukuta.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Profiili kaitsefunktsioonid ei tööta ilma teie ekraanilukuta.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Profiililt eemaldatakse ka teie salvestatud sõrmejäljed ja te ei saa nendega oma profiili avada, oste volitada ega rakendustesse sisse logida.”"</string>
+</xliff:g>Profiililt eemaldatakse ka teie salvestatud sõrmejäljed ja te ei saa nendega oma profiili avada, oste volitada ega rakendustesse sisse logida."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Jah, eemalda"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Avamismustri muutmine"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Muuda avamise PIN-koodi"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Kasvavad, kahanevad või korduvad numbrijadad on keelatud"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Tühista"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Kustuta"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Tühista"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Järgmine"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Seadistamine on lõpetatud."</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS on saadaval"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" WPS on saadaval"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Sisestage võrgu parool"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Operaatori WiFi-võrk"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Ühendage operaatori <xliff:g id="NAME">%1%s</xliff:g> kaudu"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Täpsema asukoha ja muude toimingute jaoks tahab rakendus <xliff:g id="APP_NAME">%1$s</xliff:g> võrkude skannimise sisse lülitada, isegi kui WiFi on välja lülitatud.\n\nKas lubada see kõigi rakenduste jaoks, mis skannida tahavad?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Väljalülitamiseks avage ületäitemenüüs valik Täpsem."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Luba"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Ühenda"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Võrguga ühenduse loomine ebaõnnestus"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Unusta"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Muuda"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Võrgu unustamine ebaõnnestus"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Salvesta"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Võrgu säilitamine ebaõnnestus"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Täpsemad WiFi-seaded"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-aadress"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-aadress"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Võrguteave"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Alamvõrgu mask"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-aadressid"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Kas tühistada kutse?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Kas soovite tühistada kutse kasutajaga <xliff:g id="PEER_NAME">%1$s</xliff:g> ühenduse loomiseks?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Kas unustada see rühm?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Mobiilne WiFi-kuumkoht"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"WiFi-kuumkoht"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Interneti-ühendust ega sisu teiste seadmetega ei jagata"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Tahvelarvuti Interneti-ühendust jagatakse kuumkoha kaudu"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Telefoni Interneti-ühendust jagatakse kuumkoha kaudu"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Rakendus jagab sisu. Interneti-ühenduse jagamiseks lülitage leviala välja ja seejärel uuesti sisse"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"WiFi-võrgu nimi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Kuumkoha nimi"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Võrgu <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> sisselülitamine …"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Teised seadmed saavad luua ühenduse võrguga <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"WiFi-võrgu parool"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Kuumkoha parool"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP-riba"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"WiFi-võrgu loomiseks teiste seadmete jaoks kasutage kuumkohta. Kuumkoht kasutab Interneti pakkumiseks mobiilset andmesideühendust. Rakenduda võivad mobiilse andmeside tasud."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Rakendused saavad luua kuumkoha, et jagada läheduses olevate seadmetega sisu."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Aadress, mida hädaabiteenused kasutavad teie asukohana, kui teete WiFi kaudu hädaabikõne"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekraan"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Heli"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Helitugevused"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Otsing"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Otsinguseadete ja -ajaloo haldamine"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Tulemusi ei ole"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Kustuta ajalugu"</string>
     <string name="display_settings" msgid="7965901687241669598">"Ekraan"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Pööra ekraani automaatselt"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Erksad värvid"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"APN-i vaikeseadete taastamine."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Lähtesta vaikeseadetele"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"APN-i vaikeseadete lähtestamine on lõpule viidud."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Lähtesta"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Võrguseadete lähtestamine"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Valikute lähtestamine"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Võrgu, rakendused või seadme saab lähtestada"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Lähtesta WiFi, mobiilne andmeside ja Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"See lähtestab kõik võrguseaded, sh:\n\n"<li>"WiFi"</li>\n<li>"Mobiilne andmeside"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Lähtesta seaded"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Kas lähtestada kõik võrguseaded? Seda toimingut ei saa tagasi võtta."</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Kas lähtestada?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Võrguseadete lähtestamine pole selle kasutaja puhul saadaval"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Võrguseaded lähtestati"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Tehaseandmete lähtestamine"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> kontot lähtestatakse</item>
-      <item quantity="one">1 konto lähtestatakse</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Sisemine salvestusruum ja kõik andmed lähtestatakse"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Kustuta kõik andmed (tehaseseadetele lähtestamine)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"See kustutab kõik andmed teie tahvelarvuti "<b>"sisemälust"</b>", sh:\n\n"<li>"teie Google\'i konto"</li>\n<li>"süsteemi ja rakenduste andmed ning seaded"</li>\n<li>"Allalaaditud rakendused"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"See kustutab kõik andmed telefoni "<b>"sisemälust"</b>", sh:\n\n"<li>"Teie Google\'i konto"</li>\n<li>"Süsteemi- ja rakenduste andmed ning seaded"</li>\n<li>"Allalaaditud rakendused"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Olete praegu sisse logitud järgmistele kontodele:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Ohutusteave"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Teil ei ole andmesideühendust. Selle teabe vaatamiseks praegu minge Interneti-ühendusega arvutis aadressile %s."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Laadimine ..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Valige parool"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ekraaniluku seadistamine"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Turvalisuse huvides määrake parool"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Sõrmejälje kasutamiseks määrake parool"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Mustri valimine"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Sõrmejälje kasutamiseks määrake muster"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Valige PIN-kood"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Turvalisuse huvides määrake PIN-kood"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Sõrmejälje kasutamiseks määrake PIN-kood"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Kinnitage parool"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Sisestage oma parool uuesti"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Mustri kinnitamine"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Kinnitage PIN-kood"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Sisestage oma PIN-kood uuesti"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Paroolid ei ühti"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-koodid ei ühti"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Lukust avamise meetod"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Jätkamiseks kasutage oma tööprofiili mustrit"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Jätkamiseks sisestage oma tööprofiili PIN-kood"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Jätkamiseks sisestage oma tööprofiili parool"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Jätkamiseks kasutage seadme mustrit. Seda on vaja pärast seadme taaskäivitamist."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Jätkamiseks sisestage seadme PIN-kood. Seda on vaja pärast seadme taaskäivitamist."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Jätkamiseks sisestage seadme parool. Seda on vaja pärast seadme taaskäivitamist."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Jätkamiseks kasutage tööprofiili mustrit. Seda on vaja pärast seadme taaskäivitamist."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Jätkamiseks sisestage tööprofiili PIN-kood. Seda on vaja pärast seadme taaskäivitamist."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Jätkamiseks sisestage tööprofiili parool. Seda on vaja pärast seadme taaskäivitamist."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Lisaturvalisuse jaoks kasutage seadme mustrit"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Lisaturvalisuse jaoks sisestage oma seadme PIN-kood"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Lisaturvalisuse jaoks sisestage oma seadme parool"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Lisaturvalisuse jaoks kasutage oma tööprofiili mustrit"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Lisaturvalisuse jaoks sisestage oma tööprofiili PIN-kood"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Lisaturvalisuse jaoks sisestage oma tööprofiili parool"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Teie telefon lähtestati tehaseseadetele. Selle telefoni kasutamiseks sisestage oma eelmine muster."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Teie telefon lähtestati tehaseseadetele. Selle telefoni kasutamiseks sisestage oma eelmine PIN-kood."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Teie telefon lähtestati tehaseseadetele. Selle telefoni kasutamiseks sisestage oma eelmine parool."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Mustri kinnitamine"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"PIN-koodi kinnitamine"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Parooli kinnitamine"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Vale PIN-kood"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Vale parool"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Vale muster"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Kas luua vidin ja lubada juurdepääs?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Pärast vidina loomist saab <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> juurdepääsu kõikidele kuvatavatele andmetele."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Luba rakendusel <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> alati vidinaid luua ja nende andmetele juurdepääs hankida"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> p <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> m <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> m <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> p <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> min"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Kasutusstatistika"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Kasutusstatistika"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sortimisalus:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Ekraanilugejad, ekraan, interaktsiooni juhtnupud"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Nähtavuse seaded"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Seadet saab kohandada vastavalt oma vajadustele. Neid juurdepääsetavuse funktsioone saab hiljem muuta menüüs Seaded."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Suurendage fondi suurust"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Fondi suuruse muutmine"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Ekraanilugejad"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Heli ja ekraanil kuvatud tekst"</string>
     <string name="display_category_title" msgid="685461049938269166">"Ekraan"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Suumimiseks"</b>" puudutage ekraani kiiresti kolm korda.\n"<ul><li>"Kerimiseks lohistage vähemalt kahe sõrmega"</li>\n<li>"Suumi reguleerimiseks suruge vähemalt kaht sõrme kokku"</li></ul>\n\n<b>"Ajutiselt suumimiseks"</b>" puudutage ekraani kiiresti kolm korda ja hoidke pärast kolmandat puudutust sõrme ekraanil.\n"<ul><li>"Lohistage ekraanil liikumiseks"</li>\n<li>"Väljasuumimiseks tõstke sõrm ekraanilt"</li></ul>\n\n"Klaviatuuril ja navigeerimisribal ei saa suumida."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Kui suurendus on sisse lülitatud, saate ekraani alaosas oleva juurdepääsetavuse nupuga kiiresti suurendada.\n\n"<b>"Suumimiseks"</b>" puudutage juurdepääsetavuse nuppu ja seejärel mis tahes punkti ekraanil.\n"<ul><li>"Kerimiseks lohistage vähemalt kahe sõrmega"</li>\n<li>"Suumi reguleerimiseks suruge vähemalt kaht sõrme kokku"</li></ul>\n\n<b>"Ajutiselt suumimiseks"</b>" puudutage juurdepääsetavuse nuppu ning seejärel puudutage ja hoidke mis tahes punkti ekraanil.\n"<ul><li>"Lohistage ekraanil liikumiseks"</li>\n<li>"Väljasuumimiseks tõstke sõrm ekraanilt"</li></ul>\n\n"Klaviatuuril ja navigeerimisribal ei saa suumida."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Juurdepääsetavuse nupu jaoks on valitud seade <xliff:g id="SERVICE">%1$s</xliff:g>. Suurenduse kasutamiseks puudutage ja hoidke juurdepääsetavuse nuppu ning seejärel valige suurendus."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Juurdepääsetavuse otsetee"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Helitugevuse nupu otsetee"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Otsetee teenus"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Lukustuskuval lubamine"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Kui otsetee on sisse lülitatud, võite hoida mõlemat helitugevuse nuppu kolm sekundit all, et käivitada juurdepääsetavusfunktsioon."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Kui otsetee on sisse lülitatud, võite hõlbustusfunktsiooni käivitamiseks hoida mõlemat helitugevuse nuppu 3 sekundit all."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Suure kontrastsusega tekst"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Ekraanisuurenduse värskendus"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Ekraanisuurenduse kasutus rakenduste vahetamisel"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Võib mõjutada toimivust"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klikk pärast kursori peatumist"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Viide enne klikki"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"SEES"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"VÄLJAS"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Kuva kiirseadetes"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"valitud <xliff:g id="NUMBER">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <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">"Vali kõik"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Pakettide haldamine"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Andmekasutus"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Rakenduse andmekasutus"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operaatori andmemahuarvestus võib erineda seadme omast"</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobiilsidevõrgud"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Mahupõhised WiFi-võrgud"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Mahupõhiste võrkude valimiseks lülitage WiFi sisse."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automaatne"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Mahupõhine"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Pole mahupõhine"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Operaatori andmemahuarvestus võib erineda seadme omast"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Hädaabikõne"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Tagasi kõne juurde"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Kõnehaldur"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Hädaolukorra märguanded"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Hädaolukorra teatised"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Võrguoperaatorid"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Pääsupunktide nimed"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Tõhustatud 4G LTE režiim"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Eelistatud SIM-kaart:"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Küsi iga kord"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Valik on tegemata"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"SIM-kaardi valik"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Seaded"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">Kuva %d peidetud üksust</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Rakenduste märguanded"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Märguande kategooria"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Tähtsus"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Lubage rakendusel otsustada"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Heli lubamine"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Ära kunagi kuva märguandeid"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Heli ja visuaalne katkestus puudub"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Heli puudub"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Esita heli"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Esita heli ja tõsta märguanne esile"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Tõsta märguanne esile"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Madal"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Keskmine"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Kõrge"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Kiireloomuline"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Heli lubamine"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Ära tee heli, vibreeri ega kuva neid märguandeid praeguse ekraani servas."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Katkestuste lubamine"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Rakendusel lubatakse heli esitada, vibreerida ja/või ekraanil hüpikmärguandeid kuvada"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Madal tähtsuse tase"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Keskmine tähtsuse tase"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Kõrge tähtsuse tase"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip pildis"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Pilt pildis"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Luba režiim Pilt pildis"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Lubage rakendusel luua pilt pildis aken ajal, mil rakendus on avatud, või pärast sellest väljumist (näiteks video vaatamise jätkamiseks). Aken kuvatakse muude kasutatavate rakenduste peal."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Lubage rakendusel luua pilt pildis aken ajal, mil rakendus on avatud, või pärast sellest väljumist (näiteks video vaatamise jätkamiseks). Aken kuvatakse muude kasutatavate rakenduste peal."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Mitte segada juurdepääs"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ükski installitud rakendus pole palunud juurdepääsu funktsioonile Mitte segada"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Rakenduste laadimine ..."</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Failide edastamine"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Fotode edastamine (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Seadme kasutamine MIDI-režiimis"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS-ide peegeldamine"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Taustakontroll"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Täielik juurdepääs taustale"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Ekraanil oleva teksti kasutamine"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Öövalguse ajakava määramine"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Oranž ekraan aitab teil uinuda"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Öövalgus on sees"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Ekraan on toonitud kollaseks. See võib aidata teil magama jääda."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Soovitused"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Kasutatakse külmemaid ekraanivärve"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Värvi muutmise rakendamiseks lülitage ekraan välja"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Teenuse Telephony Monitor muudatuse rakendamiseks taaskäivitage seade"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kaamera HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Kaamera HAL HDR+ muudatuse rakendamiseks taaskäivitage seade"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kaamera laserandur"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automaatsed süsteemivärskendused"</string>
     <string name="usage" msgid="2977875522080448986">"Kasutus"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobiilse andmeside kasutus"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Andmemahu hoiatus"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Andmemahupiirangu määramine"</string>
     <string name="data_limit" msgid="1885406964934590552">"Andmemahu piirang"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> on kasutatud vahemikus <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"Vahemikus <xliff:g id="ID_2">%2$s</xliff:g> on kasutatud <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Seadistamine"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Muud kasutusandmetesse kaasatud rakendused"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Kustuta ja teisenda"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Teenuse ShortcutManager sageduse piiramise lähtestamine"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Teenuse ShortcutManager sageduse piiramine lähtestati"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Lukustuskuva märguannete juhtimine"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Kontrollige lukustuskuva teavet"</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="8483187649355540109">"Tugi ja nõuanded"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Ükski installitud rakendus pole taotlenud juurdepääsu tasuliste SMS-ide saatmiseks"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Tasuliste SMS-ide saatmisel võidakse teilt nõuda tasu, mis lisatakse operaatori esitatud arvele. Kui annate rakendusele loa, saate selle rakendusega tasulisi SMS-e saata."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Juurdepääs tasuliste SMS-ide saatmiseks"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Ei ole teiste seadmete jaoks nähtav"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Väljas"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Ühendatud seadmega <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Ühendatud mitme seadmega"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Süsteemi kasutajaliidese demorežiim"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Installimata avatavad rakendused"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Lingid avatakse rakendustes isegi siis, kui need pole installitud"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Installimata avatavad rakendused"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Installimata avatavate rakenduste konto"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Installimata avatavate rakenduste eelistused"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installitud rakendused"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Teie salvestusruumi haldab nüüd salvestusruumi haldur"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Kasutaja <xliff:g id="USER_NAME">%1$s</xliff:g> kontod"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Alati sees VPN on teie isiklikul profiilil sisse lülitatud"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Alati sees VPN on teie tööprofiilil sisse lülitatud"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Üldine HTTP-puhverserver on seadistatud"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Usaldusväärsed mandaadid"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Usaldusväärsed mandaadid"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Usaldusväärsed mandaadid teie isiklikul profiilil"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Usaldusväärsed mandaadid teie tööprofiilil"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Vähemalt <xliff:g id="COUNT_1">%d</xliff:g> CA-sertifikaati</item>
       <item quantity="one">Vähemalt <xliff:g id="COUNT_0">%d</xliff:g> CA-sertifikaat</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operaatori ettevalmistamise teave"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Operaatori ettevalmistamise päästik"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Mis on uut ja põnevat?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Vaadake viit populaarseimat funktsiooni"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Tutvuge oma uue telefoniga"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Tutvuge oma uue tahvelarvutiga"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Tutvuge oma uue seadmega"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Sellel seadmel pole see funktsioon saadaval"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS-i registreerimise olek"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Registreeritud"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Ei ole registreeritud"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index a3e4b6c..4dfc0eb 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s gailuak zure mezuak atzitu nahi ditu. %2$s gailuari sarbidea eman?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM txartelerako sarbide-eskaera"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> gailuak SIM txartela atzitu nahi du. SIM txartelerako sarbidea ematen badiozu, gailuaren datu-konexioa desgaituko da, txartelerako konexioak dirauen bitartean. Eman sarbidea <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> gailuari"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"\"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" gisa dago ikusgai beste gailuentzat"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"\"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" gisa dago ikusgai beste gailuetan"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Zure gailuak"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Parekatu gailu batekin"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data eta ordua"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Hurrengoa"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Saltatu hatz-marka?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Minutu bat edo bi baino ez dituzu beharko hatz-marka konfiguratzeko. Urrats hau saltatuz gero, geroago ere gehi dezakezu hatz-marka ezarpenetan."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Pantailaren blokeoa saltatu?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Ez dira aktibatuko gailuaren babes-eginbideak. Tableta galtzen baduzu, lapurtzen badizute edo berrezarri egiten bada, ezin izango duzu ekidin beste pertsona batzuek erabiltzea."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Ez dira aktibatuko gailuaren babes-eginbideak. Gailua galtzen baduzu, lapurtzen badizute edo berrezarri egiten bada, ezin izango duzu ekidin beste pertsona batzuek erabiltzea."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Ez dira aktibatuko gailuaren babes-eginbideak. Telefonoa galtzen baduzu, lapurtzen badizute edo berrezarri egiten bada, ezin izango duzu ekidin beste pertsona batzuek erabiltzea."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Iritsi zara onartzen den gehienezko hatz-marka kopurura"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Ezin duzu gehitu beste hatz-markarik"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Hatz-marka digitalak kendu nahi dituzu?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Kendu \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\""</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Hatz-marka ezabatu nahi duzu?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Ezin izango dituzu erabili hatz-markak telefonoa desblokeatzeko, erosketak baimentzeko edo aplikazioetan saioa hasteko"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Ezin izango dituzu erabili hatz-markak laneko profila desblokeatzeko, erosketak baimentzeko edo laneko aplikazioetan saioa hasteko"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Bai, kendu"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Babestu tableta"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Babestu gailua"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Babestu telefonoa"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Babestuago egoteko, konfiguratu pantaila blokeatzeko ordezko metodo bat."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Babestuago egoteko, konfiguratu pantaila blokeatzeko ordezko metodo bat."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Galarazi inork tableta baimenik gabe erabiltzea gailuaren babes-eginbideak aktibatuta. Aukeratu nola blokeatu nahi duzun pantaila."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Galarazi inork gailua baimenik gabe erabiltzea gailuaren babes-eginbideak aktibatuta. Aukeratu nola blokeatu nahi duzun pantaila."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Galarazi inork telefonoa baimenik gabe erabiltzea gailuaren babes-eginbideak aktibatuta. Aukeratu nola blokeatu nahi duzun pantaila."</string>
@@ -497,37 +502,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Gailuaren babesa kendu nahi duzu?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Profilaren babes-sistema kendu nahi duzu?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Eredua behar da gailuaren babes-eginbideek funtziona dezaten."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Eredua behar da gailuaren babes-eginbideek funtziona dezaten.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Eredua behar da gailua babesteko eginbideek funtziona dezaten.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Gordetako hatz-markak ere kenduko dira gailutik eta ezin izango duzu haiek gabe telefonoa desblokeatu, erosketarik baimendu edo aplikazioetan saioa hasi.\""</string>
+</xliff:g>Gordetako hatz-markak ere kendu egingo dira gailutik eta, haiek gabe, ezin izango duzu telefonoa desblokeatu, erosketarik baimendu edo aplikazioetan saioa hasi."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"PIN kodea behar da gailuaren babes-eginbideek funtziona dezaten."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"PIN kodea behar da gailuaren babes-eginbideek funtziona dezaten.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"PIN kodea behar da gailua babesteko eginbideek funtziona dezaten.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Gordetako hatz-markak ere kenduko dira gailutik eta ezin izango duzu haiek gabe telefonoa desblokeatu, erosketarik baimendu edo aplikazioetan saioa hasi.\""</string>
+</xliff:g>Gordetako hatz-markak ere kendu egingo dira gailutik eta, haiek gabe, ezin izango duzu telefonoa desblokeatu, erosketarik baimendu edo aplikazioetan saioa hasi."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Pasahitza behar da gailuaren babes-eginbideek funtziona dezaten."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Pasahitza behar da gailuaren babes-eginbideek funtziona dezaten.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Gordetako hatz-markak ere kenduko dira gailutik eta ezin izango duzu haiek gabe telefonoa desblokeatu, erosketarik baimendu edo aplikazioetan saioa hasi.\""</string>
+</xliff:g>"</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Pantailaren blokeoa kodea behar da gailuaren babes-eginbideek funtziona dezaten."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Pantailaren blokeoa behar da gailuaren babes-eginbideek funtziona dezaten.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Pantaila blokeatzeko aukera bat gaituta eduki behar da gailua babesteko eginbideek funtziona dezaten.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Gordetako hatz-markak ere kenduko dira gailutik eta ezin izango duzu haiek gabe telefonoa desblokeatu, erosketarik baimendu edo aplikazioetan saioa hasi.\""</string>
+</xliff:g>Gordetako hatz-markak ere kendu egingo dira gailutik eta, haiek gabe, ezin izango duzu telefonoa desblokeatu, erosketarik baimendu edo aplikazioetan saioa hasi."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Eredua behar da profila babesteko eginbideek funtziona dezaten."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Eredua behar da profila babesteko eginbideek funtziona dezaten.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Gordetako hatz-markak ere kendu egingo dira profiletik eta haiek gabe ezin izango duzu telefonoa desblokeatu, erosketarik baimendu edo aplikazioetan saioa hasi.\""</string>
+</xliff:g>"</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"PIN kodea behar da profila babesteko eginbideek funtziona dezaten."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"PIN kodea behar da profila babesteko eginbideek funtziona dezaten.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Gordetako hatz-markak ere kendu egingo dira profiletik eta haiek gabe ezin izango duzu telefonoa desblokeatu, erosketarik baimendu edo aplikazioetan saioa hasi.\""</string>
+</xliff:g>"</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Pasahitza behar da profila babesteko eginbideek funtziona dezaten."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Pasahitza behar da profila babesteko eginbideek funtziona dezaten.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Pasahitza behar da profila babesteko eginbideek funtziona dezaten.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Gordetako hatz-markak ere kendu egingo dira profiletik eta haiek gabe ezin izango duzu telefonoa desblokeatu, erosketarik baimendu edo aplikazioetan saioa hasi.\""</string>
+</xliff:g>Gordetako hatz-markak ere kendu egingo dira profiletik eta, haiek gabe, ezin izango duzu telefonoa desblokeatu, erosketarik baimendu edo aplikazioetan saioa hasi."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Pantaila blokeatzeko aukera bat gaituta eduki behar da gailua babesteko eginbideek funtziona dezaten."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Pantaila blokeatzeko aukera bat gaituta eduki behar da profila babesteko eginbideek funtziona dezaten.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Gordetako hatz-markak ere kendu egingo dira profiletik eta haiek gabe ezin izango duzu telefonoa desblokeatu, erosketarik baimendu edo aplikazioetan saioa hasi.\""</string>
+</xliff:g>"</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Bai, kendu"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Aldatu desblokeatzeko eredua"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Aldatu desblokeo PINa"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Ezin da erabili goranzko, beheranzko edo errepikatutako digitu-sekuentziarik"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Ados"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Utzi"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Garbitu"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Utzi"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Hurrengoa"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Konfigurazioa osatu da."</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPSa erabilgarri"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPSa erabilgarri)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Idatzi sarearen pasahitza"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Operadorearen Wi‑Fi sarea"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Konektatu <xliff:g id="NAME">%1%s</xliff:g> bidez"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Kokapenaren zehaztasuna hobetzeko eta beste helburu batzuetarako, <xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak sare-bilaketa aktibatu nahi du, Wi-Fia desaktibatuta egonda ere.\n\nBilaketa egin nahi duten beste aplikazio guztiei ere baimendu nahi diezu?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Desaktibatzeko, joan menuko \"Ezarpen aurreratuak\" aukerara."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Baimendu"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Konektatu"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Ezin izan da sarera konektatu"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Ahaztu"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Aldatu"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Ezin izan da sarea ahaztu"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Gorde"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Ezin izan da sarea gorde"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi ezarpen aurreratuak"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC helbidea"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP helbidea"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Sareari buruzko informazioa"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Azpisarearen maskara"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 helbideak"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Gonbidapena bertan behera utzi nahi duzu?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g> gailura konektatzeko gonbidapena bertan behera utzi nahi duzu?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Taldea ahaztu?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Wi-Fi sare publiko eramangarria"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi sare publikoa"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Ez zara ari partekatzen Interneteko konexiorik ez edukirik beste gailuekin"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Tabletaren Interneteko konexioa partekatzen ari zara sare publiko bidez"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Telefonoaren Interneteko konexioa partekatzen ari zara sare publiko bidez"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Edukia partekatzen ari da aplikazioa. Interneteko konexioa partekatzeko, desaktibatu eta aktibatu berriro sare publikoa."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi sarearen izena"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Sare publikoaren izena"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> aktibatzen…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> sarera konekta daitezke beste gailuak"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi pasahitza"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Sare publikoaren pasahitza"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Sarbide-puntuaren banda"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Erabili sare publikoa beste gailuentzako Wi-Fi sare bat sortzeko. Sare publikoen bidez, Interneteko konexioa ematen da datu mugikorrak erabilita. Agian datu mugikorrak erabiltzearen ondoriozko kostu gehigarriak izango dituzu."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikazioek sare publikoak sor ditzakete edukia inguruko gailuekin partekatzeko."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Wi-Fi bidez larrialdi-zerbitzuetara deituz gero kokapen gisa erabiliko den helbidea"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Bistaratzea"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Soinua"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Bolumenak"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Bilaketa"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Kudeatu bilaketa-ezarpenak eta historia"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Ez dago emaitzarik"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Garbitu historia"</string>
     <string name="display_settings" msgid="7965901687241669598">"Bistaratzea"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Biratu pantaila automatikoki"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Kolore biziak"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"APN ezarpen lehenetsiak leheneratzen."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Berrezarri balio lehenetsiak"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"APN ezarpen lehenetsiak berrezarri dira."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Berrezarri"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Berrezarri dira sareko ezarpenak"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Berrezartzeko aukerak"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Sarea, aplikazioak edota gailua berrezar daitezke"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Berrezarri Wi-Fi, Bluetooth eta sare mugikorraren ezarpenak"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Hori eginez gero, sare guztien ezarpenak berrezarri egingo dira, besteak beste: \n\n"<li>"Wi‑Fi"</li>\n<li>"Datu-konexioa"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Berrezarri ezarpenak"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Sareko ezarpen guztiak berrezarri nahi dituzu? Ekintza hori ezin da desegin."</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Berrezarri?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Erabiltzaileak ez du sarea berrezartzeko baimenik"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Berrezarri dira sareko ezarpenak"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Berrezarri jatorrizko datuak"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> kontu berrezarriko dira</item>
-      <item quantity="one">1 kontu berrezarriko da</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Barneko memoria eta datu guztiak berrezarriko dira"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Ezabatu datu guztiak (berrezarri fabrikako ezarpenak)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Tabletaren "<b>"barneko memoriako"</b>" datu guztiak ezabatuko dira, besteak beste:\n\n"<li>"Google kontua"</li>\n<li>"Sistema- eta aplikazioen datuak eta ezarpenak"</li>\n<li>"Deskargatutako aplikazioak"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Telefonoaren "<b>"barneko memoriako"</b>" datu guztiak ezabatuko dira, besteak beste:\n\n"<li>"Google kontua"</li>\n<li>"Sistema- eta aplikazioen datuak nahiz ezarpenak"</li>\n<li>"Deskargatutako aplikazioak"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kontu hauetan hasi duzu saioa:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Segurtasun-informazioa"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Ez duzu datu-konexiorik. Informazioa orain ikusteko, joan %s gunera Internetera konektatutako ordenagailu batetik."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Kargatzen…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Aukeratu pasahitza"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ezarri pantailaren blokeo bat"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Babestuta egoteko, ezarri pasahitz bat"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Hatz-marka erabiltzeko, ezarri pasahitza"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Aukeratu eredua"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Hatz-marka erabiltzeko, ezarri eredua"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Aukeratu PIN kodea"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Babestuta egoteko, ezarri PIN bat"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Hatz-marka erabiltzeko, ezarri PIN kodea"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Berretsi pasahitza"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Idatzi berriro pasahitza"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Berretsi eredua"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Berretsi PIN kodea"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Idatzi berriro PIN kodea"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Pasahitzak ez datoz bat"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN kodeak ez datoz bat"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Desblokeatzeko metodoa"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Aurrera egiteko, marraztu laneko eredua"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Aurrera egiteko, idatzi laneko PIN kodea"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Aurrera egiteko, idatzi laneko pasahitza"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Aurrera egiteko, marraztu gailuaren eredua. Nahitaez marraztu behar da gailua berrabiaraztean."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Aurrera egiteko, idatzi gailuaren PIN kodea. Nahitaez idatzi behar da gailua berrabiaraztean."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Aurrera egiteko, idatzi gailuaren pasahitza. Nahitaez idatzi behar da gailua berrabiaraztean."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Aurrera egiteko, marraztu laneko eredua. Nahitaez marraztu behar da gailua berrabiaraztean."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Aurrera egiteko, idatzi laneko PIN kodea. Nahitaez idatzi behar da gailua berrabiaraztean."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Aurrera egiteko, idatzi laneko pasahitza. Nahitaez idatzi behar da gailua berrabiaraztean."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Segurtasuna bermatzeko, marraztu gailuaren eredua"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Segurtasuna bermatzeko, idatzi gailuaren PIN kodea"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Segurtasuna bermatzeko, idatzi gailuaren pasahitza"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Segurtasuna bermatzeko, marraztu laneko eredua"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Segurtasuna bermatzeko, idatzi laneko PIN kodea"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Segurtasuna bermatzeko, idatzi laneko pasahitza"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Telefonoaren jatorrizko ezarpenak berrezarri dira. Erabiltzeko, marraztu aurreko eredua."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Telefonoaren jatorrizko ezarpenak berrezarri dira. Erabiltzeko, marraztu aurreko PIN kodea."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Telefonoaren jatorrizko ezarpenak berrezarri dira. Erabiltzeko, idatzi aurreko pasahitza."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Egiaztatu eredua"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Egiaztatu PIN kodea"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Egiaztatu pasahitza"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN kodea ez da zuzena"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Pasahitza ez da zuzena"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Eredua ez da zuzena"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Widgeta sortu eta sarbidea baimendu?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Widgeta sortu ondoren, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ostalariak bistaratzen dituen datu guztiak atzitu ahal izango ditu."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Baimendu beti <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ostalariari widgetak sortzea eta horietako datuak atzitzea"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> e <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> m <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> m <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> e <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> m"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Erabilera-estatistikak"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Erabilera-estatistikak"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Ordenatzeko irizpidea:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Pantaila-irakurgailuak, pantaila, interakzioak kontrolatzeko aukerak"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Ikusmen-ezarpenak"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Zure beharretara doi dezakezu gailua. Erabilerraztasun-eginbideak edonoiz alda ditzakezu Ezarpenak atalean."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Handitu letra-tamaina"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Aldatu letra-tipoaren tamaina"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Pantaila-irakurgailuak"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audioa eta pantailako testua"</string>
     <string name="display_category_title" msgid="685461049938269166">"Pantaila"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Zooma aplikatzeko"</b>", sakatu pantaila bizkor hiru aldiz.\n"<ul><li>"Gora edo behera egiteko, arrastatu gutxienez bi hatz."</li>\n<li>"Zooma doitzeko, atximurkatu pantaila gutxienez bi hatzekin."</li></ul>\n\n<b>"Zooma une batez bakarrik aplikatzeko"</b>", sakatu pantaila bizkor hiru aldiz eta, hirugarren aldian, utzi hatza pantailan jarrita.\n"<ul><li>"Pantailan mugitzeko, arrastatu hatza."</li>\n<li>"Zooma aplikatzeari uzteko, altxatu hatza."</li></ul>\n\n"Zooma ezin da aplikatu ez teklatuan ez nabigazio-barran."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Lupa aktibatuta dagoenean, sakatu pantailaren behealdeko Erabilerraztasuna botoia lupa zuzenean aplikatzeko.\n\n"<b>"Zooma aplikatzeko"</b>", sakatu Erabilerraztasuna botoia eta sakatu pantailako edozein toki.\n"<ul><li>"Gora edo behera egiteko, arrastatu gutxienez bi hatz."</li>\n<li>"Zooma doitzeko, atximurkatu pantaila gutxienez bi hatzekin."</li></ul>\n\n<b>"Zooma une batez bakarrik aplikatzeko"</b>", sakatu Erabilerraztasuna botoia eta eduki sakatuta pantailako puntu bat.\n"<ul><li>"Pantailan mugitzeko, arrastatu hatza."</li>\n<li>"Zooma aplikatzeari uzteko, altxatu hatza."</li></ul>\n\n"Zooma ezin da aplikatu ez teklatuan ez nabigazio-barran."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Erabilerraztasuna botoia labur sakatuta \"<xliff:g id="SERVICE">%1$s</xliff:g>\" aukera aktibatzen da. Lupa aplikatzeko, eduki sakatuta Erabilerraztasuna botoia eta, ondoren, hautatu lupa."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Erabilerraztasun-lasterbidea"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Bolumen-teklen lasterbidea"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Lasterbideari esleitutako zerbitzua"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Baimendu pantaila blokeatuan"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Lasterbidea aktibatuta dagoenean, bi bolumen-teklak hiru segundoz sakatuta abiarazten da erabilerraztasun-eginbidea."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Lasterbidea aktibatuta dagoenean, bi bolumen-teklak hiru segundoz sakatuta abiarazten da erabilerraztasun-eginbidea."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Kontraste handiko testua"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Eguneratu auto. pantaila-handiagotzea"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Eguneratu handiagotzea aplik. batetik bestera pasatzean."</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Baliteke errendimenduan eragina izatea"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Egin klik erakusleak mugitzeari uztean"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Klik egin aurretiko atzerapena"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"AKTIBATUTA"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESAKTIBATUTA"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Erakutsi Ezarpen bizkorretan"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g> hautatuta"</string>
     <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">"Hautatu guztiak"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Kudeatu planak"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datuen erabilera"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Aplik. datuen erabilera"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Beharbada operadoreak zenbatzen duen datu kopurua eta gailuak zenbatzen duena ez datoz bat."</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Sare mugikorrak"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Wi‑Fi sare mugatuak"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Sare mugatuak hautatzeko, aktibatu Wi‑Fi konexioa."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatikoa"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Datu-mugaduna"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Datu-mugarik gabekoa"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Operadoreak gailuak ez bezala zenbat litzake datuak."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Larrialdi-deia"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Itzuli deira"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Dei-kudeatzailea"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Larrialdietako igorpenak"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Larrialdi-abisuak"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Sare-operadoreak"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Sarbide-puntuen izenak"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"4G LTE modu hobetua"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Hauetarako SIM lehenetsia"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Galdetu beti"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Zerbait hautatu behar da"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"SIMaren hautapena"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Ezarpenak"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">Erakutsi %d elementu ezkutu</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Aplikazioen jakinarazpenak"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Jakinarazpenaren kategoria"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Garrantzia"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Aplikazioak erabaki dezala"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Baimendu soinua egitea"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Ez erakutsi jakinarazpenik inoiz"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Ez egin soinurik eta ez erakutsi"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Ez egin soinurik"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Egin soinua"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Egin soinua eta erakutsi pantailan"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Erakutsi pantailan"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Txikia"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Arrunta"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Handia"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Premiazkoa"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Baimendu soinua egitea"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Ez egin soinurik edo dardararik eta ez agerrarazi jakinarazpenak uneko pantailan"</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Baimendu etenaldiak"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Baimendu aplikazioari soinuak edo dardara egitea, edota pantailan jakinarazpenak erakustea"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Garrantzi txikikoa"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Garrantzi ertainekoa"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Garrantzi handikoa"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pantaila txiki gainjarria"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Pantaila txiki gainjarria"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Baimendu pantaila txiki gainjarria erabiltzea"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Baimendu aplikazio honek pantaila txiki gainjarri bat sortzea aplikazioa irekita dagoenean edo handik irtetean (adibidez, bideoak ikusten jarraitzeko). Erabiltzen ari zaren beste aplikazioen gaienean bistaratzen da leiho hori."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Baimendu aplikazio honek pantaila txiki gainjarri bat sortzea aplikazioa irekita dagoenean edo handik irtetean (adibidez, bideoak ikusten jarraitzeko). Erabiltzen ari zaren beste aplikazioen gaienean erakutsiko da leiho hori."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"\"Ez molestatu\" aukerarako sarbidea"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ez dago \"Ez molestatu\" aukerarako sarbidea eskatu duen aplikaziorik"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Aplikazioak kargatzen…"</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Fitxategiak transferitzeko"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Argazkiak transferitzeko (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Gailua MIDI gisa erabiltzeko"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS mezuak islatzea"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Atzeko planoko egiaztapena"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Atzeko planorako sarbide osoa"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Erabili pantailako testua"</string>
@@ -3367,6 +3379,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">"Laneko profila desaktibatuta"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Desaktibatuta daude aplikazioak, atzeko planoko sinkronizazioa eta laneko profilarekin erlazionatutako bestelako eginbideak."</string>
+    <string name="night_display_suggestion_title" msgid="6602129097059325291">"Ezarri gaueko argiaren ordutegia"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Erabili pantaila horikara errazago lokartzeko"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Gaueko argia aktibatuta"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Pantaila tindu horikaraz jantzi dugu. Errazago hartuko zaitu loak horrela."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Iradokizunak"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Erabili kolore hotzagoak pantailan"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Kolorea aldatzeko, itzal ezazu pantaila"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telefono-gainbegiratzailean egindako aldaketa aplikatzeko, berrabiarazi gailua"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kameraren HAL HDR+ modua"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Kamera HAL HDR+ modura aldatzeko, berrabiarazi gailua"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kameraren laser-sentsorea"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Sistemaren eguneratze automatikoak"</string>
     <string name="usage" msgid="2977875522080448986">"Erabilera"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Datu-konexioaren erabilera"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Datuen erabileraren abisua"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Ezarri datuen muga"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datuen muga"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> erabili dira (<xliff:g id="ID_2">%2$s</xliff:g>)"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> erabili ziren <xliff:g id="ID_2">%2$s</xliff:g> tartean"</string>
     <string name="configure" msgid="1029654422228677273">"Konfiguratu"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Erabileran eragina duten beste aplikazio batzuk"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Ezabatu eduki guztia eta enkriptatu"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Berrezarri lasterbide-kudeatzailearen mugak"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Berrezarri dira lasterbide-kudeatzailearen mugak"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Pantaila blokeatuko jakinarazpenak"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Pantaila blokeatuko kontrolari buruzko informazioa"</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="8483187649355540109">"Laguntza eta aholkuak"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Ez dago premium SMSetarako sarbidea eskatu duen aplikaziorik."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium SMSak ordaindu egin behar izan ditzakezu eta, hala bada, operadorearen fakturan gehituko da haien kostua. Aplikazioei baimen hau ematen badiezu, premium SMSak bidaltzeko gai izango dira."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Premium SMSetarako sarbidea"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Ezin dute ikusi gainerako gailuek"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Desaktibatuta"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> gailura konektatuta"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Gailu batera baino gehiagotara konektatuta"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Sistemaren erabiltzaile-interfazearen demo modua"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Zuzeneko aplikazioak"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Ireki aplikazioetako estekak, nahiz eta aplikazio horiek instalatuta ez egon"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Zuzeneko aplikazioak"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Zuzeneko aplikazioekin erabili beharreko kontua"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Zuzeneko aplikazioen hobespenak"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Instalatutako aplikazioak"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Biltegi-kudeatzailea ari da biltegia kudeatzen"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> erabiltzailearen kontuak"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Beti aktibatuta egongo den VPN konexioa aktibatu da zure profil pertsonalean"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Beti aktibatuta egongo den VPN konexioa aktibatu da zure laneko profilean"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"HTTP proxy orokorra ezarri da"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Kredentzial fidagarriak"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Kredentzial fidagarriak"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Profil pertsonaleko kredentzial fidagarriak"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Laneko profileko kredentzial fidagarriak"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Gutxienez <xliff:g id="COUNT_1">%d</xliff:g> CA ziurtagiri</item>
       <item quantity="one">Gutxienez <xliff:g id="COUNT_0">%d</xliff:g> CA ziurtagiri</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operadorearen hornikuntza-informazioa"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Abiarazi operadorearen hornikuntza"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Zer berri dago?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Eman begiratu bat bost eginbide nagusiei"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Eman txango bat telefono berrian barrena"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Eman txango bat tableta berrian barrena"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Eman txango bat gailu berrian barrena"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Eginbidea ez dago erabilgarri gailu honetan"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS erregistratzearen egoera"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Erregistratuta"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Erregistratu gabe"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 92277c5..9a61511 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"‏%1$s می‌خواهد به پیام‌های شما دسترسی یابد. اجازه دسترسی به %2$s داده شود؟"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"درخواست دسترسی به سیم‌‌کارت"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> می‌خواهد به سیم‌کارت شما دسترسی پیدا کند. درصورتی‌که به دسترسی به سیم‌کارت اجازه دهید، اتصال داده در مدت اتصال در دستگاه شما غیرفعال می‌شود. به <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> اجازه دسترسی دهید"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"به‌عنوان «<xliff:g id="DEVICE_NAME">^1</xliff:g>» برای سایر دستگاه‌ها قابل مشاهده است"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"به‌عنوان «<xliff:g id="DEVICE_NAME">^1</xliff:g>» برای دستگاه‌های دیگر قابل مشاهده است"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"دستگاه‌های شما"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"مرتبط‌سازی دستگاه جدید"</string>
     <string name="date_and_time" msgid="9062980487860757694">"تاریخ و زمان"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"بعدی"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"از تنظیم اثر انگشت رد می‌شوید؟"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"تنظیم اثر انگشت تنها یک یا دو دقیقه طول می‌کشد. اکر از این تنظیم رد شوید، می‌توانید اثر انگشتتان را بعداً در تنظیمات اضافه کنید."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"از تنظیم قفل صفحه رد می‌شوید؟"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"قابلیت‌های محافظت از دستگاه روشن نمی‌شوند. اگر رایانه لوحی گم، دزدیده یا بازنشانی شود، نمی‌توانید مانع استفاده دیگران از آن شوید."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"قابلیت‌های محافظت از دستگاه روشن نمی‌شوند. اگر دستگاه گم، دزدیده یا بازنشانی شود، نمی‌توانید مانع استفاده دیگران از آن شوید."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"قابلیت‌های محافظت از دستگاه روشن نمی‌شوند. اگر تلفن گم، دزدیده یا بازنشانی شود، نمی‌توانید مانع استفاده دیگران از آن شوید."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"حداکثر تعداد اثرانگشت را اضافه کرده‌اید"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"نمی‌توانید اثرانگشت‌های بیشتری اضافه کنید"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"همه اثر انگشت‌ها پاک شوند؟"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"پاک کردن «<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>»"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"می‌خواهید این اثرانگشت را پاک کنید؟"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"دیگر نمی‌توانید از اثر انگشتتان برای باز کردن قفل تلفن، مجاز کردن خریدها یا ورود به سیستم برنامه‌ها استفاده کنید"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"دیگر نمی‌توانید از اثر انگشتتان برای باز کردن قفل نمایه کاری، اجازه دادن به خریدها یا ورود به سیستم برنامه‌های کاری استفاده کنید"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"بله، پاک شود"</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"برای امنیت بیشتر، قفل صفحه پشتیبانی تنظیم کنید."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"برای امنیت بیشتر، قفل صفحه پشتیبان تنظیم کنید."</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>
@@ -497,37 +502,37 @@
     <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_fingerprint" msgid="8212242533942400457">"قابلیت‌های محافظ دستگاه بدون الگوی شما کار نمی‌کند.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"قابلیت‌های محافظت از دستگاه، بدون الگوی شما کار نمی‌کنند.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>اثر انگشت‌های ذخیره‌شده‌تان نیز از این دستگاه پاک می‌شود و نمی‌توانید با استفاده از آن‌ها قفل تلفنتان را باز کنید، خریدها را تأیید کنید یا به سیستم برنامه‌ها وارد شوید.»"</string>
+</xliff:g>اثرانگشت‌های ذخیره‌شده‌تان هم از این دستگاه پاک می‌شود و نمی‌توانید با آن‌ها قفل تلفنتان را باز کنید، خریدها را تأیید کنید یا به سیستم برنامه‌ها وارد شوید."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"قابلیت‌های محافظ دستگاه بدون پین شما کار نمی‌کند."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"قابلیت‌های محافظ دستگاه بدون پین شما کار نمی‌کند.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"قابلیت‌های محافظت از دستگاه، بدون پین شما کار نمی‌کنند.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>اثر انگشت‌های ذخیره‌شده‌تان نیز از دستگاه پاک می‌شود و نمی‌توانید با استفاده از آن‌ها قفل تلفنتان را باز کنید، خریدها را تأیید کنید یا به سیستم برنامه‌ها وارد شوید.»"</string>
+</xliff:g>اثرانگشت‌های ذخیره‌شده‌تان هم از این دستگاه پاک می‌شود و نمی‌توانید با آن‌ها قفل تلفنتان را باز کنید، خریدها را تأیید کنید یا به سیستم برنامه‌ها وارد شوید."</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"قابلیت‌های محافظت از دستگاه، بدون گذرواژه شما کار نخواهند کرد.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>اثر انگشت‌های ذخیره‌شده‌تان نیز از دستگاه پاک می‌شود و نمی‌توانید با استفاده از آن‌ها قفل تلفنتان را باز کنید، خریدها را تأیید کنید یا به سیستم برنامه‌ها وارد شوید.»"</string>
+</xliff:g>اثرانگشت‌های ذخیره‌شده‌تان هم از این دستگاه پاک می‌شود و نمی‌توانید با آن‌ها قفل تلفنتان را باز کنید، خریدها را تأیید کنید یا به سیستم برنامه‌ها وارد شوید."</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"قابلیت‌های محافظت از دستگاه، بدون قفل صفحه شما کار نمی‌کنند.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>اثر انگشت‌های ذخیره‌شده‌تان نیز از دستگاه پاک می‌شود و نمی‌توانید با استفاده از آن‌ها قفل تلفنتان را باز کنید، خریدها را تأیید کنید یا به سیستم برنامه‌ها وارد شوید.»"</string>
+</xliff:g>اثرانگشت‌های ذخیره‌شده‌تان هم از این دستگاه پاک می‌شود و نمی‌توانید با آن‌ها قفل تلفنتان را باز کنید، خریدها را تأیید کنید یا به سیستم برنامه‌ها وارد شوید."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"ویژگی‌های محافظت از نمایه بدون الگوی شما کار نمی‌کنند."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"ویژگی‌های محافظت از نمایه بدون الگوی شما کار نمی‌کنند.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"قابلیت‌های محافظت از نمایه، بدون الگوی شما کار نمی‌کنند.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>اثرانگشت‌های ذخیره‌شده شما نیز از این نمایه حذف می‌شوند و با آنها نمی‌توانید قفل نمایه‌تان را بازگشایی کنید، اجازه خرید بدهید یا وارد برنامه‌ها شوید."</string>
+</xliff:g>اثرانگشت‌های ذخیره‌شده‌تان هم از این دستگاه پاک می‌شود و نمی‌توانید با آن‌ها قفل نمایه‌تان را باز کنید، خریدها را تأیید کنید یا به سیستم برنامه‌ها وارد شوید."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"ویژگی‌های محافظت از نمایه بدون پین شما کار نمی‌کنند."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"ویژگی‌های محافظت از نمایه بدون پین شما کار نمی‌کنند.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"قابلیت‌های محافظت از نمایه، بدون پین شما کار نمی‌کنند.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>اثرانگشت‌های ذخیره‌شده شما نیز از این نمایه حذف می‌شوند و با آنها نمی‌توانید قفل نمایه‌تان را بازگشایی کنید، اجازه خرید بدهید یا وارد برنامه‌ها شوید."</string>
+</xliff:g>اثرانگشت‌های ذخیره‌شده‌تان هم از این نمایه پاک می‌شوند و نمی‌توانید با آن‌ها قفل نمایه‌تان را باز کنید، خریدها را تأیید کنید یا به سیستم برنامه‌ها وارد شوید."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"ویژگی‌های محافظت از نمایه بدون گذرواژه شما کار نمی‌کنند."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"ویژگی‌های محافظت از نمایه بدون گذرواژه شما کار نمی‌کنند.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"قابلیت‌های محافظت از نمایه، بدون گذرواژه شما کار نخواهند کرد.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>اثرانگشت‌های ذخیره‌شده شما نیز از این نمایه حذف می‌شوند و با آنها نمی‌توانید قفل نمایه‌تان را بازگشایی کنید، اجازه خرید بدهید یا وارد برنامه‌ها شوید."</string>
+</xliff:g>اثرانگشت‌های ذخیره‌شده‌تان هم از این دستگاه پاک می‌شود و نمی‌توانید با آن‌ها قفل نمایه‌تان را باز کنید، خریدها را تأیید کنید یا به سیستم برنامه‌ها وارد شوید."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"ویژگی‌های محافظت از نمایه بدون قفل صفحه شما کار نمی‌کنند."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"ویژگی‌های محافظت از نمایه بدون قفل صفحه شما کار نمی‌کنند.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"قابلیت‌های محافظت از نمایه، بدون قفل صفحه شما کار نمی‌کنند.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>اثرانگشت‌های ذخیره‌شده شما نیز از این نمایه حذف می‌شوند و با آنها نمی‌توانید قفل نمایه‌تان را بازگشایی کنید، اجازه خرید بدهید یا وارد برنامه‌ها شوید."</string>
+</xliff:g>اثرانگشت‌های ذخیره‌شده‌تان هم از این نمایه پاک می‌شود و نمی‌توانید با آن‌ها قفل نمایه‌تان را باز کنید، خریدها را تأیید کنید یا به سیستم برنامه‌ها وارد شوید."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"بله، برداشته شود"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"تغییر الگوی بازگشایی قفل"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"تغییر پین بازگشایی قفل"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"ترتیب صعودی، نزولی یا تکراری ارقام مجاز نیست"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"تأیید"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"لغو"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"پاک کردن"</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>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"‏WPS در دسترس است"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS در دسترس است)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"گذرواژه شبکه‌تان را وارد کنید"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"‏شبکه Wi‑Fi شرکت مخابراتی"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"اتصال ازطریق <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"‏برای بهبود دقت موقعیت مکانی و مقاصد دیگر، <xliff:g id="APP_NAME">%1$s</xliff:g> می‌خواهد اسکن کردن شبکه را فعال کند، حتی هنگامی که Wi-Fi خاموش است.\n\nاین مورد را برای همه برنامه‌هایی که می‌خواهند اسکن کنند مجاز می‌کنید؟"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"برای خاموش کردن این مورد، در منوی لبریزشده، به «پیشرفته» بروید."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"مجاز است"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"اتصال"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"اتصال به شبکه برقرار نشد"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"فراموش کردن"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"اصلاح"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"شبکه فراموش نشد"</string>
     <string name="wifi_save" msgid="3331121567988522826">"ذخیره"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"شبکه ذخیره نشد"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"‏Wi-Fi پیشرفته"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"‏آدرس MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"‏آدرس IP"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"اطلاعات شبکه"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"پوشش زیرشبکه"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"‏نشانی‌های IPv6"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"دعوتنامه لغو شود؟"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"آیا می‌خواهید دعوت برای ارتباط با <xliff:g id="PEER_NAME">%1$s</xliff:g> را لغو کنید؟"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"این گروه فراموش شود؟"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"‏نقطه اتصال قابل حمل Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"‏نقطه اتصال Wi-Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"اینترنت یا محتوا با سایر دستگاه‌ها به اشتراک گذاشته نمی‌شود"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"اتصال اینترنت این رایانه لوحی ازطریق نقطه اتصال اشتراک‌گذاری می‌شود"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"اتصال اینترنت این تلفن ازطریق نقطه اتصال اشتراک‌گذاری می‌شود"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"برنامه محتوا را به اشتراک می‌گذارد. برای اشتراک‌گذاری اتصال اینترنت، نقطه اتصال را خاموش و سپس روشن کنید"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"‏نام Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"نام نقطه اتصال"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"درحال روشن کردن <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"سایر دستگاه‌ها می‌توانند به <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> متصل شوند."</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"‏گذرواژه Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"گذرواژه نقطه اتصال"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"‏باند AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"‏برای ایجاد یک شبکه Wi‑Fi برای سایر دستگاه‌ها، از نقطه اتصال استفاده کنید. نقطه اتصال با استفاده از اتصال داده تلفن همراه، اینترنت ارائه می‌دهد. ممکن است هزینه‌های داده تلفن همراه اضافه اعمال شوند."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"برنامه‌ها می‌توانند نقطه اتصالی ایجاد کنند تا محتوا را با دستگاه‌های اطراف به اشتراک بگذارند."</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"‏وقتی تماس Wi-Fi روشن است، تلفن شما می‌تواند بنابر تنظیمات ترجیحی‌تان و اینکه چه سیگنالی قدرتمندتر است، تماس‌ها را از طریق شبکه‌های Wi-Fi یا شبکه شرکت مخابراتی‌تان هدایت کند. قبل از روشن کردن این قابلیت، هزینه‌ها و سایر جزئیات را با شرکت مخابراتی‌تان بررسی کنید."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"به‌روزرسانی نشانی اضطراری"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"‏نشانی‌ای که اگر از طریق Wi-Fi با ۹۱۱ تماس بگیرید، توسط خدمات اضطراری به‌عنوان مکان شما استفاده می‌شود"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"‏نشانی‌ای که اگر ازطریق Wi-Fi تماسی اضطراری برقرار کنید، خدمات اضطراری از آن به‌عنوان مکان شما استفاده می‌‌کند"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"صفحه‌نمایش"</string>
     <string name="sound_settings" msgid="5534671337768745343">"صدا"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"میزان صدا"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"جستجو"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"مدیریت تنظیمات جستجو و سابقه"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"نتیجه‌ای پیدا نشد"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"پاک کردن سابقه"</string>
     <string name="display_settings" msgid="7965901687241669598">"صفحه‌نمایش"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"چرخش خودکار صفحه"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"رنگ‌های زنده"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"بازیابی تنظیمات پیش‌فرض نام نقطه دستیابی"</string>
     <string name="menu_restore" msgid="8260067415075573273">"بازنشانی به موارد پیش‌فرض"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"بازنشانی تنظیمات پیش‌فرض نام نقطه دستیابی انجام شد."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"بازنشانی"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"بازنشانی تنظیمات شبکه"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"بازنشانی گزینه‌ها"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"شبکه، برنامه‌ها یا دستگاه می‌توانند بازنشانی شوند"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"‏بازنشانی Wi-Fi، داده شبکه همراه و بلوتوث"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"‏این کار همه تنظیمات شبکه را بازنشانی می‌کند، ازجمله:\n\n"<li>"Wi-Fi‏"</li>\n<li>"داده شبکه تلفن همراه"</li>\n<li>"بلوتوث"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"بازنشانی تنظیمات"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"همه تنظیمات شبکه بازنشانی شود؟ امکان واگرد این کار وجود ندارد!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"بازنشانی؟"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"بازنشانی شبکه برای این کاربر در دسترس نیست"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"تنظیمات شبکه بازنشانی شد"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"بازنشانی داده‌های کارخانه"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> حساب بازنشانی خواهد شد</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> حساب بازنشانی خواهد شد</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"فضای ذخیره‌سازی داخلی و همه داده‌ها بازنشانی خواهند شد"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"پاک کردن همه داده‌ها (بازنشانی کارخانه‌ای)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"‏با این کار همه داده‌های "<b>"حافظهٔ داخلی"</b>" رایانهٔ لوحی شما پاک می‌شود، از جمله:\n\n"<li>"حساب Google شما"<li>\n</li>"داده‌ها و تنظیمات برنامه و سیستم"<li>\n</li>"برنامه‌های بارگیری شده"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"‏با این کار همه داده‌های "<b>"حافظه داخلی"</b>" گوشی شما پاک می‌شود، از جمله:\n\n"<li>"حساب Google شما"</li>\n<li>"تنیمات و داده‌های برنامه و سیستم"</li>\n<li>"برنامه‌های بارگیری شده"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"شما در حال حاضر به حساب‌های زیر وارد شده‌اید:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"اطلاعات ایمنی"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"‏شما اتصال داده ندارید. برای اینکه هم‌اکنون این اطلاعات را مشاهده کنید، از هر رایانه متصل به اینترنت به %s بروید."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"در حال بارگیری…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"انتخاب گذرواژه"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"قفل صفحه‌ای تنظیم کنید"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"برای حفظ امنیت، گذرواژه‌‌ای تنظیم کنید"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"تنظیم گذرواژه برای استفاده از اثر انگشت"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"انتخاب الگو"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"تنظیم الگو برای استفاده از اثر انگشت"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"انتخاب پین"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"برای حفظ امنیت، پین تنظیم کنید"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"تنظیم پین برای استفاده از اثر انگشت"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"تأیید گذرواژه"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"گذرواژه‌ خود را دوباره وارد کنید"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"تأیید الگو"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"تأیید پین"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"پین خود را دوباره وارد کنید"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"گذرواژه‌ها مطابقت ندارند"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"پین ها با یکدیگر مطابقت ندارند"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"انتخاب روش بازکردن قفل"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"برای ادامه، الگوی کاری‌تان را وارد کنید"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"برای ادامه، پین کاری‌تان را وارد کنید"</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">"برای ادامه، پین دستگاه را وارد کنید. پس از راه‌اندازی مجدد دستگاه موردنیاز است."</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">"برای ادامه، پین کاری‌تان را وارد کنید. پس از راه‌اندازی مجدد دستگاه موردنیاز است."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"برای ادامه، گذرواژه کاری‌تان را وارد کنید. پس از راه‌اندازی مجدد دستگاه موردنیاز است."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"برای امنیت بیشتر، از الگوی دستگاهتان استفاده کنید"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"برای امنیت بیشتر، پین دستگاهتان را وارد کنید"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"برای امنیت بیشتر، گذرواژه دستگاهتان را وارد کنید"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"برای امنیت بیشتر، از الگوی کاری‌تان استفاده کنید"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"برای امنیت بیشتر، پین کاری‌تان را وارد کنید"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"برای امنیت بیشتر، گذرواژه کاری‌تان را وارد کنید"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"تلفن شما به تنظیمات کارخانه بازنشانی شده است. برای استفاده از این تلفن، الگوی قبلی خود را وارد کنید."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"تلفن شما به تنظیمات کارخانه بازنشانی شده است. برای استفاده از این تلفن، پین قبلی خود را وارد کنید."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"تلفن شما به تنظیمات کارخانه بازنشانی شده است. برای استفاده از این تلفن، گذرواژه قبلی خود را وارد کنید."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"تأیید الگو"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"تأیید پین"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"تأیید گذرواژه"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"پین اشتباه"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"گذرواژه اشتباه"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"الگوی اشتباه"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"آیا مایل به ایجاد ابزارک و دادن اجازهٔ دسترسی هستید؟"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"پس از اینکه ابزارک را ایجاد کردید٬ <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> می‌تواند به همهٔ اطلاعاتی که ابزارک نمایش می‌دهد٬ دسترسی داشته باشد."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"همیشه به <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> برای ایجاد ابزارک‌ها و دسترسی به اطلاعات آن‌ها اجازه داده شود"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> روز و <xliff:g id="HOURS">%2$d</xliff:g> ساعت و <xliff:g id="MINUTES">%3$d</xliff:g> دقیقه و <xliff:g id="SECONDS">%4$d</xliff:g> ثانیه"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> ساعت و <xliff:g id="MINUTES">%2$d</xliff:g> دقیقه و <xliff:g id="SECONDS">%3$d</xliff:g> ثانیه"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>دقیقه و <xliff:g id="SECONDS">%2$d</xliff:g> ثانیه"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> ثانیه"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"آمار کاربرد"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"آمار کاربرد"</string>
     <string name="display_order_text" msgid="8592776965827565271">"ترتیب براساس:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"صفحه‌خوان‌ها، نمایشگر، کنترل‌های تعامل"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"تنظیمات بینایی"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"می‌توانید این دستگاه را متناسب با نیازهایتان سفارشی کنید. می‌توانید بعداً در «تنظیمات»، این قابلیت‌های دسترس‌پذیری را تغییر دهید."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"افزایش اندازه قلم"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"تغییر اندازه قلم"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"صفحه‌خوان‌ها"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"صدا و نوشتار روی صفحه"</string>
     <string name="display_category_title" msgid="685461049938269166">"نمایشگر"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"برای بزرگ کردن"</b>"، ۳ ضربه سریع روی صفحه بزنید.\n"<ul><li>"برای پیمایش، دو یا چند انگشتتان را روی صفحه بکشید"</li>\n<li>"برای تنظیم بزرگ‌نمایی، دو یا چند انگشتتان را نزدیک یا دور کنید"</li></ul>\n\n<b>"برای بزرگ‌نمایی موقت"</b>"، ۳ ضربه سریع روی صفحه بزنید و ضربه سوم انگشتتان را نگه‌دارید.\n"<ul><li>"برای حرکت در صفحه، روی صفحه بکشید"</li>\n<li>"برای کوچک کردن صفحه، انگشتتان را بردارید"</li></ul>\n\n"برای بزرگ کردن صفحه، نمی‌توانید از صفحه‌کلید و نواز پیمایش استفاده کنید."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"زمانی‌که درشت‌نمایی روشن است، برای درشت‌نمایی سریع از دکمه «دسترس‌پذیری» در پایین صفحه استفاده کنید.\n\n"<b>"برای بزرگ‌نمایی"</b>"، روی دکمه «دسترس‌پذیری» ضربه بزنید، سپس روی جایی از صفحه ضربه بزنید.\n"<ul><li>"برای پیمایش، دو یا چند انگشتتان را روی صفحه بکشید"</li>\n<li>"برای تنظیم بزرگ‌نمایی، دو یا چند انگشتتان را نزدیک یا دور کنید"</li></ul>\n\n<b>"برای بزرگ‌نمایی موقت"</b>"، روی دکمه «دسترس‌پذیری» ضربه بزنید، سپس جایی از صفحه را لمس کنید و نگه‌دارید.\n"<ul><li>"برای حرکت در صفحه، روی آن بکشید"</li>\n<li>"برای کوچک کردن صفحه، انگشتتان را بلند کنید"</li></ul>\n\n"برای بزرگ کردن صفحه، نمی‌توانید از صفحه‌کلید یا نوار پیمایش استفاده کنید."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"دکمه دسترس‌پذیری روی <xliff:g id="SERVICE">%1$s</xliff:g> تنظیم شده است. برای استفاده از درشت‌نمایی، دکمه دسترس‌پذیری را لمس کنید و نگه‌دارید، سپس درشت‌نمایی را انتخاب کنید."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"میان‌برهای دسترسی‌پذیری"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"میان‌بر کلید بلندی صدا"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"سرویس میان‌بر"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"اجازه دادن از صفحه درحالت قفل"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"زمانی‌که میان‌بر روشن است، برای آغاز به کار قابلیت‌ دسترس‌پذیری، می‌توانید هم‌زمان دو دکمه میزان صدا را فشار دهید."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"وقتی میان‌بر روشن است، می‌توانید هر دو کلید بلندی صدا را ۳ ثانیه فشار دهید تا یک قابلیت دسترس‌پذیری شروع شود."</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">"به‌روزرسانی خودکار بزرگ‌نمایی صفحه"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"به‌روزرسانی بزرگ‌نمایی صفحه در انتقال‌های برنامه"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"تآثیر احتمالی برعملکرد"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"کلیک پس از توقف حرکت نشانگر"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"تأخیر قبل از کلیک"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"روشن"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"خاموش"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"نمایش در تنظیمات سریع"</string>
@@ -2358,6 +2363,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"مدیریت طرح‌ها"</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>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"شبکه‌های تلفن همراه"</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_metered_auto" msgid="1262028400911918865">"خودکار"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"پهنای باند محدود"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"پهنای باند نامحدود"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"ممکن است شرکت مخابراتی داده‌ها را به گونه‌ای متفاوت با دستگاه شما محاسبه کند."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"تماس اضطراری"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"بازگشت به تماس"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"مدیریت تماس"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"پخش هشدارهای اضطراری"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"هشدارهای اضطراری"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"اپراتورهای شبکه"</string>
     <string name="access_point_names" msgid="1381602020438634481">"نام نقاط دسترسی"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"‏حالت 4G LTE پیشرفته"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"سیم‌کارت ترجیحی برای"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"هر بار پرسیده شود"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"انتخاب مورد نیاز است"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"انتخاب سیم‌کارت"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"تنظیمات"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="one">‏نمایش %d مورد پنهان</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"اعلان‌های برنامه"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"دسته اعلان"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"اهمیت"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"برنامه خودش تصمیم بگیرد"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"صدا مجاز است"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"هرگز اعلان‌ها نمایش داده نشوند"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"بدون وقفه صوتی و تصویری"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"بدون‌صدا"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"پخش صدا"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"پخش صدا و صفحه بازشو"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"صفحه بازشو"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"کم"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"متوسط"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"زیاد"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"فوری"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"صدا مجاز است"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"بدون صدا و لرزش یا نمایش این اعلان‌ها در صفحه‌نمایش کنونی."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"وقفه‌ها مجاز شوند"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"به برنامه اجازه پخش صدا، لرزش و/یا نمایش اعلان‌های بازشو در صفحه‌نمایش داده شود"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"اهمیت کم"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"اهمیت متوسط"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"اهمیت زیاد"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"‏pip تصویر در تصویر"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"تصویر در تصویر"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"مجاز کردن تصویر در تصویر"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"به این برنامه اجازه دهید زمانی‌که باز است یا پس از اینکه از آن خارج شدید (مثلاً برای ادامه تماشای ویدیو)، پنجره تصویر در تصویر ایجاد کند. این پنجره روی سایر برنامه‌هایی که درحال استفاده از آنها هستید نمایش داده می‌شود."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"به این برنامه امکان دهید زمانی‌که باز است یا پس از اینکه از آن خارج شدید (مثلاً برای ادامه تماشای یک ویدیو)، پنجره تصویر در تصویر ایجاد کند. این پنجره روی سایر برنامه‌هایی که درحال استفاده هستید نمایش داده می‌شود."</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>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"انتقال فایل‌"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"‏انتقال عکس (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"‏استفاده از دستگاه به‌عنوان MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"نمایش پیامک در دستگاه دیگر"</string>
     <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>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"تنظیم زمان‌بندی نور شب"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"سایه‌رنگ کهربایی صفحه‌نمایش برای کمک به خواب رفتن شما"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"«نور شب» روشن است"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"صفحه‌نمایش ته‌رنگ کهربایی به خود می‌گیرد. شاید این رنگ بتواند به شما کمک کند به خواب بروید."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"پیشنهادات"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"استفاده از رنگ‌های سردتر نمایشگر"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"برای اعمال تغییر رنگ، صفحه را خاموش کنید"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"‏برای اعمال تغییر Telephony Monitor، دستگاه را راه‌اندازی مجدد کنید"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"‏دوربین HAL HDR+‎"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"‏برای اعمال تغییر دوربین HAL HDR+‎، دستگاه را راه‌اندازی مجدد کنید"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"حسگر لیزری دوربین"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"به‌روزرسانی‌های خودکار سیستم"</string>
     <string name="usage" msgid="2977875522080448986">"میزان مصرف"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"مصرف داده شبکه تلفن همراه"</string>
@@ -3410,7 +3427,7 @@
     <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_2">%2$s</xliff:g>، <xliff:g id="ID_1">%1$s</xliff:g> مصرف شده است"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<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">
@@ -3456,7 +3473,7 @@
     <string name="notification_log_details_content_intent" msgid="1113554570409128083">"هدف"</string>
     <string name="notification_log_details_delete_intent" msgid="905118520685297007">"حذف هدف"</string>
     <string name="notification_log_details_full_screen_intent" msgid="7118560817013522978">"هدف تمام صفحه"</string>
-    <string name="notification_log_details_actions" msgid="242523930165118066">"فعالیت‌ها"</string>
+    <string name="notification_log_details_actions" msgid="242523930165118066">"کنش‌ها"</string>
     <string name="notification_log_details_title" msgid="7177091647508863295">"عنوان"</string>
     <string name="notification_log_details_remoteinput" msgid="8328591329858827409">"ورودی‌های از راه دور"</string>
     <string name="notification_log_details_content_view" msgid="6638731378278561786">"نمای سفارشی"</string>
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"پاک کردن و تبدیل کردن"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"‏بازنشانی محدودکننده سرعت ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"‏محدودکننده سرعت ShortcutManager بازنشانی شد"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"کنترل اعلان‌های قفل صفحه"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"کنترل اطلاعات روی صفحه درحالت قفل"</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="8483187649355540109">"پشتیبانی و نکته‌ها"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"هیچ برنامه نصب‌شده‌ای دسترسی به «پیامک ویژه» را درخواست نکرده است"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"ممکن است استفاده از «پیامک ویژه» برای شما هزینه داشته باشد و مبلغ صورت‌حساب‌های شرکت مخابراتی‌تان را افزایش دهد. اگر مجوز را برای برنامه‌ای فعال کنید، می‌توانید با استفاده از آن برنامه پیامک ویژه ارسال کنید."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"دسترسی پیامک ویژه"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"غیرقابل‌مشاهده برای سایر دستگاه‌ها"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"خاموش"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"متصل به <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"متصل به چند دستگاه"</string>
     <string name="demo_mode" msgid="2798762752209330277">"حالت نمایشی رابط کاربری سیستم"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"برنامه‌های فوری"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"باز کردن پیوندها در برنامه‌ها، حتی اگر نصب نشده باشند"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"برنامه‌های فوری"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"حساب برنامه‌های فوری"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"تنظیمات برگزیده برنامه‌های فوری"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"برنامه‌های نصب‌شده"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"حافظه شما اکنون توسط مدیر حافظه مدیریت می‌شود"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"حساب‌های <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"‏«VPN همیشه روشن» در نمایه شخصی شما روشن شد"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"‏«VPN همیشه روشن» در نمایه کاری شما روشن شد"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"‏تنظیم پروکسی HTTP جهانی"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"اعتبارنامه‌های مطمئن"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"اعتبارنامه‌های مطمئن"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"اعتبارنامه‌های مطمئن در نمایه شخصی شما"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"اعتبارنامه‌های مطمئن در نمایه کاری شما"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">حداقل <xliff:g id="COUNT_1">%d</xliff:g> گواهینامه مرکز صدور گواهی</item>
       <item quantity="other">حداقل <xliff:g id="COUNT_1">%d</xliff:g> گواهینامه مرکز صدور گواهی</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"اطلاعات ارائه شرکت مخابراتی"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"شروع ارائه شرکت مخابراتی"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"چه مواردی جدید و هیجان‌انگیز هستند؟"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"بررسی ۵ قابلیت برتر"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"در تلفن جدیدتان گشتی بزنید"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"در رایانه لوحی جدیدتان گشتی بزنید"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"در دستگاه جدیدتان گشتی بزنید"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"این ویدیو در این دستگاه دردسترس نیست."</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"‏وضعیت ثبت IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"ثبت‌شده"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"ثبت نشده است"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 4dbe8b1..61d1f05 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s haluaa käyttää viestejäsi. Myönnetäänkö käyttöoikeus kohteeseen %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM-kortin käyttöoikeuspyyntö"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> haluaa käyttää SIM-korttiasi. SIM-kortin käyttöoikeuden myöntäminen poistaa laitteesi datayhteyden käytöstä yhteyden ajaksi. Myönnä käyttöoikeus laitteelle <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>?"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Muille laitteille näkyvä nimi: <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Muille laitteille näkyvä nimi: <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Omat laitteet"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Muodosta laitepari uuden laitteen kanssa"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Päivämäärä ja aika"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Seuraava"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Ohitetaanko sormenjälki?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Sormenjälkitunnistus kestää vain minuutin tai pari. Jos ohitat tämän, voit lisätä sormenjäljen myöhemmin asetuksissa."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Ohitetaanko näytön lukitus?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Laitteen suojausominaisuuksia ei oteta käyttöön. Et voi estää tabletin käyttöä, jos se varastetaan, katoaa tai sen tiedot pyyhitään."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Laitteen suojausominaisuuksia ei oteta käyttöön. Et voi estää laitteen käyttöä, jos se varastetaan, katoaa tai sen tiedot pyyhitään."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Laitteen suojausominaisuuksia ei oteta käyttöön. Et voi estää puhelimen käyttöä, jos se varastetaan, katoaa tai sen tiedot pyyhitään."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Et voi lisätä useampia sormenjälkiä."</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Enempää sormenjälkiä ei voi lisätä."</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Poistetaanko kaikki sormenjäljet?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Poista <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Poistetaanko tämä sormenjälki?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Et voi käyttää sormenjälkeäsi puhelimen lukituksen avaamiseen, ostosten valtuuttamiseen tai sovelluksiin kirjautumiseen."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Et voi käyttää sormenjälkeäsi työprofiilin lukituksen avaamiseen, ostosten valtuuttamiseen tai työsovelluksiin kirjautumiseen."</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Kyllä, poista"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Tabletin suojaaminen"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Laitteen suojaaminen"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Suojaa puhelintasi"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Paranna suojausta määrittämällä näytön varalukitustapa."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Paranna suojausta määrittämällä näytön varalukitustapa."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Estä tablettisi luvaton käyttö ottamalla laitteen suojausominaisuudet käyttöön. Valitse näytön lukitusmenetelmä."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Estä laitteesi luvaton käyttö ottamalla laitteen suojausominaisuudet käyttöön. Valitse näytön lukitusmenetelmä."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Estä puhelimesi luvaton käyttö ottamalla laitteen suojausominaisuudet käyttöön. Valitse näytön lukitusmenetelmä."</string>
@@ -497,35 +502,35 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Poistetaanko laitteen suojaus?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Poistetaanko profiilin suojaus?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Laitteen suojausominaisuudet eivät toimi ilman kuviotasi."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Laitteen suojausominaisuudet eivät toimi ilman kuviotasi.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Laitteen suojausominaisuudet eivät toimi ilman kuviotasi.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Myös tallennetut sormenjälkesi poistetaan tältä laitteelta, etkä voi enää käyttää niitä puhelimen lukituksen avaamiseen, ostosten vahvistamiseen tai sovelluksiin kirjautumiseen.”"</string>
+</xliff:g>Myös tallennetut sormenjälkesi poistetaan tältä laitteelta, etkä voi enää käyttää niitä puhelimen lukituksen avaamiseen, ostosten vahvistamiseen tai sovelluksiin kirjautumiseen."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Laitteen suojausominaisuudet eivät toimi ilman PIN-koodiasi."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Laitteen suojausominaisuudet eivät toimi ilman PIN-koodiasi.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Laitteen suojausominaisuudet eivät toimi ilman PIN-koodiasi.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Myös tallennetut sormenjälkesi poistetaan tältä laitteelta, etkä voi enää käyttää niitä puhelimen lukituksen avaamiseen, ostosten vahvistamiseen tai sovelluksiin kirjautumiseen.”"</string>
+</xliff:g>Myös tallennetut sormenjälkesi poistetaan tältä laitteelta, etkä voi enää käyttää niitä puhelimen lukituksen avaamiseen, ostosten vahvistamiseen tai sovelluksiin kirjautumiseen."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Laitteen suojausominaisuudet eivät toimi ilman salasanaasi."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Laitteen suojausominaisuudet eivät toimi ilman salasanaasi.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Laitteen suojausominaisuudet eivät toimi ilman salasanaasi.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Myös tallennetut sormenjälkesi poistetaan tältä laitteelta, etkä voi enää käyttää niitä puhelimen lukituksen avaamiseen, ostosten vahvistamiseen tai sovelluksiin kirjautumiseen.”"</string>
+</xliff:g>Myös tallennetut sormenjälkesi poistetaan tältä laitteelta, etkä voi enää käyttää niitä puhelimen lukituksen avaamiseen, ostosten vahvistamiseen tai sovelluksiin kirjautumiseen."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Laitteen suojausominaisuudet eivät toimi ilman näytön lukitusta."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Laitteen suojausominaisuudet eivät toimi ilman näytön lukitusta.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Laitteen suojausominaisuudet eivät toimi ilman näytön lukitusta.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Myös tallennetut sormenjälkesi poistetaan tältä laitteelta, etkä voi enää käyttää niitä puhelimen lukituksen avaamiseen, ostosten vahvistamiseen tai sovelluksiin kirjautumiseen.”"</string>
+</xliff:g>Myös tallennetut sormenjälkesi poistetaan tältä laitteelta, etkä voi enää käyttää niitä puhelimen lukituksen avaamiseen, ostosten vahvistamiseen tai sovelluksiin kirjautumiseen."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Profiilin suojausominaisuudet eivät toimi ilman kuviota."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Profiilin suojausominaisuudet eivät toimi ilman kuviota.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Profiilin suojausominaisuudet eivät toimi ilman kuviota.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Lisäksi tallennetut sormenjäljet poistetaan profiilista, etkä voi enää avata profiilin lukitusta, hyväksyä ostoksia tai kirjautua sovelluksiin niillä."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Profiilin suojausominaisuudet eivät toimi ilman PIN-koodia."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Profiilin suojausominaisuudet eivät toimi ilman PIN-koodia.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Profiilin suojausominaisuudet eivät toimi ilman PIN-koodia.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Lisäksi tallennetut sormenjäljet poistetaan profiilista, etkä voi enää avata profiilin lukitusta, hyväksyä ostoksia tai kirjautua sovelluksiin niillä."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Profiilin suojausominaisuudet eivät toimi ilman salasanaa."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Profiilin suojausominaisuudet eivät toimi ilman salasanaa.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Profiilin suojausominaisuudet eivät toimi ilman salasanaa.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Lisäksi tallennetut sormenjäljet poistetaan profiilista, etkä voi enää avata profiilin lukitusta, hyväksyä ostoksia tai kirjautua sovelluksiin niillä."</string>
+</xliff:g>Lisäksi tallennetut sormenjäljet poistetaan profiilista, etkä voi enää käyttää niitä profiilin lukituksen avaamiseen, ostosten vahvistamiseen tai sovelluksiin kirjautumiseen."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Profiilin suojausominaisuudet eivät toimi ilman näytön lukitusta."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Profiilin suojausominaisuudet eivät toimi ilman näytön lukitusta.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Profiilin suojausominaisuudet eivät toimi ilman näytön lukitusta.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Lisäksi tallennetut sormenjäljet poistetaan profiilista, etkä voi enää avata profiilin lukitusta, hyväksyä ostoksia tai kirjautua sovelluksiin niillä."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Kyllä, poista"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Nousevat, laskevat tai toistuvat numerosarjat on kielletty."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Peruuta"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Tyhjennä"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Peruuta"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Seuraava"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Asennus on valmis."</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS käytettävissä"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS käytettävissä)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Anna verkkosalasana"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Operaattorin Wi‑Fi-verkko"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Muodosta yhteys: <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> haluaa parantaa sijainnin tarkkuutta ja suorittaa muita toimintoja ottamalla verkon etsinnän käyttöön, vaikka Wi-Fi-yhteys ei ole käytössä.\n\nAnnetaanko tämä lupa kaikille sovelluksille, jotka haluavat etsiä verkkoja?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Poista asetus käytöstä ylivuotovalikon lisäasetuksista."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Salli"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Yhdistä"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Yhteyden muodostaminen verkkoon epäonnistui."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Unohda"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Muokkaa"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Verkon unohtaminen epäonnistui."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Tallenna"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Verkon tallentaminen epäonnistui."</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi-lisäasetukset"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-osoite"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-osoite"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Verkon tiedot"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Aliverkon peite"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-osoitteet"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Peruutetaanko kutsu?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Haluatko peruuttaa laitteelle <xliff:g id="PEER_NAME">%1$s</xliff:g> lähetetyn yhteydenmuodostuskutsun?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Unohdetaanko tämä ryhmä?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Kannettava Wi-Fi-hotspot"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi-hotspot"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Internetyhteyttä tai sisältöä ei jaeta muiden laitteiden kanssa."</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Tabletin internetyhteys jaetaan hotspotin kautta."</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Puhelimen internetyhteys jaetaan hotspotin kautta."</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Sovellus jakaa sisältöä. Jos haluat jakaa internetyhteyden, sammuta hotspot ja käynnistä se uudelleen."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi-Fi-verkon nimi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Hotspotin nimi"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Käynnistetään <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> on muiden laitteiden käytettävissä."</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi-verkon salasana"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Hotspotin salasana"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP-taajuus"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Hotspot-ominaisuudella voit luoda muille laitteillesi Wi-Fi-verkon. Ominaisuus jakaa internetyhteyden muille laitteille mobiilidatayhteydellä. Lisämaksuja mobiilidatan käytöstä voidaan periä."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Sovellukset voivat luoda hotspotin ja jakaa sisältöä lähellä olevien laitteiden kanssa."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Hätäpalveluiden käyttämä osoite, kun soitat hätäpuhelun Wi-Fillä"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Näyttö"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ääni"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Äänenvoimakkuudet"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Haku"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Hallinnoi hakuasetuksia ja historiaa"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Ei tuloksia"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Tyhjennä historia"</string>
     <string name="display_settings" msgid="7965901687241669598">"Näyttö"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Näytön automaattinen kierto"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Kirkkaat värit"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Palautetaan APN-oletusasetuksia"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Palauta oletukset"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"APN-oletusasetukset on palautettu."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Nollaa"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Verkkoasetusten nollaus"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Palautusvalinnat"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Voit nollata verkon, sovellusten tai laitteen asetukset."</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Nollaa Wi-Fin, mobiiliverkon ja Bluetoothin asetukset"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Tämä nollaa kaikki verkkoasetukset, esimerkiksi seuraavat:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobiilidata"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Nollaa asetukset"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Nollataanko kaikki verkkoasetukset? Toimintoa ei voi peruuttaa."</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Nollataanko?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Tämä käyttäjä ei voi palauttaa verkon asetuksia."</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Verkkoasetuksesi on nollattu."</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Tehdasasetuksien palauttaminen"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> tilin asetukset palautetaan.</item>
-      <item quantity="one">1 tilin asetukset palautetaan.</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Sisäinen tallennustila ja kaikki tiedot nollataan."</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Poista kaikki tiedot (palauta tehdasasetukset)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Tämä poistaa kaikki tablet-laitteesi "<b>"sisäisen tallennustilan"</b>" tiedot, kuten:\n\n"<li>"Google-tilisi"</li>\n<li>"Järjestelmä- ja sovellustiedot ja -asetukset"</li>\n<li>"Ladatut sovellukset"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Tämä poistaa kaikki puhelimesi "<b>"sisäisen tallennustilan"</b>" tiedot, kuten:\n\n"<li>"Google-tilisi"</li>\n<li>"Järjestelmä- ja sovellustiedot ja -asetukset"</li>\n<li>"Ladatut sovellukset"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Olet kirjautunut sisään seuraaviin tileihin:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Suojaustiedot"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Laite ei ole yhteydessä verkkoon. Voit tarkastella näitä tietoja osoitteessa %s tietokoneella, jolla on internetyhteys."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Ladataan…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Valitse salasana"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Näytön lukituksen käyttöönotto"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Aseta salasana suojauksen parantamiseksi."</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Sormenjälki: aseta salasana"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Valitse kuvio"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Sormenjälki: aseta kuvio"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Valitse PIN-koodi"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Aseta PIN-koodi suojauksen parantamiseksi."</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Sormenjälki: aseta PIN-koodi"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Vahvista salasana"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Anna salasana uudelleen"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Vahvista kuvio"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Vahvista PIN-koodi"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Anna PIN-koodi uudelleen"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Salasanat eivät täsmää"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-koodit eivät täsmää"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Lukituksenpoistovalikko"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Jatka piirtämällä työprofiilisi kuvio."</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Jatka antamalla työprofiilisi PIN-koodi."</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Jatka antamalla työprofiilisi salasana."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Anna laitteesi kuvio. Kuvio vaaditaan uudelleenkäynnistyksen jälkeen."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Anna laitteesi PIN-koodi. PIN-koodi vaaditaan uudelleenkäynnistyksen jälkeen."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Anna laitteesi salasana. Salasana vaaditaan uudelleenkäynnistyksen jälkeen."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Anna työprofiilisi kuvio. Kuvio vaaditaan uudelleenkäynnistyksen jälkeen."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Anna työprofiilisi PIN-koodi. Koodi vaaditaan uudelleenkäynnistyksen jälkeen."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Anna työprofiilisi salasana. Salasana vaaditaan uudelleenkäynnistyksen jälkeen."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Turvallisuussyistä pyydämme antamaan laitteen kuvion."</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Turvallisuussyistä pyydämme antamaan laitteen PIN-koodin."</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Turvallisuussyistä pyydämme antamaan laitteen salasanan."</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Turvallisuussyistä pyydämme antamaan työprofiilin kuvion."</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Turvallisuussyistä pyydämme antamaan työprofiilin PIN-koodin."</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Turvallisuussyistä pyydämme antamaan työprofiilin salasanan."</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Puhelimen laiteasetukset palautettiin. Jos haluat käyttää tätä puhelinta, anna edellinen kuvio."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Puhelimen laiteasetukset palautettiin. Jos haluat käyttää tätä puhelinta, anna edellinen PIN-koodi."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Puhelimen laiteasetukset palautettiin. Jos haluat käyttää tätä puhelinta, anna edellinen salasana."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Vahvista kuvio"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Vahvista PIN-koodi"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Vahvista salasana"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Väärä PIN-koodi"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Väärä salasana"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Väärä kuvio"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Luo widget ja salli käyttö?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Kun olet luonut widgetin, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> voi käyttää kaikkia sen näyttämiä tietoja."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> saa luoda widgetejä ja käyttää niiden tietoja"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> pv <xliff:g id="HOURS">%2$d</xliff:g> t <xliff:g id="MINUTES">%3$d</xliff:g> min <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> t <xliff:g id="MINUTES">%2$d</xliff:g> min <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> pv <xliff:g id="HOURS">%2$d</xliff:g> t <xliff:g id="MINUTES">%3$d</xliff:g> min"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> t <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Käyttötiedot"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Käyttötiedot"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Lajittelu:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Näytönlukijat, näyttö, käytönhallinta"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Näköasetukset"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Voit muokata laitteen ominaisuuksia tarpeidesi mukaan. Käytettävyysvalintoja voi muuttaa myöhemmin asetuksissa."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Suurenna kirjasinkokoa"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Muuta kirjasinkokoa"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Näytönlukuohjelmat"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Ääni ja näyttöteksti"</string>
     <string name="display_category_title" msgid="685461049938269166">"Näyttö"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Zoomaa"</b>" napauttamalla näyttöä nopeasti kolme kertaa.\n"<ul><li>"Vieritä näyttöä vetämällä kahta tai useampaa sormea näytöllä."</li>\n<li>"Säädä zoomausta nipistämällä kahdella tai useammalla sormella."</li></ul>\n\n<b>"Zoomaa väliaikaisesti"</b>" napauttamalla näyttöä nopeasti kolme kertaa ja pitämällä sormesi näytöllä kolmannen napautuksen jälkeen.\n"<ul><li>"Siirry eri kohtaan vetämällä sormeasi näytöllä."</li>\n<li>"Zoomaa ulos nostamalla sormesi näytöltä."</li></ul>\n\n"Et voi zoomata näppäimistöön tai navigointipalkkiin."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Kun suurennus on käytössä, voit suurentaa näytöllä olevia kohteita nopeasti napauttamalla alareunassa olevaa Esteettömyys-painiketta.\n\n"<b>"Zoomaa"</b>" napauttamalla ensin Esteettömyys-painiketta ja sitten haluamaasi kohtaa näytöllä.\n"<ul><li>"Vieritä näyttöä vetämällä kahta tai useampaa sormea näytöllä."</li>\n<li>"Säädä zoomausta nipistämällä kahdella tai useammalla sormella."</li></ul>\n\n<b>"Zoomaa väliaikaisesti"</b>" napauttamalla Esteettömyys-painiketta ja koskettamalla sitten pitkään haluamaasi kohtaa näytöllä.\n"<ul><li>"Siirry eri kohtaan vetämällä sormeasi näytöllä."</li>\n<li>"Zoomaa ulos nostamalla sormesi näytöltä."</li></ul>\n\n"Et voi zoomata näppäimistöön tai navigointipalkkiin."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Esteettömyys-painikkeen toiminnoksi on valittu <xliff:g id="SERVICE">%1$s</xliff:g>. Jos haluat käyttää suurennusta, kosketa Esteettömyys-painiketta pitkään ja valitse suurennus."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Esteettömyystilan oikopolku"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Pikakomento: äänenvoimakkuuspainike"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Pikanäppäinpalvelu"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Salli käyttö lukitusnäytöllä"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Kun pikanäppäin on käytössä, voit käynnistää esteettömyystoiminnon pitämällä molempia äänenvoimakkuuspainikkeita painettuna kolmen sekunnin ajan."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Kun pikakomento on käytössä, voit käynnistää esteettömyystoiminnon painamalla molempia äänenvoimakkuuspainikkeita kolmen sekunnin ajan."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Suurikontrastinen teksti"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Päivitä näytön suurennus automaatt."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Päivitä näytön suurennus sovellussiirtymissä"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Voi vaikuttaa suorituskykyyn"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klikkaa, kun osoitin ei enää liiku"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Viive ennen klikkausta"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"KÄYTÖSSÄ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"POIS KÄYTÖSTÄ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Näytä pika-asetuksissa"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"valittu <xliff:g id="NUMBER">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <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">"Valitse kaikki"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Hallinnoi datapaketteja"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datan käyttö"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Sovelluksen tiedonsiirto"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operaattorin mittaustulos saattaa erota laitteesi mittaamasta."</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobiiliverkot"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Käytön mukaan laskutettavat Wi-Fi-verkot"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Ota Wi-Fi käyttöön, niin voit valita käytön mukaan laskutettavat verkot."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automaattinen"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Maksullinen"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Maksuton"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Operaattorin mittaustulos saattaa erota laitteesi mittaamasta."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Hätäpuhelu"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Palaa puheluun"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Call Manager"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Hätätilalähetykset"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Hätätiedotteet"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Verkko-operaattorit"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Tukiasemien nimet"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Enhanced 4G LTE -tila"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Ensisijainen SIM-kortti seuraaville toiminnoille:"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Kysy aina"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Valinta on pakollinen"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"SIM-valinta"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Asetukset"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">Näytä %d piilotettua kohdetta</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Sovellusilmoitukset"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Ilmoituksen luokka"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Tärkeys"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Anna sovelluksen päättää"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Salli ääni"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Älä näytä ilmoituksia"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Ei ääntä tai näkyvää ilmoitusta"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Ei ääntä"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Ääni"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Ääni, ilmoitus näkyy näytöllä"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Näkyy näytöllä"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Matala"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Keskitaso"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Korkea"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Kiireellinen"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Salli ääni"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Ilmoitus ei tule aktiiviselle näytölle eikä salli ääniä tai värinää."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Salli keskeytykset"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Anna sovelluksen toistaa ääniä, väristä ja näyttää ilmoituksia näytöllä."</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Ei kovin tärkeä"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Melko tärkeä"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Hyvin tärkeä"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip kuva kuvassa"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Kuva kuvassa"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Salli kuva kuvassa"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Anna sovellukselle lupa luoda kuva kuvassa ‑ikkuna, kun se on auki tai siirryt siitä muualle (esimerkiksi palaat videoon). Tämä ikkuna näytetään muiden sovellusten ikkunoiden päällä."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Anna sovellukselle lupa luoda kuva kuvassa ‑ikkuna, kun se on auki tai siirryt siitä muualle (esimerkiksi palaat videoon). Tämä ikkuna näytetään muiden sovellusten ikkunoiden päällä."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Älä häiritse -käyttöoikeudet"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Yksikään asennettu sovellus ei ole pyytänyt Älä häiritse -tilan käyttöoikeutta."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ladataan sovelluksia…"</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Tiedostojen siirtäminen"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Kuvien siirtäminen (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Laitteen käyttö MIDI-tilassa"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Tekstiviestien peilaus"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Taustatarkistus"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Täydet taustakäyttöoikeudet"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Käytä näytön tekstiä"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Määritä Yövalon aikataulu"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Käytä nukahtamista helpottavaa värisävyä"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Yövalo otettiin käyttöön."</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Näyttö on keltasävyinen. Tämä voi auttaa sinua nukahtamaan."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Ehdotukset"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Käytä viileämpiä värilämpötiloja"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Ota värin muutos käyttöön sammuttamalla näyttö."</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Käynnistä laite uudelleen, niin puhelinpalvelujen seurannan muutokset astuvat voimaan."</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kameran HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Käynnistä laite uudelleen, niin kameran HAL HDR+ ‑muutos astuu voimaan."</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kameran laseranturi"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automaattiset järjestelmäpäivitykset"</string>
     <string name="usage" msgid="2977875522080448986">"Käyttö"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobiilidatan käyttö"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Datavaroitus"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Aseta tiedonsiirtoraja"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datankäyttöraja"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> käytetty välillä <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> käytetty <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Määritä"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Muut datan käyttöön laskettavat sovellukset"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Poista ja salaa"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Nollaa ShortcutManagerin kutsurajoitus"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManagerin kutsurajoitus nollattiin."</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Hallinnoi lukitusnäytön ilmoituksia"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Hallinnoi lukitusnäytön tietoja"</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="8483187649355540109">"Tuki ja vinkit"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Yksikään asennettu sovellus ei ole pyytänyt premium-tekstiviestien käyttöoikeutta."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium-tekstiviestien käyttö saattaa olla maksullista, ja kulut lisätään operaattorisi laskuun. Jos annat sovellukselle käyttöoikeuden, voit lähettää premium-tekstiviestejä kyseisellä sovelluksella."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Premium-tekstiviestien käyttö"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Ei näy muille laitteille"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Pois käytöstä"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Yhdistetty laitteeseen <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Yhdistetty useisiin laitteisiin"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Käyttöliittymän esittelytila"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Pikasovellukset"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Avaa linkkejä sovelluksessa, vaikka sitä ei ole asennettu."</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Pikasovellukset"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Pikasovellustili"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Pikasovellusvalinnat"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Asennetut sovellukset"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Tallennustilan hallinta hallitsee nyt tallennustilaasi."</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Tilit: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Aina käytössä oleva VPN päällä henkilökohtaisessa profiilissa"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Aina käytössä oleva VPN päällä työprofiilissa"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Yleinen HTTP-välityspalvelin asetettu"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Luotetut todennustiedot"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Luotetut kirjautumistiedot"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Henkilökohtaisen profiilin luotetut kirjautumistiedot"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Työprofiilin luotetut kirjautumistiedot"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Vähintään <xliff:g id="COUNT_1">%d</xliff:g> CA-varmennetta</item>
       <item quantity="one">Vähintään <xliff:g id="COUNT_0">%d</xliff:g> CA-varmenne</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operaattorin hallintatiedot"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Ota operaattorin hallinta käyttöön"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Uutta"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Katso viisi kätevää ominaisuutta"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Tutustu uuteen puhelimeesi"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Tutustu uuteen tablettiisi"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Tutustu uuteen laitteeseesi"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ominaisuus ei ole käytettävissä tällä laitteella."</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS-rekisteröinnin tila"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Rekisteröity"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Ei rekisteröity"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 668ce7c..a9da44a 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s souhaite accéder à vos messages. Autoriser l\'accès à %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Demande d\'accès à la carte SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> souhaite accéder à votre carte SIM. Le fait d\'accorder l\'accès à la carte SIM désactive la connectivité de données sur votre appareil pendant la durée de la connexion. Accorder l\'accès à <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>."</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visible comme « <xliff:g id="DEVICE_NAME">^1</xliff:g> » aux autres appareils"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible comme « <xliff:g id="DEVICE_NAME">^1</xliff:g> » aux autres appareils"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vos appareils"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Associer un nouvel appareil"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Date et heure"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Suivant"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Ignorer l\'empreinte digitale?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"La configuration des empreintes digitales ne prend qu\'une minute ou deux. Si vous ignorez cette étape, vous pouvez ajouter votre empreinte digitale plus tard dans les paramètres."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Ignorer verrouillage d\'écran?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser cette tablette en cas de perte, de vol ou de réinitialisation."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser cet appareil en cas de perte, de vol ou de réinitialisation."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser ce téléphone en cas de perte, de vol ou de réinitialisation."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Vous avez ajouté le nombre maximal d\'empreintes digitales"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Impossible d\'ajouter des empreintes digitales"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Supprimer toutes les empreintes digitales?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Supprimer « <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> »"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Voulez-vous supprimer cette empreinte digitale?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Vous ne pourrez pas utiliser vos empreintes digitales pour déverrouiller votre téléphone, autoriser vos achats ni vous connecter à des applications"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Vous ne pourrez pas utiliser vos empreintes digitales pour déverrouiller votre profil professionnel, autoriser vos achats ni vous connecter à des applications professionnelles"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Oui, supprimer"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protégez votre tablette"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protégez votre appareil"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protégez votre téléphone"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Pour plus de sécurité, configurez une méthode alternative pour verrouiller l\'écran."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Pour plus de sécurité, configurez une méthode secondaire pour verrouiller l\'écran."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cette tablette sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cet appareil sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser ce téléphone sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
@@ -497,35 +502,35 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Supprimer la protection de l\'appareil?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Supprimer la protection du profil?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Les fonctions de protection de l\'appareil ne fonctionneront pas sans votre schéma."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Les fonctions de protection de l\'appareil ne fonctionneront pas sans votre schéma.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Les fonctions de protection de l\'appareil ne fonctionneront pas sans votre schéma.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Vos empreintes digitales enregistrées seront également supprimées de cet appareil et vous ne pourrez pas déverrouiller votre téléphone, autoriser des achats ni vous connecter à des applications avec celles-ci."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Les fonctions de protection de l\'appareil ne fonctionneront pas sans votre NIP."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Les fonctions de protection de l\'appareil ne fonctionneront pas sans votre NIP.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Les fonctions de protection de l\'appareil ne fonctionneront pas sans votre NIP.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Vos empreintes digitales enregistrées seront également supprimées de cet appareil et vous ne pourrez pas déverrouiller votre téléphone, autoriser des achats ni vous connecter à des applications avec celles-ci."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Les fonctions de protection de l\'appareil ne fonctionneront pas sans votre mot de passe."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Les fonctions de protection de l\'appareil ne fonctionneront pas sans votre mot de passe. <xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Les fonctions de protection de l\'appareil ne fonctionneront pas sans votre mot de passe. <xliff:g id="EMPTY_LINE">
 
 </xliff:g>Vos empreintes digitales enregistrées seront également supprimées de cet appareil et vous ne pourrez pas déverrouiller votre téléphone, autoriser des achats ni vous connecter à des applications avec celles-ci."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Les fonctions de protection de l\'appareil ne fonctionneront pas sans votre verrouillage d\'écran."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Les fonctions de protection de l\'appareil ne fonctionneront pas sans votre verrouillage d\'écran.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Les fonctions de protection de l\'appareil ne fonctionneront pas sans votre verrouillage d\'écran.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Vos empreintes digitales enregistrées seront également supprimées de cet appareil et vous ne pourrez pas déverrouiller votre téléphone, autoriser des achats ni vous connecter à des applications avec celles-ci."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Les fonctions de protection du profil ne fonctionneront pas sans votre schéma."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Les fonctions de protection du profil ne fonctionneront pas sans votre schéma.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Les fonctions de protection du profil ne fonctionneront pas sans votre schéma.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Vos empreintes digitales enregistrées seront également supprimées de ce profil et vous ne pourrez pas déverrouiller votre profil, autoriser des achats ni vous connecter à des applications avec celles-ci."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Les fonctions de protection du profil ne fonctionneront pas sans votre NIP."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Les fonctions de protection du profil ne fonctionneront pas sans votre NIP.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Les fonctions de protection du profil ne fonctionneront pas sans votre NIP.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Vos empreintes digitales enregistrées seront également supprimées de ce profil et vous ne pourrez pas déverrouiller votre profil, autoriser des achats ni vous connecter à des applications avec celles-ci."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Les fonctions de protection du profil ne fonctionneront pas sans votre mot de passe."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Les fonctions de protection de profil ne fonctionneront pas sans votre mot de passe. <xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Les fonctions de protection de profil ne fonctionneront pas sans votre mot de passe. <xliff:g id="EMPTY_LINE">
 
-</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de ce profil et vous ne pourrez pas déverrouiller votre téléphone, autoriser des achats ni vous connecter à des applications avec celles-ci."</string>
+</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de ce profil et vous ne pourrez pas déverrouiller votre profil, autoriser des achats ni vous connecter à des applications avec celles-ci."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Les fonctions de protection du profil ne fonctionneront pas sans votre verrouillage d\'écran."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Les fonctions de protection du profil ne fonctionneront pas sans votre verrouillage d\'écran.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Les fonctions de protection du profil ne fonctionneront pas sans votre verrouillage d\'écran.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Vos empreintes digitales enregistrées seront également supprimées de ce profil et vous ne pourrez pas déverrouiller votre téléphone, autoriser des achats ni vous connecter à des applications avec celles-ci."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Oui, supprimer"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Les suites croissantes, décroissantes ou répétitives de chiffres ne sont pas autorisées"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Annuler"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Effacer"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Annuler"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Suivant"</string>
     <string name="lock_setup" msgid="3355847066343753943">"La configuration est terminée."</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Entrez votre mot de passe réseau"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Réseau Wi-Fi du fournisseur de services"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Se connecter au réseau de <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Pour améliorer la précision de la position et à d\'autres fins, <xliff:g id="APP_NAME">%1$s</xliff:g> souhaite activer la recherche de réseaux, même lorsque le Wi-Fi est désactivé.\n\nDonner cette autorisation à toutes les applications souhaitant activer la recherche de réseaux?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Pour désactiver cette option, sélectionnez « Paramètres avancés » dans le menu à développer."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Autoriser"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Connexion"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Échec de la connexion au réseau."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Supprimer"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modifier"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Échec de la suppression du réseau."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Enregistrer"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Échec de l\'enregistrement du réseau."</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Paramètres Wi-Fi avancés"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adresse MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Adresse IP"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Détails du réseau"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Masque de sous-réseau"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Adresses IPv6"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Annuler l\'invitation?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Voulez-vous annuler l\'invitation à se connecter avec <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Voulez-vous vraiment supprimer ce groupe?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Point d\'accès Wi-Fi mobile"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Point d\'accès Wi‑Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Connexion Internet ou contenu non partagés avec d\'autres appareils"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"La connexion Internet de la tablette est partagée par point d\'accès"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"La connexion Internet du téléphone est partagée par point d\'accès"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"L\'application partage du contenu. Pour partager la connexion Internet, désactivez puis réactivez le point d\'accès."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nom du réseau Wi-Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Nom du point d\'acces"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Activation du point d\'accès <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> en cours…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"D\'autres appareils peuvent se connecter à <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Mot de passe Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Mot de passe du point d\'accès"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Bande du point d\'accès"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Un point d\'accès vous permet de créer un réseau Wi-Fi pour vos autres appareils. Il les connecte à Internet en utilisant votre connexion de données cellulaires. Des frais cellulaires supplémentaires peuvent s\'appliquer."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Les applications peuvent créer un point d\'accès pour partager du contenu avec les appareils à proximité."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"L\'adresse utilisée par les services d\'urgence pour déterminer votre position si vous faites un appel au service d\'urgence en utilisant le Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Affichage"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Son"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volume"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Rechercher"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Configurer les paramètres et l\'historique de recherche"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Aucun résultat"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Effacer l\'historique"</string>
     <string name="display_settings" msgid="7965901687241669598">"Affichage"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotation auto de l\'écran"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Couleurs vives"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Restauration des paramètres APN par défaut en cours..."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Rétablir les valeurs par défaut"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"La réinitialisation des paramètres APN par défaut est terminée."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Réinitialiser"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Réinitialisation paramètres réseau"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Options de réinitialisation"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Impossible de réinitialiser le réseau, les applications ou l\'appareil"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Réinitialiser les paramètres Wi-Fi, cellulaires et Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Cette opération entraîne la réinitialisation de tous les paramètres réseau, y compris :\n\n"<li>"Le Wi‑Fi"</li>\n<li>"Les données cellulaires"</li>\n<li>"Le Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Réinitialiser les paramètres"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Réinitialiser tous les paramètres réseau? Cette action est irréversible."</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Réinitialiser?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"La réinitialisation du réseau n\'est pas disponible pour cet utilisateur."</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Les paramètres réseau ont été réinitialisés"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Rétablir configuration d\'usine"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> compte sera réinitialisé</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> comptes seront réinitialisés</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"L\'espace de stockage interne et toutes les données seront réinitialisés"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Effacer toutes les données (réinitialisation d\'usine)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre tablette, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Cette action effacera toutes les données du "<b>"stockage interne"</b>" de votre téléphone, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Vous êtes actuellement connecté aux comptes suivants :\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informations de sécurité"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Vous n\'avez pas de connexion Internet. Pour consulter ces informations maintenant, accédez à %s depuis un ordinateur connecté à Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Chargement en cours..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Choisir votre mot de passe"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Configurer le verrouillage de l\'écran"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Pour plus de sécurité, définissez un mot de passe"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Pour util. empr. digit., config. m. de passe"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Choisir votre schéma"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Pour utiliser empreinte digitale, configurer schéma"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Choisir votre NIP"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Pour plus de sécurité, définissez un NIP"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Pour util. empr. digit., config. NIP"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirmez le mot de passe."</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Entrez de nouveau votre mot de passe"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirmez votre schéma"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirmer votre NIP"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Entrer de nouveau votre NIP"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Les mots de passe ne correspondent pas."</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Les NIP ne correspondent pas."</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Mode de déverrouillage"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Entrez le schéma de votre profil professionnel pour continuer"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Entrez le NIP de votre profil professionnel pour continuer"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Entrez le mot de passe de votre profil professionnel pour continuer"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Entrez le schéma de votre appareil pour continuer (nécessaire après le redémarrage)."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Entrez le NIP de votre appareil pour continuer (nécessaire après le redémarrage)."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Entrez le mot de passe de votre appareil pour continuer (nécessaire après le redémarrage)."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Entrez le schéma de votre profil professionnel pour continuer (nécessaire après le redémarrage)."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Entrez le NIP de votre profil professionnel pour continuer (nécessaire après le redémarrage)."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Entrez le m. de p. de votre profil professionnel pour continuer (nécessaire après le redémarrage)."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Pour plus de sécurité, tracez le schéma de votre appareil"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Pour plus de sécurité, entrez le NIP de votre appareil"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Pour plus de sécurité, entrez le mot de passe de votre appareil"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Pour plus de sécurité, tracez votre schéma professionnel"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Pour plus de sécurité, entrez votre NIP professionnel"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Pour plus de sécurité, entrez votre mot de passe professionnel"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"La configuration d\'usine du téléphone a été rétablie. Pour l\'utiliser, entrez le schéma précédent."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"La configuration d\'usine du téléphone a été rétablie. Pour l\'utiliser, entrez le NIP précédent."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"La configuration d\'usine du téléphone a été rétablie. Pour l\'utiliser, entrez le mot passe précédent."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Vérifier le schéma"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Vérifier le NIP"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Vérifier le mot de passe"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"NIP erroné"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Mot de passe incorrect"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Schéma erroné"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Créer un widget et autoriser l\'accès?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Une fois le widget créé, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> peut accéder à toutes les données qu\'il affiche."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Toujours autoriser <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> à créer des widgets et accéder à leurs données"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> j <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> mn <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> mn <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> mn <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> j <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> min"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Données statistiques"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Données statistiques"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Trier par :"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Lecteurs d\'écran, affichage, commandes interactives"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Paramètres de visibilité"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Vous pouvez personnaliser cet appareil en fonction de vos besoins. Il est possible de modifier ces fonctionnalités d\'accessibilité plus tard dans les paramètres."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Augmenter la taille de la police"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Modifier la taille de la police"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Lecteurs d\'écran"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio et texte à l\'écran"</string>
     <string name="display_category_title" msgid="685461049938269166">"Affichage"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Pour zoomer,"</b>" touchez rapidement l\'écran trois fois.\n"<ul><li>"Glissez deux doigts ou plus sur l\'écran pour le faire défiler"</li>\n<li>"Pincez deux doigts ou plus pour ajuster le zoom"</li></ul>\n\n<b>"Pour zoomer temporairement,"</b>" touchez rapidement l\'écran trois fois et, au troisième toucher, laissez le doigt sur l\'écran\n"<ul><li>"Glissez votre doigt vous vous déplacer sur l\'écran."</li>\n<li>"Relevez le doigt pour zoomer vers l\'arrière"</li></ul>\n\n"On ne peut pas zoomer sur le clavier ou la barre de navigation."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Lorsque l\'agrandissement est activé, servez-vous du bouton d\'accessibilité dans le bas de l\'écran pour zoomer rapidement l\'écran.\n\n"<b>"Pour effectuer un zoom"</b>", touchez le bouton d\'accessibilité, puis touchez ailleurs sur l\'écran.\n"<ul><li>"Glissez deux doigts ou plus sur l\'écran pour le faire défiler."</li>\n<li>"Pincez deux doigts ou plus pour ajuster le zoom."</li></ul>\n\n<b>"Pour zoomer temporairement l\'écran"</b>", touchez le bouton d\'accessibilité, puis maintenez le doigt sur ailleurs sur l\'écran.\n"<ul><li>"Glissez votre doigt sur l\'écran à l\'endroit désiré."</li>\n<li>"Relevez le doigt pour zoomer vers l\'arrière."</li></ul>\n\n"On ne peut pas zoomer sur le clavier ou la barre de navigation."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Le bouton d\'accessibilité est défini à <xliff:g id="SERVICE">%1$s</xliff:g>. Pour utiliser cette fonction, maintenez enfoncé le bouton d\'accessibilité, puis sélectionnez l\'agrandissement."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Raccourci d\'accessibilité"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Raccourci clavier de volume"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Service de raccourcis"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Autoriser à l\'écran de verrouillage"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Lorsque le raccourci est activé, vous pouvez appuyer sur les deux boutons de volume pendant trois secondes pour démarrer une fonctionnalité d\'accessibilité."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Lorsque le raccourci est activé, vous pouvez appuyer sur les deux boutons de volume pendant trois secondes pour démarrer une fonctionnalité d\'accessibilité."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Texte de contraste élevé"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Mise à jour auto de la loupe"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Mettre à jour la loupe si transition entre applis"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Pourrait nuire aux performances"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Cliquer lorsque curseur arrête"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Délai précédant le clic"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> : <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ACTIVÉ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DÉSACTIVÉ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Afficher dans la fenêtre de configuration rapide"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> fichiers sélectionnés sur <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> sur <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Tout sélectionner"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Gérer les forfaits"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Utilisation des données"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Util. données aplication"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"La manière dont le fournisseur de services effectue les calcul des données peut être différente."</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Réseaux mobiles"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Réseaux Wi-Fi mesurés"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Pour sélectionner les réseaux mesurés, activez le Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatique"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Mesuré"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Non mesuré"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Le suivi de consommation du fournisseur de service peut différer de celui de l\'appareil."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Appel d\'urgence"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Retour à l\'appel"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Gestionnaire d\'appels"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Diffusions d\'urgence"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Alertes d\'urgence"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Fournisseurs de services cellulaires"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Noms des points d\'accès"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Mode LTE 4G avancé"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Carte SIM préférée pour"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Toujours demander"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Veuillez indiquer votre préférence"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Sélection de carte SIM"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Paramètres"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="one">Afficher %d élément masqué</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Notifications de l\'appli"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Catégorie de notifications"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importance"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Laisser l\'application décider"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Autoriser le son"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Ne jamais afficher les notifications"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Aucun son ni interruption visuelle"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Aucun son"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Émettre un son"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Émettre un son et s\'afficher à l\'écran"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Afficher sur l\'écran"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Faible"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Moyenne"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Élevée"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgente"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Autoriser le son"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Ne pas émettre de son, activer le vibreur ni afficher ces notifications sur l\'écran actif."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Autoriser les interruptions"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Autoriser l\'application à émettre des sons, à vibrer et à afficher des notifications à l\'écran"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Importance faible"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Importance moyenne"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Importance élevée"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"image incrustée, image dans image"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Incrustation d\'image"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Autoriser l\'incrustation d\'image"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Autorisez cette application à créer une fenêtre d\'incrustation d\'image lorsqu\'elle est ouverte ou après l\'avoir quittée (par exemple, pour continuer de regarder une vidéo). Cette fenêtre se superpose aux autres applications en cours d\'utilisation."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Autorisez cette application à créer une fenêtre d\'incrustation d\'image lorsqu\'elle est ouverte ou après l\'avoir quittée (par exemple, pour continuer de regarder une vidéo). Cette fenêtre se superpose aux autres applications en cours d\'utilisation."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Accès à « Ne pas déranger »"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Aune application installée n\'a demandé l\'accès au mode « Ne pas déranger »"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Chargement des applications en cours..."</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transfert de fichiers"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transfert de photos (profil PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Utiliser l\'appareil comme dispositif MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Duplication de messages texte"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Vérification en arrière-plan"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Accès complet à l\'arrière-plan"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Utiliser le texte affiché à l\'écran"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Créer un horaire pour le mode Éclairage nocturne"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Écran ambre pour vous aider à vous endormir"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Éclairage nocturne activé"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"L\'écran a une teinte ambre qui peut vous aider à vous endormir."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Suggestions"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utiliser des couleurs plus froides à l\'écran"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Pour appliquer la modification des couleurs, éteignez l\'écran"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Pour appliquer les changements de TelephonyMonitor, redémarrez l\'appareil"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Mode HAL HDR+ de l\'appareil photo"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Pour appliquer les changements HAL HDR+ de l\'appareil photo, redémarrez l\'appareil"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Capteur laser de l\'appareil photo"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Mises à jour automatiques du système"</string>
     <string name="usage" msgid="2977875522080448986">"Utilisation"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Utilisation de données cellulaires"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Seuil d\'alerte"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Définir limite consomm. données"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limite de données"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> utilisés entre <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> utilisés pour la période : <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configurer"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Autres applications incluses dans l\'utilisation"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Effacer et convertir"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Réinitialiser la limitation de fréquence ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"La limitation de fréquence ShortcutManager a été réinitialisée"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Gérer notifications écran verrouillage"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Gérer les données sur l\'écran de 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="8483187649355540109">"Assistance et astuces"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Aucune application installée n\'a demandé l\'accès aux textos payants"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Les textos de cette catégorie peuvent être payants et s\'ajouter aux factures mensuelles de votre fournisseur de services. Si vous activez l\'autorisation pour une application, vous serez en mesure d\'envoyer des textos payants à l\'aide de cette dernière."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Accès aux textos payants"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Non visible aux autres appareils"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Désactivé"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connecté à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connecté à plusieurs appareils"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Mode de démonstration de l\'interface système"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Applications instantanées"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Ouvrir les liens dans les applications, même si elles ne sont pas installées"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Applications instantanées"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Compte pour les applications instantanées"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Préférences des applications instantanées"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Applications installées"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Votre espace de stockage est maintenant géré par le gestionnaire de stockage"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Comptes pour <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Le RPV permanent est activé dans votre profil personnel"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Le RPV permanent est activé dans votre profil professionnel"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Le serveur mandataire HTTP global a été défini"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Certificats de confiance"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Certificats de confiance"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Certificats de confiance installés dans votre profil personnel"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Certificats de confiance installés dans votre profil professionnel"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">Minimum de <xliff:g id="COUNT_1">%d</xliff:g> certificat CA</item>
       <item quantity="other">Minimum de <xliff:g id="COUNT_1">%d</xliff:g> certificats CA</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Données d\'approvisionnement du fournisseur de services"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Déclencher l\'approvisionnement du fournisseur de services"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Quelles sont les nouveautés toutes chaudes?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Découvrez les cinq principales fonctionnalités"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Découvrez votre nouveau téléphone"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Découvrez votre nouvelle tablette"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Découvrez votre nouvel appareil"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Cette fonctionnalité n\'est pas accessible sur cet appareil."</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"État d\'enregistrement IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Enregistré"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Non enregistré"</string>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index e8d1cb4..362d83b 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -230,7 +230,7 @@
     <item msgid="4498124044785815005">"Laisser le système décider"</item>
   </string-array>
   <string-array name="app_ops_categories">
-    <item msgid="6358963769537892925">"Position"</item>
+    <item msgid="6358963769537892925">"Localisation"</item>
     <item msgid="255608127647030286">"Personnel"</item>
     <item msgid="4588829735729884491">"SMS/MMS"</item>
     <item msgid="886742181977884584">"Multimédia"</item>
@@ -304,9 +304,9 @@
     <item msgid="2629748510881309577">"volume d\'accessibilité"</item>
   </string-array>
   <string-array name="app_ops_labels">
-    <item msgid="6602854600289714121">"Position"</item>
-    <item msgid="8677040780775113033">"Position"</item>
-    <item msgid="1660743989948992916">"Position"</item>
+    <item msgid="6602854600289714121">"Localisation"</item>
+    <item msgid="8677040780775113033">"Localisation"</item>
+    <item msgid="1660743989948992916">"Localisation"</item>
     <item msgid="8791172739860195290">"Vibreur"</item>
     <item msgid="383413555642128046">"Accéder aux contacts"</item>
     <item msgid="3654594895269697313">"Modifier les contacts"</item>
@@ -314,9 +314,9 @@
     <item msgid="6248591205254641116">"Modifier le journal d\'appels"</item>
     <item msgid="6093344633066170692">"Accéder à l\'agenda"</item>
     <item msgid="1334886368750347692">"Modifier l\'agenda"</item>
-    <item msgid="1638204101698708656">"Position"</item>
+    <item msgid="1638204101698708656">"Localisation"</item>
     <item msgid="2154671955760380322">"Publier des notifications"</item>
-    <item msgid="4282477730595931828">"Position"</item>
+    <item msgid="4282477730595931828">"Localisation"</item>
     <item msgid="4891423912898525905">"Appeler"</item>
     <item msgid="2623604824935968113">"Lire des SMS ou des MMS"</item>
     <item msgid="4420177125221176306">"Écrire des SMS ou des MMS"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 71755ae..1d30bc6 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Une demande d\'accès à vos messages a été envoyée pour \"%1$s\". Accorder l\'accès à \"%2$s\" ?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Demande d\'accès à la carte SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"\"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>\" requiert l\'accès à votre carte SIM. Si vous l\'accordez, la connectivité des données sera désactivée sur votre appareil pour toute la durée de la connexion. Accorder l\'autorisation d\'accès à \"<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>\""</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visible avec le nom \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" pour les autres appareils"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible avec le nom \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" pour les autres appareils"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vos appareils"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Associer un nouvel appareil"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Date et heure"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Suivant"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Passer configuration empreinte ?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"La configuration de l\'empreinte digitale ne prend qu\'une minute ou deux. Si vous passez cette étape, vous pouvez ajouter votre empreinte digitale plus tard dans les paramètres."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Passer verrouillage d\'écran ?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser cette tablette en cas de perte, de vol ou de réinitialisation."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser cet appareil en cas de perte, de vol ou de réinitialisation."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser ce téléphone en cas de perte, de vol ou de réinitialisation."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Vous avez ajouté le nombre maximal autorisé d\'empreintes digitales"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Impossible d\'ajouter d\'autres empreintes digitales"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Supprimer les empreintes digitales ?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Supprimer \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\""</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Souhaitez-vous supprimer cette empreinte digitale ?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Vous ne pourrez pas utiliser votre empreinte digitale pour déverrouiller votre téléphone, autoriser des achats ni vous connecter à des applications"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Vous ne pourrez pas utiliser votre empreinte digitale pour déverrouiller votre profil professionnel, autoriser des achats ni vous connecter à des applications professionnelles"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Oui, supprimer"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protéger la tablette"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protéger l\'appareil"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protégez votre téléphone"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Pour plus de sécurité, configurez un mode de verrouillage de l\'écran supplémentaire."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Pour plus de sécurité, configurez un mode de verrouillage de l\'écran supplémentaire."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cette tablette sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cet appareil sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser ce téléphone sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
@@ -497,35 +502,35 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Supprimer la protection de l\'appareil ?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Supprimer la protection du profil ?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Les fonctionnalités de protection de l\'appareil ne fonctionnent pas sans votre schéma."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Les fonctionnalités de protection de l\'appareil ne fonctionnent pas sans votre schéma.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Les fonctionnalités de protection de l\'appareil ne fonctionnent pas sans votre schéma.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Vos empreintes digitales enregistrées seront également supprimées de cet appareil, et vous ne pourrez plus les utiliser pour déverrouiller votre téléphone, autoriser des achats ni vous connecter à des applications."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Les fonctionnalités de protection de l\'appareil ne fonctionnent pas sans votre code."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Les fonctionnalités de protection de l\'appareil ne fonctionnent pas sans votre code.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Les fonctionnalités de protection de l\'appareil ne fonctionnent pas sans votre code.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Vos empreintes digitales enregistrées seront également supprimées de cet appareil, et vous ne pourrez plus les utiliser pour déverrouiller votre téléphone, autoriser des achats ni vous connecter à des applications."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Les fonctionnalités de protection de l\'appareil ne fonctionnent pas sans votre mot de passe."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Les fonctionnalités de protection de l\'appareil ne fonctionnent pas sans votre mot de passe.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Les fonctionnalités de protection de l\'appareil ne fonctionnent pas sans votre mot de passe.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Vos empreintes digitales enregistrées seront également supprimées de cet appareil, et vous ne pourrez plus les utiliser pour déverrouiller votre téléphone, autoriser des achats ni vous connecter à des applications."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Les fonctionnalités de protection de l\'appareil ne fonctionnent pas sans le verrouillage de l\'écran."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Les fonctionnalités de protection de l\'appareil ne fonctionnent pas sans le verrouillage de l\'écran.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Les fonctionnalités de protection de l\'appareil ne fonctionnent pas sans le verrouillage de l\'écran.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Vos empreintes digitales enregistrées seront également supprimées de cet appareil, et vous ne pourrez plus les utiliser pour déverrouiller votre téléphone, autoriser des achats ni vous connecter à des applications."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"La protection du profil ne fonctionne pas sans votre schéma."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"La protection du profil ne fonctionne pas sans votre schéma.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Les fonctionnalités de protection du profil ne fonctionnent pas sans votre schéma.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Vos empreintes digitales enregistrées seront également supprimées de ce profil, et vous ne pourrez plus les utiliser pour déverrouiller votre profil, autoriser des achats ni vous connecter à des applications."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"La protection du profil ne fonctionne pas sans votre code."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"La protection du profil ne fonctionne pas sans votre code.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Les fonctionnalités de protection du profil ne fonctionnent pas sans votre code.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Vos empreintes digitales enregistrées seront également supprimées de ce profil, et vous ne pourrez plus les utiliser pour déverrouiller votre profil, autoriser des achats ni vous connecter à des applications."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"La protection du profil ne fonctionne pas sans votre mot de passe."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"La protection du profil ne fonctionne pas sans votre mot de passe.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Les fonctionnalités de protection du profil ne fonctionnent pas sans votre mot de passe.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Vos empreintes digitales enregistrées seront également supprimées de ce profil, et vous ne pourrez plus les utiliser pour déverrouiller votre profil, autoriser des achats ni vous connecter à des applications."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"La protection du profil ne fonctionne pas sans le verrouillage de l\'écran."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"La protection du profil ne fonctionne pas sans le verrouillage de l\'écran.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Les fonctionnalités de protection du profil ne fonctionnent pas sans le verrouillage de l\'écran.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Vos empreintes digitales enregistrées seront également supprimées de ce profil, et vous ne pourrez plus les utiliser pour déverrouiller votre profil, autoriser des achats ni vous connecter à des applications."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Oui, supprimer"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Les suites de chiffres croissantes, décroissantes ou répétitives ne sont pas autorisées"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Annuler"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Effacer"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Annuler"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Suivant"</string>
     <string name="lock_setup" msgid="3355847066343753943">"La configuration est terminée."</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Saisissez votre mot de passe réseau."</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Réseau Wi‑Fi de l\'opérateur"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Se connecter via <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Pour améliorer la précision de la localisation, entre autres, <xliff:g id="APP_NAME">%1$s</xliff:g> souhaite activer la recherche de réseaux même lorsque le Wi-Fi est désactivé.\n\nDonner cette autorisation à toutes les applications souhaitant activer la recherche de réseaux ?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Pour désactiver cette option, sélectionnez \"Paramètres avancés\" dans le menu à développer."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Autoriser"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Se connecter"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Échec de la connexion au réseau."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Retirer"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modifier"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Échec de la suppression du réseau."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Enregistrer"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Échec de l\'enregistrement du réseau."</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Paramètres Wi-Fi avancés"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adresse MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Adresse IP"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Informations sur le réseau"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Masque de sous-réseau"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Adresses IPv6"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Annuler l\'invitation ?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Voulez-vous annuler l\'invitation à se connecter avec <xliff:g id="PEER_NAME">%1$s</xliff:g> ?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Voulez-vous vraiment supprimer ce groupe ?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Point d\'accès Wi-Fi mobile"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Point d\'accès Wi‑Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Ne partager ni la connexion, ni aucun contenu, avec d\'autres appareils"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Connexion Internet de la tablette partagée via un point d\'accès"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Connexion Internet du téléphone partagée via un point d\'accès"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"L\'application partage du contenu. Pour partager la connexion Internet, désactivez le point d\'accès, puis réactivez-le"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nom du point d\'accès Wi-Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Nom du point d\'accès"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Activation du point d\'accès \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\"…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"D\'autres appareils peuvent se connecter au point d\'accès \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\""</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Mot de passe du point d\'accès Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Mot de passe du point d\'accès"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Bande du point d\'accès"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Utilisez un point d\'accès afin de créer un réseau Wi‑Fi pour vos autres appareils. Un point d\'accès fournit un accès à Internet via votre connexion de données mobiles. Des frais supplémentaires peuvent s\'appliquer pour l\'utilisation des données mobiles."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Les applications peuvent créer un point d\'accès pour partager du contenu avec des appareils à proximité."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"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="display_settings_title" msgid="1708697328627382561">"Affichage"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Son"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volume"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Recherche"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Configurer les paramètres et l\'historique de recherche"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Aucun résultat"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Effacer l\'historique"</string>
     <string name="display_settings" msgid="7965901687241669598">"Affichage"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotation auto de l\'écran"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Couleurs vives"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Restauration des paramètres APN par défaut en cours..."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Rétablir param. par défaut"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"La réinitialisation des paramètres APN par défaut est terminée."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Réinitialiser"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Réinitialisation des paramètres réseau"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Options de réinitialisation"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Vous pouvez réinitialiser le réseau, les applications ou l\'appareil"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Réinitialiser le Wi-Fi, les données mobiles et le Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Tous les paramètres réseau seront réinitialisés, y compris les suivants :\n\n"<li>"Wi‑Fi"</li>\n<li>"Données mobiles"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Réinitialiser les paramètres"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Réinitialiser tous les paramètres réseau ? Cette action est irréversible."</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Réinitialiser ?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"La réinitialisation du réseau n\'est pas disponible pour cet utilisateur."</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Les paramètres des réseaux ont bien été réinitialisés."</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Rétablir la configuration d\'usine"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> compte sera réinitialisé</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> comptes seront réinitialisés</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"La mémoire de stockage interne et toutes les données seront réinitialisées"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Effacer toutes les données (rétablir la configuration d\'usine)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre tablette, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et des applications"</li>\n<li>"Les applications téléchargées"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Cette action effacera toutes les données du "<b>"stockage interne"</b>" de votre téléphone, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et des applications"</li>\n<li>"Les applications téléchargées"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Vous êtes actuellement connecté aux comptes suivants :\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informations de sécurité"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Vous n\'avez pas de connexion Internet. Pour consulter ces informations maintenant, accédez à %s depuis un ordinateur connecté à Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Chargement…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Choisir votre mot de passe"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Configurer le verrouillage de l\'écran"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Pour des raisons de sécurité, définissez un mot de passe"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Pour utiliser votre empreinte, définissez un mot de passe"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Choisir votre schéma"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Pour utiliser votre empreinte, définissez un schéma"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Choisir votre code PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Pour des raisons de sécurité, définissez un code"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Pour utiliser votre empreinte, définissez un code PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirmez le mot de passe."</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Saisissez de nouveau votre mot de passe"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirmez votre schéma"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirmez votre code PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Saisissez de nouveau votre code"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Les mots de passe ne correspondent pas."</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Les codes PIN ne correspondent pas."</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Méthode de déverrouillage"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Utilisez le schéma du profil professionnel pour continuer."</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Saisissez le code du profil professionnel pour continuer."</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Saisissez le mot de passe du profil professionnel pour continuer."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Utilisez le schéma de l\'appareil pour continuer. Requis après son redémarrage."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Saisissez le code de l\'appareil pour continuer. Requis après son redémarrage."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Saisissez le mot de passe de l\'appareil pour continuer. Requis après son redémarrage."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Utilisez le schéma de votre profil professionnel pour continuer. Requis après le redémarrage."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Saisissez le code de votre profil professionnel pour continuer. Requis après le redémarrage."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Saisissez le mot de passe de votre profil professionnel pour continuer. Requis après le redémarrage."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Pour plus de sécurité, utilisez le schéma de l\'appareil"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Pour plus de sécurité, saisissez le code de l\'appareil"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Pour plus de sécurité, saisissez le mot de passe de l\'appareil"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Pour plus de sécurité, utilisez le schéma du profil professionnel"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Pour plus de sécurité, saisissez le code du profil professionnel"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Pour plus de sécurité, saisissez le mot de passe du profil professionnel"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"La configuration d\'usine du téléphone a été rétablie. Pour l\'utiliser, dessinez le schéma précédent."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"La configuration d\'usine du téléphone a été rétablie. Pour l\'utiliser, saisissez le code précédent."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"La configuration d\'usine du téléphone a été rétablie. Pour l\'utiliser, saisissez mot passe précédent."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Valider le schéma"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Valider le code"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Valider le mot de passe"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Code d\'accès incorrect."</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Mot de passe incorrect."</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Schéma incorrect."</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Créer un widget et autoriser l\'accès ?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Une fois le widget créé, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> peut accéder à toutes les données qu\'il affiche."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Toujours autoriser <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> à créer des widgets et accéder à leurs données"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> j <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> min <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> j <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> min"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Données statistiques"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Données statistiques"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Trier par :"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Lecteurs d\'écran, affichage, contrôles par interaction"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Paramètres visuels"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Vous pouvez personnaliser cet appareil en fonction de vos besoins et modifier ces fonctionnalités d\'accessibilité ultérieurement dans les paramètres."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Augmenter la taille de la police"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Modifier la taille de la police"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Lecteurs d\'écran"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio et texte à l\'écran"</string>
     <string name="display_category_title" msgid="685461049938269166">"Écran"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Pour zoomer"</b>", appuyez trois fois rapidement sur l\'écran.\n"<ul><li>"Pour faire défiler l\'écran, faites glisser deux doigts ou plus sur l\'écran"</li>\n<li>"Pour régler le niveau de zoom, pincez deux doigts ou plus sur l\'écran"</li></ul>\n\n<b>"Pour faire un zoom temporaire"</b>", appuyez trois fois rapidement sur l\'écran en veillant à appuyer de manière prolongée la troisième fois.\n"<ul><li>"Pour vous déplacer sur l\'écran, faites glisser un doigt dessus"</li>\n<li>"Pour faire un zoom arrière, relevez le doigt"</li></ul>\n\n"Il est impossible de faire un zoom avant sur le clavier et la barre de navigation."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Lorsque la loupe est activée, utilisez le bouton d\'accessibilité situé en bas de l\'écran pour effectuer un agrandissement rapide.\n\n"<b>"Pour zoomer"</b>", appuyez sur le bouton d\'accessibilité, puis n\'importe où sur l\'écran.\n"<ul><li>"Pour faire défiler l\'écran, faites glisser deux doigts ou plus dessus"</li>\n<li>"Pour régler le niveau de zoom, pincez deux doigts ou plus sur l\'écran"</li></ul>\n\n<b>"Pour faire un zoom temporaire"</b>", appuyez sur le bouton d\'accessibilité, puis appuyez de manière prolongée n\'importe où sur l\'écran.\n"<ul><li>"Pour vous déplacer sur l\'écran, faites glisser un doigt dessus"</li>\n<li>"Pour faire un zoom arrière, relevez le doigt"</li></ul>\n\n"Il est impossible de faire un zoom avant sur le clavier ou la barre de navigation."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Le bouton d\'accessibilité est défini sur <xliff:g id="SERVICE">%1$s</xliff:g>. Pour utiliser la loupe, appuyez de manière prolongée sur le bouton d\'accessibilité, puis sélectionnez la loupe."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Raccourci d\'accessibilité"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Raccourci (touches de volume)"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Service associé au raccourci"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Autoriser depuis écran verrouillage"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Lorsque le raccourci est activé, vous pouvez appuyer sur les deux boutons de volume pendant trois secondes pour lancer une fonctionnalité d\'accessibilité."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Lorsque le raccourci est activé, vous pouvez appuyer sur les deux touches de volume pendant trois secondes pour lancer une fonctionnalité d\'accessibilité."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Texte avec contraste élevé"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Mise à jour auto de la loupe"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Mettre à jour la loupe si transition entre applis"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Peut affecter les performances"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clic après immobilisation du curseur"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Délai précédant le clic"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ACTIVÉ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DÉSACTIVÉ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Afficher dans la fenêtre de configuration rapide"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> fichiers sélectionnés sur <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> sur <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Tout sélectionner"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Gérer les forfaits"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Consommation des données"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Conso données"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Le suivi de la consommation effectué par votre opérateur peut différer de celui de votre appareil."</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Réseaux mobiles"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Réseaux Wi-Fi facturés à l\'usage"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Activez le Wi‑Fi pour accéder à des réseaux facturés à l\'usage."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatique"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Facturé à l\'usage"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Non facturé à l\'usage"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Le suivi de conso effectué par l\'opérateur peut différer de celui de l\'appareil."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Appel d\'urgence"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Retour à l\'appel"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Gestionnaire d\'appels"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Messages d\'urgence"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Alertes d\'urgence"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Opérateurs de réseaux"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Noms des points d\'accès"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Mode LTE 4G avancé"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Carte SIM préférée pour"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Toujours demander"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Veuillez sélectionner une option."</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Sélection de la carte SIM"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Paramètres"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="one">Afficher %d élément masqué</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Notifications appli"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Catégorie de la notification"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importance"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Laisser l\'application décider"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Émettre un signal sonore"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Ne jamais afficher les notifications"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Aucune interruption sonore ni visuelle"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Pas de signal sonore"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Alerte sonore"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Alerte sonore et affichage à l\'écran"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Afficher sur l\'écran"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Faible"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Moyenne"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Élevée"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgente"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Émettre un signal sonore"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Ne pas émettre de son, activer le vibreur ni afficher ces notifications sur l\'écran actif"</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Autoriser les interruptions"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Autoriser l\'application à émettre des sons, vibrer et/ou afficher des notifications à l\'écran"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Importance faible"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Importance moyenne"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Importance élevée"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip picture in picture"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Autoriser le mode Picture-in-picture"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Autorisez cette application à créer une fenêtre Picture-in-picture lorsqu\'elle est ouverte ou après l\'avoir quittée (par exemple, pour continuer de regarder une vidéo). Cette fenêtre se superpose aux autres applications en cours d\'utilisation."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Autorisez cette application à créer une fenêtre Picture-in-picture lorsqu\'elle est ouverte ou après l\'avoir quittée (par exemple, pour continuer de regarder une vidéo). Cette fenêtre se superpose aux autres applications en cours d\'utilisation."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Accès \"Ne pas déranger\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Aucune demande d\'accès \"Ne pas déranger\" n\'a été envoyée par les applications installées."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Chargement des applications en cours…"</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transfert de fichiers"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transfert de photos (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Utilisation de l\'appareil en tant que MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Duplication de SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Vérification en arrière-plan"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Accès complet à l\'arrière-plan"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Utiliser le texte affiché à l\'écran"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Définir les horaires de l\'éclairage nocturne"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Écran tons ambrés pour s\'endormir"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Éclairage nocturne activé"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"L\'écran prend une teinte rouge ambré qui peut vous aider à vous endormir."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Suggestions"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utiliser des couleurs plus froides à l\'écran"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Pour appliquer la modification des couleurs, éteignez l\'écran."</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Pour appliquer la modification effectuée par Telephony Monitor, redémarrez l\'appareil"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Fonction HDR+ HAL de la caméra"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Pour activer la fonction HDR+ dans l\'HAL de la caméra, redémarrez l\'appareil"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Capteur du laser de l\'appareil photo"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Mises à jour automatiques du système"</string>
     <string name="usage" msgid="2977875522080448986">"Consommation"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Consommation des données mobiles"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Seuil d\'avertissement"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Définir une limite"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limite de données"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> utilisé(s) pendant la période : <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> utilisés pour la période : <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configurer"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Autres applications incluses dans la consommation"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Effacer et chiffrer"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Réinitialiser la limitation de fréquence ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"La limitation de fréquence ShortcutManager a bien été réinitialisée."</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Contrôler notifications écran verrouillage"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Contrôler les informations sur l\'écran de 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="8483187649355540109">"Aide et conseils"</string>
@@ -3487,7 +3504,7 @@
     <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>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Les SMS premium peuvent être payants et s\'ajouter aux factures de votre opérateur. Si vous activez l\'autorisation pour une application, vous serez en mesure d\'envoyer des SMS premium à l\'aide de cette dernière."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Accès aux SMS premium"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Non visible par d\'autres appareils"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Désactivé"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connecté à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connecté à plusieurs appareils"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Mode de démonstration de l\'interface du système"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Applis instantanées"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Ouvrez des liens dans des applications, même si celles-ci ne sont pas installées"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Applis instantanées"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Compte pour les applis instantanées"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Préférences des applis instantanées"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Applications installées"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Votre espace de stockage est désormais géré par le gestionnaire d\'espace de stockage."</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Comptes pour <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"VPN permanent activé dans votre profil personnel"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"VPN permanent activé dans votre profil professionnel"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy HTTP global défini"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Certificats de confiance"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Certificats de confiance"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Certificats de confiance dans votre profil personnel"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Certificats de confiance dans votre profil professionnel"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">Au moins <xliff:g id="COUNT_1">%d</xliff:g> certificat CA</item>
       <item quantity="other">Au moins <xliff:g id="COUNT_1">%d</xliff:g> certificats CA</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informations de gestion des comptes opérateur"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Déclencher la gestion des comptes opérateur"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Nouveautés à découvrir"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Découvrez les cinq fonctionnalités clés"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Découvrez votre nouveau téléphone"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Découvrez votre nouvelle tablette"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Découvrez votre nouvel appareil"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Cette fonctionnalité n\'est pas disponible sur cet appareil"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"État de l\'enregistrement IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Enregistré"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Non enregistré"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 620be9a..76ca54a 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s quere acceder ás túas mensaxes. Queres conceder acceso a %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitude de acceso á SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> quere acceder á túa tarxeta SIM. Ao outorgar acceso á tarxeta SIM desactivarase a conectividade de datos no teu dispositivo durante a conexión. Outorgar acceso a <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visible como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para os demais dispositivos"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para outros dispositivos"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Os teus dispositivos"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Sincronizar dispositivo novo"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data e hora"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Seguinte"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Omitir a impresión dixital?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Configurar a impresión dixital só leva un ou dous minutos, pero tamén podes facelo más tarde en Configuración."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Omitir o bloqueo de pantalla?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"As funcións de protección do dispositivo non se activarán. Non poderás evitar que outros usuarios utilicen a tableta en caso de perda, roubo ou restablecemento"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"As funcións de protección do dispositivo non se activarán. Non poderás evitar que outros usuarios o utilicen en caso de perda, roubo ou restablecemento."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"As funcións de protección do dispositivo non se activarán. Non poderás evitar que outros usuarios utilicen este teléfono en caso de perda, roubo ou restablecemento."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Engadiches o número máximo de impresións dixitais"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Non se poden engadir máis impresións dixitais"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Eliminar as impresións dixitais?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Quitar \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\""</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Queres eliminar esta impresión dixital?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Non poderás utilizar as túas impresións dixitais para desbloquear o teléfono, autorizar compras nin iniciar sesión en aplicacións con elas"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Non poderás utilizar as túas impresións dixitais para desbloquear o teu perfil de traballo, autorizar compras nin iniciar sesión en aplicacións de traballo"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Si, eliminar"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protexe a tableta"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protexe o dispositivo"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protexe o teu teléfono"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Configura un bloqueo da pantalla alternativo para conseguir unha maior seguranza."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Configura un bloqueo de pantalla alternativo para conseguir unha maior seguranza."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activa as funcións de protección da tableta para evitar que outras persoas utilicen este dispositivo sen o teu permiso. Selecciona o bloqueo da pantalla que queiras utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activa as funcións de protección do dispositivo para evitar que outras persoas utilicen este dispositivo sen o teu permiso. Selecciona o bloqueo da pantalla que queiras utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activa as funcións de protección do teléfono para evitar que outras persoas utilicen este teléfono sen o teu permiso. Selecciona o bloqueo da pantalla que queiras utilizar."</string>
@@ -497,37 +502,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Queres eliminar a protección do dispositivo?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Queres eliminar a protección do perfil?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"As funcións de protección do dispositivo non funcionarán sen o teu padrón."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"As funcións de protección do dispositivo non funcionarán sen o teu padrón.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"As funcións de protección do dispositivo non funcionarán sen o padrón.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>As túas impresións dixitais gardadas tamén se eliminarán deste dispositivo e non poderás desbloquear o teu teléfono, autorizar compras nin iniciar sesión nas aplicacións con elas."</string>
+</xliff:g>As túas impresións dixitais gardadas tamén se quitarán deste dispositivo e non poderás desbloquear o teu teléfono, autorizar compras nin iniciar sesión nas aplicacións con elas."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"As funcións de protección do dispositivo non funcionarán sen o teu PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"As funcións de protección do dispositivo non funcionarán sen o teu PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"As funcións de protección do dispositivo non funcionarán sen o PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>As túas impresións dixitais gardadas tamén se eliminarán deste dispositivo e non poderás desbloquear o teu teléfono, autorizar compras nin iniciar sesión nas aplicacións con elas."</string>
+</xliff:g>As túas impresións dixitais gardadas tamén se quitarán deste dispositivo e non poderás desbloquear o teu teléfono, autorizar compras nin iniciar sesión nas aplicacións con elas."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"As funcións de protección do dispositivo non funcionarán sen o contrasinal."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"As funcións de protección do dispositivo non funcionarán sen o contrasinal.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"As funcións de protección do dispositivo non funcionarán sen o contrasinal.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>As túas impresións dixitais gardadas tamén se eliminarán deste dispositivo e non poderás desbloquear o teu teléfono, autorizar compras nin iniciar sesión nas aplicacións con elas."</string>
+</xliff:g>As túas impresións dixitais gardadas tamén se quitarán deste dispositivo e non poderás desbloquear o teu teléfono, autorizar compras nin iniciar sesión nas aplicacións con elas."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"As funcións de protección do dispositivo non funcionarán sen o teu bloqueo da pantalla."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"As funcións de protección do dispositivo non funcionarán sen o teu bloqueo da pantalla.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"As funcións de protección do dispositivo non funcionarán sen o bloqueo da pantalla.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>As túas impresións dixitais gardadas tamén se eliminarán deste dispositivo e non poderás desbloquear o teu teléfono, autorizar compras nin iniciar sesión nas aplicacións con elas."</string>
+</xliff:g>As túas impresións dixitais gardadas tamén se quitarán deste dispositivo e non poderás desbloquear o teu teléfono, autorizar compras nin iniciar sesión nas aplicacións con elas."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"As funcións de protección do perfil non funcionarán sen o teu padrón."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"As funcións de protección do perfil non funcionarán sen o teu padrón.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"As funcións de protección do perfil non funcionarán sen o padrón.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>As túas impresións dixitais gardadas tamén se eliminarán deste perfil e non poderás desbloquealo, autorizar compras nin iniciar sesión nas aplicacións con elas."</string>
+</xliff:g>As túas impresións dixitais gardadas tamén se quitarán deste perfil e non poderás desbloquealo, autorizar compras nin iniciar sesión nas aplicacións con elas."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"As funcións de protección do perfil non funcionarán sen o teu PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"As funcións de protección do perfil non funcionarán sen o teu PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"As funcións de protección do perfil non funcionarán sen o PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>As túas impresións dixitais gardadas tamén se eliminarán deste perfil e non poderás desbloquealo, autorizar compras nin iniciar sesión nas aplicacións con elas."</string>
+</xliff:g>As túas impresións dixitais gardadas tamén se quitarán deste perfil e non poderás desbloquealo, autorizar compras nin iniciar sesión nas aplicacións con elas."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"As funcións de protección do perfil non funcionarán sen o teu contrasinal."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"As funcións de protección do perfil non funcionarán sen o teu contrasinal.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"As funcións de protección do perfil non funcionarán sen o contrasinal.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>As túas impresións dixitais gardadas tamén se eliminarán deste perfil e non poderás desbloquealo, autorizar compras nin iniciar sesión nas aplicacións con elas."</string>
+</xliff:g>As túas impresións dixitais gardadas tamén se quitarán deste perfil e non poderás desbloquealo, autorizar compras nin iniciar sesión nas aplicacións con elas."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"As funcións de protección do perfil non funcionarán sen o teu bloqueo da pantalla."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"As funcións de protección do perfil non funcionarán sen o teu bloqueo da pantalla.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"As funcións de protección do perfil non funcionarán sen o bloqueo da pantalla.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>As túas impresións dixitais gardadas tamén se eliminarán deste perfil e non poderás desbloquealo, autorizar compras nin iniciar sesión nas aplicacións con elas."</string>
+</xliff:g>As túas impresións dixitais gardadas tamén se quitarán deste perfil e non poderás desbloquealo, autorizar compras nin iniciar sesión nas aplicacións con elas."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Si, eliminar"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Mudar padrón desbloq."</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambiar PIN desbloq."</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Non se permite unha secuencia de díxitos ascendente, descendente nin repetida"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Aceptar"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancelar"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Borrar"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancelar"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Seguinte"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Configuración completada"</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS dispoñible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS dispoñible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introduce o contrasinal da túa rede"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Rede wifi do operador"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Conectar a través de <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para mellorar a precisión da localización e para outros fins, <xliff:g id="APP_NAME">%1$s</xliff:g> quere activar a exploración de redes, aínda que a wifi estea desactivada.\n\nQueres permitilo para todas as aplicacións que queren buscar redes?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Para desactivar esta función, accede ás opcións avanzadas no menú adicional."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Erro ao conectar á rede"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Borrar"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modificar"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Erro ao esquecer a rede"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Gardar"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Erro ao gardar a rede"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wifi avanzada"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Enderezo MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Enderezo IP"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Información sobre a rede"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Máscara de subrede"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Enderezos IPv6"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Cancelar invitación?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Queres cancelar a invitación para conectar con <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Esquecer este grupo?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Zona wifi portátil"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Zona wifi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Non se está compartindo a conexión a Internet nin contido con outros dispositivos"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Estase compartindo a conexión a Internet da tableta a través da zona wifi"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Estase compartindo a conexión a Internet do teléfono a través de zona wifi"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"A aplicación está compartindo contido. Para compartir a conexión a Internet, desactiva a zona wifi e volve activala"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nome da wifi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Nome da zona wifi"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Activando a zona wifi <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Outros dispositivos poden conectarse á zona wifi <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Contrasinal da wifi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Contrasinal da zona wifi"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda do punto de acceso"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Utiliza a zona wifi para crear unha rede wifi para os teus outros dispositivos. A zona wifi fornece Internet a través da túa conexión de datos móbiles. É posible que se apliquen tarifas de datos móbiles adicionais."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"As aplicacións poden crear unha zona wifi para compartir contido cos dispositivos que están cerca."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Actualizar enderezo de urxencia"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"Enderezo que utilizan os servizos de urxencia como a túa localización se chamas ao 911 a través da wifi"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"Enderezo que utilizan os servizos de urxencia como a túa localización se fas unha chamada de urxencia a través da wifi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Son"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Buscar"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Xestiona a configuración e o historial das buscas"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Non hai resultados"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Borrar historial"</string>
     <string name="display_settings" msgid="7965901687241669598">"Pantalla"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Xirar a pantalla automaticamente"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Cores vivas"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Restaurando a configuración do APN."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Restablecer aos valores predeterminados"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Completouse o restablecemento da configuración de APN predeterminada."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Restablecer"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Restablecer configuración de rede"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Opcións de restablecemento"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Pódense restablecer a rede, as aplicacións ou o dispositivo"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Restablecer wifi, rede móbil e Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Con esta selección, restableceranse todas as opcións de configuración da rede, entre elas as referentes a:\n\n"<li>"Wifi"</li>\n<li>"Datos móbiles"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Restablecer configuración"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Queres restablecer toda a configuración da rede? Esta acción non se pode desfacer."</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Restablecer?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"O restablecemento de rede non está dispoñible para este usuario"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Restableceuse a configuración da rede"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Restablecemento dos datos de fábrica"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other">Restableceranse <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> contas</item>
-      <item quantity="one">Restablecerase 1 conta</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Restableceranse o almacenamento interno e todos os datos"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Borrar todos os datos (restablecemento de fábrica)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Esta acción borrará todos os datos do "<b>"almacenamento interno"</b>" da túa tableta, como:\n\n"<li>"A túa conta de Google"</li>\n<li>"Os datos e a configuracións do sistema e das aplicacións"</li>\n<li>"Aplicacións descargadas"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Esta acción borrará todos os datos do "<b>"almacenamento interno"</b>" do teléfono, como:\n\n"<li>"A túa conta de Google"</li>\n<li>"Datos e configuración do sistema e das aplicacións"</li>\n<li>"Aplicacións descargadas"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualmente tes sesión iniciada nas seguintes contas:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Información de seguranza"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Non tes conexión de datos. Para ver esta información agora, accede a %s desde calquera ordenador conectado a Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Cargando..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Escolle o teu contrasinal"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Define un bloqueo de pantalla"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Por cuestións de seguranza, configura un contrasinal"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Impresión dixital: contrasinal"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Selecciona o teu padrón"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Impresión dixital: padrón"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Selecciona o teu PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Por cuestións de seguranza, configura un PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Impresión dixital: PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirma o teu contrasinal"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Volve introducir o teu contrasinal"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirma o teu padrón"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirma o teu PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Volve introducir o teu PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Os contrasinais non coinciden"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Os PIN non coinciden"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Selección de desbloqueo"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Utiliza o padrón do traballo para continuar"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Introduce o PIN do traballo para continuar"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Introduce o contrasinal do traballo para continuar"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Utiliza o padrón do dispositivo para continuar. Pídese ao reinicialo."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Introduce o PIN do dispositivo para continuar. Pídese ao reinicialo."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Introduce o contrasinal do dispositivo para continuar. Pídese ao reinicialo."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Utiliza o padrón do traballo para continuar. Pídese ao reiniciar o dispositivo."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Introduce o PIN do traballo para continuar. Pídese ao reiniciar o dispositivo."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Introduce o contrasinal do traballo para continuar. Pídese ao reiniciar o dispositivo."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Utiliza o padrón do dispositivo para conseguir unha maior seguranza"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Introduce o PIN do dispositivo para conseguir unha maior seguranza"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Introduce o contrasinal do dispositivo para conseguir unha maior seguranza"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Utiliza o padrón do traballo para conseguir unha maior seguranza"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Introduce o PIN do traballo para conseguir unha maior seguranza"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Introduce o contrasinal do traballo para conseguir unha maior seguranza"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Restableceuse a configuración de fábrica do teléfono. Introduce o padrón anterior."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Restableceuse a configuración de fábrica do teléfono. Introduce o PIN anterior."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Restableceuse a configuración de fábrica do teléfono. Introduce o contrasinal anterior."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verifica o padrón"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verifica o PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verifica o contrasinal"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN incorrecto"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Contrasinal incorrecto"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Padrón incorrecto"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Queres crear o widget e permitir o acceso?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Despois de crear o widget, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> pode acceder a todos os datos que mostra."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Permitir sempre a <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> crear widgets e acceder aos seus datos"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> m <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> m <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Estatísticas de uso"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Estatísticas de uso"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Ordenar por:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Lectores de pantalla, pantalla, controis de interacción"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Configuración de visualización"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Podes personalizar este dispositivo segundo as túas necesidades. Podes cambiar estas funcións de accesibilidade máis tarde en Configuración."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Incrementar o tamaño do tipo de letra"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Cambiar tamaño do tipo de letra"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Lectores de pantalla"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio e texto na pantalla"</string>
     <string name="display_category_title" msgid="685461049938269166">"Pantalla"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Para achegar o zoom"</b>", toca a pantalla 3 veces rapidamente.\n"<ul><li>"Arrastra 2 ou máis dedos para desprazarte"</li>\n<li>"Belisca con 2 ou máis dedos para axustar o zoom"</li></ul>\n\n<b>"Para achegar o zoom temporalmente"</b>", toca a pantalla 3 veces rapidamente e mantén o dedo sobre a pantalla despois do terceiro toque.\n"<ul><li>"Arrastra o dedo para moverte pola pantalla"</li>\n<li>"Levántao para afastar o zoom"</li></ul>\n\n"Non podes achegar o zoom sobre o teclado nin sobre a barra de navegación."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Cando a ampliación estea activada, utiliza o botón Accesibilidade da parte inferior da pantalla para ampliar rapidamente o contido.\n\n"<b>"Para achegar o zoom"</b>", toca o botón Accesibilidade e, a continuación, toca en calquera parte da pantalla.\n"<ul><li>"Arrastra 2 ou máis dedos para desprazarte"</li>\n<li>"Belisca con 2 ou máis dedos para axustar o zoom"</li></ul>\n\n<b>"Para achegar o zoom temporalmente"</b>", toca o botón Accesibilidade e, a continuación, mantén tocada calquera parte da pantalla.\n"<ul><li>"Arrastra o dedo para moverte pola pantalla"</li>\n<li>"Levántao para afastar o zoom"</li></ul>\n\n"Non podes achegar o zoom sobre o teclado nin sobre a barra de navegación."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"O botón Accesibilidade está configurado en <xliff:g id="SERVICE">%1$s</xliff:g>. Para utilizar a ampliación, mantén tocado o botón Accesibilidade e, a continuación, selecciona a ampliación."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Atallo de accesibilidade"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Atallo mediante as teclas de volume"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Servizo de atallo"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Permitir desde a pantalla bloqueo"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Cando o atallo está activado, podes premer os dous botóns de volume durante 3 segundos para iniciar unha función de accesibilidade."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Cando o atallo está activado, podes premer as dúas teclas de volume durante 3 segundos para iniciar unha función de accesibilidade."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Texto de alto contraste"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Actualizar aumento automaticamente"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Actualizar aumento pantalla en transicións de apps"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Pode afectar ao rendemento"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clic cando o punteiro pare"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Retardo antes de facer clic"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ACTIVADO"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESACTIVADO"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Mostrar en Configuración rápida"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"seleccionáronse <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Seleccionar todo"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Xestionar plans de datos"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de datos"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Uso datos da aplicación"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"A contabilidade dos datos do operador pode ser diferente á do teu dispositivo."</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Redes de telefonía móbil"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Redes wifi de pago por consumo"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Para seleccionar redes de pago por consumo, activa a wifi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automaticamente"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"De pago por consumo"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Con tarifa plana"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"A contabilidade dos datos do operador pode ser diferente á do teu dispositivo."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Chamada de urxencia"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Volver á chamada"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Xestor de chamadas"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Difusións de urxencia"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Alertas de urxencia"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Operadores de rede"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Nomes dos puntos de acceso"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Modo mellorado de LTE 4G"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"SIM preferida para"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Preguntar sempre"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"É necesario seleccionar unha opción"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Selección da SIM"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Configuración"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">Mostrar %d elementos ocultos</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificacións de aplicacións"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoría da notificación"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importancia"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Deixa que a aplicación decida"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Permitir son"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Non mostra nunca as notificacións"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Nin son nin interrupción visual"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Ningún son"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Emitir son"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Emitir son e aparecer na pantalla"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Mostrar na pantalla"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Baixa"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Media"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Alta"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urxente"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Permitir son"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Non emitir son, vibrar nin mostrar estas notificacións na pantalla actual."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Permitir interrupcións"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Permite que a aplicación emita son, vibre e mostre notificacións na pantalla"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Importancia baixa"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Importancia media"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Importancia alta"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"imaxe superposta, imaxe en imaxe"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Pantalla superposta"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Permitir pantalla superposta"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Permite que esta aplicación cree unha ventá de pantalla superposta mentres que a aplicación está aberta ou despois de saír dela (por exemplo, para continuar visualizando un vídeo). Esta ventá móstrase sobre outras aplicacións que estás utilizando."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Permite que esta aplicación cree unha ventá de pantalla superposta mentres estea aberta ou despois de saír dela (por exemplo, para continuar visualizando un vídeo). A ventá móstrase sobre as demais aplicacións que esteas utilizando."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acceso en modo Non molestar"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ningunha aplicación instalada solicitou acceso en modo Non molestar"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicacións..."</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transferir ficheiros"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transferir fotos (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Usar o dispositivo como MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Proxección de SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Comprobación de uso en segundo plano"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Acceso completo en segundo plano"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Usar o texto da pantalla"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Define a programación da Luz nocturna"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Ton ámbar na pantalla para coller o sono"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"A luz nocturna está activada"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"A pantalla ten un ton ámbar que che pode axudar a coller o sono."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Suxestións"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utiliza cores de visualización máis frías"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar o cambio de cor, apaga a pantalla"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Para aplicar o cambio do monitor de telefonía, reinicia o dispositivo"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Cámara HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Para aplicar o cambio da cámara HAL HDR+, reinicia o dispositivo"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor láser da cámara"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Actualizacións automáticas do sistema"</string>
     <string name="usage" msgid="2977875522080448986">"Uso"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Uso de datos móbiles"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Aviso de datos"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Definir límite de datos"</string>
     <string name="data_limit" msgid="1885406964934590552">"Límite de datos"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"Datos usados no período do <xliff:g id="ID_2">%2$s</xliff:g>: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"Datos utilizados: <xliff:g id="ID_1">%1$s</xliff:g> (<xliff:g id="ID_2">%2$s</xliff:g>)"</string>
     <string name="configure" msgid="1029654422228677273">"Configurar"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Outras aplicacións incluídas no uso"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Limpar e converter"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Restablecer o límite de velocidade de ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Restableceuse o límite de velocidade de ShortcutManager"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlar notificacións pantalla bloqueo"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Información de control sobre a pantalla de 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="8483187649355540109">"Asistencia e consellos"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Ningunha aplicación instalada solicitou acceso ás mensaxes premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"É posible que teñas que pagar polas mensaxes premium, cuxos custos se engadirán ás facturas do teu operador. Se activas o permiso para unha aplicación, poderás enviar mensaxes premium a través desa aplicación."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Acceso ás SMS premium"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Non é visible para outros dispositivos"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Desactivado"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Conectado a: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Conectado a varios dispositivos"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Modo de demostración da IU do sistema"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Aplicacións instantáneas"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Abre as ligazóns en aplicacións, mesmo se non están instaladas"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Aplicacións instantáneas"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Reconto de aplicacións instantáneas"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Preferencias de Aplicacións Instantáneas"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplicacións instaladas"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Agora o xestor de almacenamento administra o teu espazo"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Contas para <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Activouse a VPN sempre activada no teu perfil persoal"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Activouse a VPN sempre activada no teu perfil de traballo"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Configurouse o proxy HTTP global"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Credenciais de confianza"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Credenciais de confianza"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Credencias de confianza no teu perfil persoal"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Credencias de confianza no teu perfil de traballo"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Mínimo de <xliff:g id="COUNT_1">%d</xliff:g> certificados de CA</item>
       <item quantity="one">Mínimo de <xliff:g id="COUNT_0">%d</xliff:g> certificado de CA</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Información de aprovisionamento do operador"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aprovisionamento do operador do activador"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Cales son as novidades fascinantes?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Consulta as 5 funcións principais"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Realiza unha visita guiada polo teu novo teléfono"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Realiza unha visita guiada pola túa nova tableta"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Realiza unha visita guiada polo teu novo dispositivo"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Esta función non está dispoñible neste dispositivo"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Estado de rexistro de IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Rexistrado"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Non rexistrado"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 13f1349..83322f4 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s તમારા સંદેશા અ‍ૅક્સેસ કરવા માંગે છે. %2$s ને અ‍ૅક્સેસ આપીએ?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"સિમ ઍક્સેસ વિનંતી"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> તમારા સિમ કાર્ડને અ‍ૅક્સેસ કરવા માગે છે. સિમ કાર્ડની અ‍ૅક્સેસને મંજૂરી આપવું કનેક્શનના સમયગાળા માટે તમારા ઉપકરણ પર ડેટા કનેક્ટિવિટીને અક્ષમ કરશે. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> ને અ‍ૅક્સેસ આપો"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"અન્ય ઉપકરણોને \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' તરીકે દેખાય છે"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"તે અન્ય ઉપકરણોને \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' તરીકે દેખાય છે"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"તમારા ઉપકરણો"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"નવા ઉપકરણ સાથે જોડાણ બનાવો"</string>
     <string name="date_and_time" msgid="9062980487860757694">"તારીખ અને સમય"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"આગલી"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"ફિંગરપ્રિન્ટ છોડી દઈએ?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"ફિંગરપ્રિન્ટ સેટઅપ કરવા માત્ર એકથી બે મિનિટ જરૂરી છે. જો તમે આ છોડી દો, તો તમે સેટિંગ્સમાં પછીથી તમારી ફિંગરપ્રિન્ટ ઉમેરી શકો છો."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"સ્ક્રીન લૉક છોડી દઈએ?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"ઉપકરણની સુરક્ષાની સુવિધાઓ ચાલુ કરવામાં નહીં આવે. જો આ ટૅબ્લેટ ખોવાઈ જાય, ચોરાઈ જાય કે રીસેટ કરવામાં આવે, તો તમે અન્ય લોકોને તેનો ઉપયોગ કરતા અટકાવી નહીં શકો."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"ઉપકરણની સુરક્ષાની સુવિધાઓ ચાલુ કરવામાં નહીં આવે. જો આ ઉપકરણ ખોવાઈ જાય, ચોરાઈ જાય કે રીસેટ કરવામાં આવે, તો તમે અન્ય લોકોને તેનો ઉપયોગ કરતા અટકાવી નહીં શકો."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"ઉપકરણની સુરક્ષાની સુવિધાઓ ચાલુ કરવામાં નહીં આવે. જો આ ફોન ખોવાઈ જાય, ચોરાઈ જાય કે રીસેટ કરવામાં આવે, તો તમે અન્ય લોકોને તેનો ઉપયોગ કરતા અટકાવી નહીં શકો."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"તમે મહત્તમ ફિંગરપ્રિન્ટ્સ ઉમેર્યા છે"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"વધુ ફિંગરપ્રિન્ટ્સ ઉમેરી શકતાં નથી"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"તમામ ફિંગરપ્રિન્ટ્સ દૂર કરીએ?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'ને દૂર કરો"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"શું તમે આ ફિંગરપ્રિન્ટ કાઢી નાખવા માગો છો?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરીને તમે તમારો ફોન અનલૉક, ખરીદીઓ અધિકૃત અથવા તેમના વડે ઍપ્લિકેશનો પર સાઇન ઇન કરવામાં સમર્થ હશો નહીં"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરીને તમે તમારી કાર્યાલયની પ્રોફાઇલ અનલૉક, ખરીદીઓ અધિકૃત અથવા કાર્ય ઍપ્લિકેશનો પર સાઇન ઇન કરવામાં સમર્થ હશો નહીં"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"હા, દૂર કરો"</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"વધારાની સુરક્ષા માટે, એક બૅકઅપ સ્ક્રીન લૉક સેટ કરો."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"વધારાની સુરક્ષા માટે, એક બૅકઅપ સ્ક્રીન લૉક સેટ કરો."</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>
@@ -497,37 +502,37 @@
     <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_fingerprint" msgid="8212242533942400457">"તમારી પૅટર્ન વગર ઉપકરણ સુરક્ષા સુવિધાઓ કામ કરશે નહીં.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"ઉપકરણની સુરક્ષા સુવિધાઓ તમારી પૅટર્ન વગર કાર્ય કરશે નહીં.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>આ ઉપકરણમાંથી તમારી સાચવેલ ફિંગરપ્રિન્ટ્સ પણ દૂર કરવામાં આવશે અને તમે તમારા ફોનને અનલૉક કરવા, ખરીદીઓ અધિકૃત કરવા અથવા તેમની સાથે એપ્લિકેશન્સ પર સાઇન ઇન કરવામાં સમર્થ થઇ શકશો નહીં.”"</string>
+</xliff:g>આ ઉપકરણમાંથી તમારી સાચવેલ રેફરન્સ ફાઇલને પણ દૂર કરવામાં આવશે અને તમે તમારા ફોનને અનલૉક કરી શકશો નહીં, ખરીદીઓને અધિકૃત કરી શકશો નહીં અથવા તેના વડે ઍપ્લિકેશનો પર સાઇન ઇન કરી શકશો નહીં."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"તમારા પિન વગર ઉપકરણ સુરક્ષા સુવિધાઓ કામ કરશે નહીં."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"તમારા પિન વગર ઉપકરણ સુરક્ષા સુવિધાઓ કામ કરશે નહીં.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"ઉપકરણની સુરક્ષા સુવિધાઓ તમારા પિન વગર કાર્ય કરશે નહીં.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>આ ઉપકરણમાંથી તમારી સાચવેલ ફિંગરપ્રિન્ટ પણ દૂર કરવામાં આવશે અને તમે તમારા ફોનને અનલૉક કરવા, ખરીદીઓ અધિકૃત કરવા અથવા તેમની સાથે એપ્લિકેશન્સ પર સાઇન ઇન કરવામાં સમર્થ થઇ શકશો નહીં.”"</string>
+</xliff:g>આ ઉપકરણમાંથી તમારી સાચવેલ રેફરન્સ ફાઇલને પણ દૂર કરવામાં આવશે અને તમે તમારા ફોનને અનલૉક કરી શકશો નહીં, ખરીદીઓને અધિકૃત કરી શકશો નહીં અથવા તેના વડે ઍપ્લિકેશનો પર સાઇન ઇન કરી શકશો નહીં."</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"ઉપકરણની સુરક્ષા સુવિધાઓ તમારા પાસવર્ડ વગર કાર્ય કરશે નહીં.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>આ ઉપકરણમાંથી તમારી સાચવેલ ફિંગરપ્રિન્ટ્સ પણ દૂર કરવામાં આવશે અને તમે તમારા ફોનને અનલૉક કરવા, ખરીદીઓ અધિકૃત કરવા અથવા તેમની સાથે ઍપ્લિકેશનો પર સાઇન ઇન કરવામાં સમર્થ થઇ શકશો નહીં.”"</string>
+</xliff:g>આ ઉપકરણમાંથી તમારી સાચવેલ રેફરન્સ ફાઇલને પણ દૂર કરવામાં આવશે અને તમે તમારા ફોનને અનલૉક કરી શકશો નહીં, ખરીદીઓને અધિકૃત કરી શકશો નહીં અથવા તેના વડે ઍપ્લિકેશનો પર સાઇન ઇન કરી શકશો નહીં."</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"ઉપકરણની સુરક્ષા સુવિધાઓ તમારા સ્ક્રીન લૉક વગર કાર્ય કરશે નહીં.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>આ ઉપકરણમાંથી તમારી સાચવેલ ફિંગરપ્રિન્ટ્સ પણ દૂર કરવામાં આવશે અને તમે તમારા ફોનને અનલૉક કરવા, ખરીદીઓ અધિકૃત કરવા અથવા તેમની સાથે ઍપ્લિકેશનો પર સાઇન ઇન કરવામાં સમર્થ થઇ શકશો નહીં.”"</string>
+</xliff:g>આ ઉપકરણમાંથી તમારી સાચવેલ રેફરન્સ ફાઇલને પણ દૂર કરવામાં આવશે અને તમે તમારા ફોનને અનલૉક કરી શકશો નહીં, ખરીદીઓને અધિકૃત કરી શકશો નહીં અથવા તેના વડે ઍપ્લિકેશનો પર સાઇન ઇન કરી શકશો નહીં."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"તમારી પૅટર્ન વગર પ્રોફાઇલ સુરક્ષા સુવિધાઓ કામ કરશે નહીં."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"તમારી પૅટર્ન વગર પ્રોફાઇલ સુરક્ષા સુવિધાઓ કામ કરશે નહીં.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"પ્રોફાઇલની સુરક્ષા સુવિધાઓ તમારી પૅટર્ન વગર કાર્ય કરશે નહીં.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>આ પ્રોફાઇલમાંથી તમારી સાચવેલ ફિંગરપ્રિન્ટ પણ દૂર કરવામાં આવશે અને તમે તમારી પ્રોફાઇલને અનલૉક કરવા, ખરીદીઓ અધિકૃત કરવા અથવા તેમની સાથે ઍપ્લિકેશનો પર સાઇન ઇન કરવામાં સમર્થ થઇ શકશો નહીં.”"</string>
+</xliff:g>આ પ્રોફાઇલમાંથી તમારી સાચવેલ રેફરન્સ ફાઇલને પણ દૂર કરવામાં આવશે અને તમે તમારી પ્રોફાઇલને અનલૉક કરી શકશો નહીં, ખરીદીઓને અધિકૃત કરી શકશો નહીં અથવા તેના વડે ઍપ્લિકેશનો પર સાઇન ઇન કરી શકશો નહીં."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"તમારા પિન વગર પ્રોફાઇલ સુરક્ષા સુવિધાઓ કામ કરશે નહીં."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"તમારા પિન વગર પ્રોફાઇલ સુરક્ષા સુવિધાઓ કામ કરશે નહીં.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"પ્રોફાઇલની સુરક્ષા સુવિધાઓ તમારા પિન વગર કાર્ય કરશે નહીં.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>આ પ્રોફાઇલમાંથી તમારી સાચવેલ ફિંગરપ્રિન્ટ પણ દૂર કરવામાં આવશે અને તમે તમારી પ્રોફાઇલને અનલૉક કરવા, ખરીદીઓ અધિકૃત કરવા અથવા તેમની સાથે ઍપ્લિકેશનો પર સાઇન ઇન કરવામાં સમર્થ થઇ શકશો નહીં.”"</string>
+</xliff:g>આ પ્રોફાઇલમાંથી તમારી સાચવેલ રેફરન્સ ફાઇલ પણ દૂર કરવામાં આવશે અને તમે તમારી પ્રોફાઇલને અનલૉક કરી શકશો નહીં, ખરીદીઓને અધિકૃત કરી શકશો નહીં અથવા તેના વડે ઍપ્લિકેશનો પર સાઇન ઇન કરી શકશો નહીં."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"તમારા પાસવર્ડ વગર પ્રોફાઇલ સુરક્ષા સુવિધાઓ કામ કરશે નહીં."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"તમારા પાસવર્ડ વગર પ્રોફાઇલ સુરક્ષા સુવિધાઓ કામ કરશે નહીં.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"પ્રોફાઇલની સુરક્ષા સુવિધાઓ તમારા પાસવર્ડ વગર કાર્ય કરશે નહીં.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>આ પ્રોફાઇલમાંથી તમારી સાચવેલ ફિંગરપ્રિન્ટ્સ પણ દૂર કરવામાં આવશે અને તમે તમારી પ્રોફાઇલને અનલૉક કરવા, ખરીદીઓ અધિકૃત કરવા અથવા તેમની સાથે ઍપ્લિકેશનો પર સાઇન ઇન કરવામાં સમર્થ થઇ શકશો નહીં.”"</string>
+</xliff:g>આ પ્રોફાઇલમાંથી તમારી સાચવેલ રેફરન્સ ફાઇલને પણ દૂર કરવામાં આવશે અને તમે તમારી પ્રોફાઇલને અનલૉક કરી શકશો નહીં, ખરીદીઓને અધિકૃત કરી શકશો નહીં અથવા તેના વડે ઍપ્લિકેશનો પર સાઇન ઇન કરી શકશો નહીં."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"તમારા સ્ક્રીન લૉક વગર પ્રોફાઇલ સુરક્ષા સુવિધાઓ કામ કરશે નહીં."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"તમારા સ્ક્રીન લૉક વગર પ્રોફાઇલ સુરક્ષા સુવિધાઓ કામ કરશે નહીં.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"પ્રોફાઇલ સુરક્ષા સુવિધાઓ તમારા સ્ક્રીન લૉક વગર કાર્ય કરશે નહીં.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>આ પ્રોફાઇલમાંથી તમારી સાચવેલ ફિંગરપ્રિન્ટ્સ પણ દૂર કરવામાં આવશે અને તમે તમારી પ્રોફાઇલને અનલૉક કરવા, ખરીદીઓ અધિકૃત કરવા અથવા તેમની સાથે ઍપ્લિકેશનો પર સાઇન ઇન કરવામાં સમર્થ થઇ શકશો નહીં.”"</string>
+</xliff:g>આ પ્રોફાઇલમાંથી તમારી સાચવેલ રેફરન્સ ફાઇલને પણ દૂર કરવામાં આવશે અને તમે તમારી પ્રોફાઇલને અનલૉક કરી શકશો નહીં, ખરીદીઓને અધિકૃત કરી શકશો નહીં અથવા તેના વડે ઍપ્લિકેશનો પર સાઇન ઇન કરી શકશો નહીં."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"હા, દૂર કરો"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"અનલૉક પૅટર્ન બદલો"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"અનલૉક પિન બદલો"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"અંકોના ચઢતા ક્રમની, ઉતરતા ક્રમની અથવા પુનરાવર્તિત અનુક્રમની મંજૂરી નથી"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ઓકે"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"રદ કરો"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"સાફ કરો"</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>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ઉપલબ્ધ"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ઉપલબ્ધ)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"તમારો નેટવર્ક પાસવર્ડ દાખલ કરો"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"કૅરિઅર વાઇ-ફાઇ નેટવર્ક"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> દ્વારા કનેક્ટ કરો"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"સ્થાન સચોટતા બહેતર બનાવવા માટે અને અન્ય હેતુઓ માટે, વાઇ-ફાઇ બંધ હોય ત્યારે પણ <xliff:g id="APP_NAME">%1$s</xliff:g> નેટવર્ક સ્કેનિંગ ચાલુ કરવા માંગે છે.\n\nસ્કેન કરવા માંગે છે તે બધી ઍપ્લિકેશનો માટે આને મંજૂરી આપીએ?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"આ બંધ કરવા માટે, ઓવરફ્લો મેનૂમાં વિગતવાર પર જાઓ."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"મંજૂરી આપો"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"કનેક્ટ કરો"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"નેટવર્ક સાથે કનેક્ટ કરવામાં નિષ્ફળ થયાં"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"ભૂલી જાઓ"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"ફેરફાર કરો"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"નેટવર્ક ભૂલવામાં નિષ્ફળ થયાં"</string>
     <string name="wifi_save" msgid="3331121567988522826">"સાચવો"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"નેટવર્ક સાચવવામાં નિષ્ફળ થયાં."</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"વિગતવાર વાઇ-ફાઇ"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC સરનામું"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP સરનામું"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"નેટવર્કની માહિતી"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"સબનેટ માસ્ક"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 સરનામા"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"આમંત્રણ રદ કરીએ?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"શું તમે <xliff:g id="PEER_NAME">%1$s</xliff:g> થી કનેક્ટ કરવાનું આમંત્રણ રદ કરવા માંગો છો?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"આ જૂથ ભૂલી જઈએ?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"પોર્ટેબલ વાઇ-ફાઇ હૉટસ્પૉટ"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"વાઇ-ફાઇ હૉટસ્પૉટ"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"અન્ય ઉપકરણો સાથે ઇન્ટરનેટ અથવા કન્ટેન્ટ શેર કરી રહ્યાં નથી"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"આ ટૅબ્લેટનું ઇન્ટરનેટ કનેક્શન હૉટસ્પૉટ દ્વારા શેર થાય છે"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"આ ફોનનું ઇન્ટરનેટ કનેક્શન હૉટસ્પૉટ દ્વારા શેર થાય છે"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"ઍપ્લિકેશન કન્ટેન્ટ શેર કરી રહી છે. ઇન્ટરનેટ કનેક્શન શેર કરવા માટે હૉટસ્પૉટને બંધ કરો, પછી ચાલુ કરો"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fiનું નામ"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"હૉટસ્પૉટનું નામ"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ચાલુ કરીએ છીએ..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> સાથે અન્ય ઉપકરણો પણ કનેક્ટ કરી શકાય છે"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"વાઇ-ફાઇ પાસવર્ડ"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"હૉટસ્પૉટનો પાસવર્ડ"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP બૅન્ડ"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"તમારા અન્ય ઉપકરણો માટે વાઇ-ફાઇ નેટવર્ક બનાવવા હૉટસ્પૉટનો ઉપયોગ કરો. હૉટસ્પૉટ તમારા મોબાઇલ ડેટા કનેક્શનનો ઉપયોગ કરીને ઇન્ટરનેટ પ્રદાન કરે છે. વધારાના મોબાઇલ ડેટા શુલ્ક લાગુ થઈ શકે છે."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ઍપ્લિકેશનો નજીકના ઉપકરણો સાથે કન્ટેન્ટ શેર કરવા માટે હૉટસ્પૉટ બનાવી શકે છે."</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"જ્યારે વાઇ-ફાઇ કૉલિંગ ચાલુ હોય, ત્યારે તમારી પસંદગી અને કયા સિગ્નલ મજબૂત છે તેને આધારે, તમારો ફોન વાઇ-ફાઇ અથવા તમારા કૅરીઅરના નેટવર્ક મારફતે કૉલ્સને રુટ કરી શકે છે. આ સુવિધાને ચાલુ કરતાં પહેલાં, ફી અને અન્ય વિગતો માટે તમારા કૅરિઅર સાથે તપાસ કરો."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"કટોકટીના સરનામાંને અપડેટ કરો"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"જો તમે WiFi નો ઉપયોગ કરીને 911 કૉલ કરો તો કટોકટીની સેવાઓ દ્વારા તમારા સ્થાનનો સરનામા તરીકે ઉપયોગ કરવામાં આવે છે"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"જો તમે વાઇ-ફાઇનો ઉપયોગ કરીને કોઈ કટોકટીનો કૉલ કર્યો હોય, તો કટોકટીની સેવાઓ દ્વારા જે સરનામાંનો ઉપયોગ કરાયો હોય તેને તમારા સ્થાન તરીકે ચિહ્નિત કરવામાં આવશે"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ડિસ્પ્લે"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ધ્વનિ"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"વૉલ્યૂમ્સ"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"શોધો"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"શોધ સેટિંગ્સ અને ઇતિહાસ સંચાલિત કરો"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"કોઈ પરિણામ નથી"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"ઇતિહાસ સાફ કરો"</string>
     <string name="display_settings" msgid="7965901687241669598">"ડિસ્પ્લે"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"સ્ક્રીનને આપમેળે ફેરવો"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"આબેહૂબ રંગ"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"ડિફોલ્ટ APN સેટિંગ્સ પુનર્સ્થાપિત કરવી."</string>
     <string name="menu_restore" msgid="8260067415075573273">"ડીફોલ્ટ પર ફરીથી સેટ કરો"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"ડિફોલ્ટ APN સેટિંગ્સ ફરીથી સેટ કરો પૂર્ણ થયું."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"ફરીથી સેટ કરો"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"નેટવર્ક સેટિંગ્સ ફરીથી સેટ કરી"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"રીસેટ માટેના વિકલ્પો"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"નેટવર્ક, ઍપ અથવા ઉપકરણ રીસેટ કરી શકાય છે"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"વાઇ-ફાઇ, મોબાઇલ અને બ્લૂટૂથ રીસેટ કરો"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"આ બધી નેટવર્ક સેટિંગ્સ ફરીથી સેટ કરશે, જેમાં સમાવિષ્ટ છે: \n\n"<li>"Wi‑Fi"</li>\n<li>"મોબાઇલ ડેટા"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"સેટિંગ્સ ફરીથી સેટ કરો"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"બધી નેટવર્ક સેટિંગ્સ ફરીથી સેટ કરીએ? તમે આ ક્રિયાને પૂર્વવત્‌ કરી શકતાં નથી!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"ફરીથી સેટ કરીએ?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"આ વપરાશકર્તા માટે નેટવર્ક ફરીથી સેટ કરો ઉપલબ્ધ નથી"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"નેટવર્ક સેટિંગ્સ ફરીથી સેટ કરવામાં આવી છે"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"ફેક્ટરી ડેટા ફરીથી સેટ કરો"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> એકાઉન્ટ ફરીથી સેટ કરવામાં આવશે</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> એકાઉન્ટ ફરીથી સેટ કરવામાં આવશે</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"આંતરિક સ્ટૉરેજ અને બધો ડેટા રીસેટ કરવામાં આવશે"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"બધો ડેટા ભૂંસી નાખો (ફેક્ટરી રીસેટ)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"આ તમારા ટેબ્લેટનાં "<b>"આંતરિક સંગ્રહ"</b>"માંથી તમામ ડેટા કાઢી નાંખશે, જેમાં આનો સમાવેશ થાય છે:\n\n"<li>"તમારું Google એકાઉન્ટ"</li>\n<li>"સિસ્ટમ અને ઍપ્લિકેશન ડેટા અને સેટિંગ્સ"</li>\n<li>"ડાઉનલોડ કરેલ ઍપ્લિકેશનો"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"આ તમારા ફોનનાં "<b>"આંતરિક સંગ્રહ"</b>"માંથી તમામ ડેટા કાઢી નાંખશે, જેમાં આનો સમાવેશ થાય છે:\n\n"<li>"તમારું Google એકાઉન્ટ"</li>\n<li>"સિસ્ટમ અને ઍપ્લિકેશન ડેટા અને સેટિંગ્સ"</li>\n<li>"ડાઉનલોડ કરેલ ઍપ્લિકેશનો"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"તમે હાલમાં નીચેના એકાઉન્ટ્સમાં સાઇન ઇન થયેલાં છો:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"સલામતી માહિતી"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"તમારી પાસે ડેટા કનેક્શન નથી. આ માહિતી હમણાં જોવા માટે, ઇન્ટરનેટથી કનેક્ટ થયેલા કોઈપણ કમ્પ્યુટરથી %s પર જાઓ."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"લોડ કરી રહ્યું છે..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"તમારો પાસવર્ડ પસંદ કરો"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"સ્ક્રીન લૉક સેટ કરો"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"સુરક્ષા માટે, પાસવર્ડ સેટ કરો"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"ફિંગરપ્રિન્ટ વાપરવા પાસવર્ડ સેટ કરો"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"તમારી પૅટર્ન પસંદ કરો"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ફિંગરપ્રિન્ટ વાપરવા પૅટર્ન સેટ કરો"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"તમારો પિન પસંદ કરો"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"સુરક્ષા માટે, પિન સેટ કરો"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"ફિંગરપ્રિન્ટ વાપરવા પિન સેટ કરો"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"તમારા પાસવર્ડની પુષ્ટિ કરો"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"તમારો પાસવર્ડ ફરી દાખલ કરો"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"તમારા પેટર્નની પુષ્ટિ કરો"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"તમારા પિનની પુષ્ટિ કરો"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"તમારો પિન ફરી દાખલ કરો"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"પાસવર્ડ્સ મેળ ખાતા નથી"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"પિન મેળ ખાતા નથી"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"અનલૉક પસંદગી"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"ચાલુ રાખવા માટે તમારી કાર્ય પેટર્નનો ઉપયોગ કરો"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"ચાલુ રાખવા માટે તમારો કાર્ય પિન દાખલ કરો"</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">"ચાલુ રાખવા માટે તમારો ઉપકરણ પિન દાખલ કરો. ઉપકરણ પુનઃપ્રારંભ થાય તે પછી આવશ્યક છે."</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">"ચાલુ રાખવા માટે તમારો કાર્ય પિન દાખલ કરો. ઉપકરણ પુનઃપ્રારંભ થાય તે પછી આવશ્યક છે."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"ચાલુ રાખવા માટે તમારો કાર્ય પાસવર્ડ દાખલ કરો. ઉપકરણ પુનઃપ્રારંભ થાય તે પછી આવશ્યક છે."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"વધારાની સુરક્ષા માટે, તમારા ઉપકરણની પેટર્નનો ઉપયોગ કરો"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"વધારાની સુરક્ષા માટે, તમારા ઉપકરણનો પિન દાખલ કરો"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"વધારાની સુરક્ષા માટે, તમારા ઉપકરણનો પાસવર્ડ દાખલ કરો"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"વધારાની સુરક્ષા માટે, તમારા કાર્યની પેટર્નનો ઉપયોગ કરો"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"વધારાની સુરક્ષા માટે, તમારા કાર્ય પિન દાખલ કરો"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"વધારાની સુરક્ષા માટે, તમારા કાર્યનો પાસવર્ડ દાખલ કરો"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"ફોન ફેક્ટરી સેટિંગ્સ પર રીસેટ કરવામાં આવ્યો છે. આ ફોનનો ઉપયોગ કરવા માટે તમારી આગલી પૅટર્ન દાખલ કરો."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"ફોન ફેક્ટરી સેટિંગ્સ પર રીસેટ કરવામાં આવ્યો છે. આ ફોનનો ઉપયોગ કરવા માટે તમારી આગલી પિન દાખલ કરો."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"ફોન ફેક્ટરી સેટિંગ્સ પર રીસેટ કરવામાં આવ્યો છે. આ ફોનનો ઉપયોગ કરવા માટે તમારો આગલો પાસવર્ડ દાખલ કરો."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"પૅટર્નની ચકાસણી કરો"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"પિનની ચકાસણી કરો"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"પાસવર્ડની ચકાસણી કરો"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"ખોટો પિન"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"ખોટો પાસવર્ડ"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"ખોટી પૅટર્ન"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"વિજેટ બનાવીએ અને અ‍ૅક્સેસની મંજૂરી આપીએ?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"તમે વિજેટ બનાવી લો તે પછી, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> તે પ્રદર્શિત કરે છે તે તમામ ડેટા અ‍ૅક્સેસ કરી શકે છે."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ને વિજેટ્સ બનાવવા અને તેમનો ડેટા અ‍ૅક્સેસ કરવાની હંમેશા મંજૂરી આપો"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>દિ <xliff:g id="HOURS">%2$d</xliff:g>ક <xliff:g id="MINUTES">%3$d</xliff:g>મિ <xliff:g id="SECONDS">%4$d</xliff:g>સે"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>ક <xliff:g id="MINUTES">%2$d</xliff:g>મિ <xliff:g id="SECONDS">%3$d</xliff:g>સે"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>મિ <xliff:g id="SECONDS">%2$d</xliff:g>સે"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>સે"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"ઉપયોગનાં આંકડા"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"ઉપયોગનાં આંકડા"</string>
     <string name="display_order_text" msgid="8592776965827565271">"આ પ્રમાણે સૉર્ટ કરો:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"સ્ક્રીન રીડર, પ્રદર્શન, ક્રિયાપ્રતિક્રિયા સંબંધી નિયંત્રણો"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"વિઝન સેટિંગ્સ"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"તમે તમારી જરૂરિયાતો મુજબ આ ઉપકરણને કસ્ટમાઇઝ કરી શકો છો. સેટિંગ્સમાં આ ઍક્સેસિબિલિટી સુવિધાઓ પછીથી બદલી શકાય છે."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"ફૉન્ટનુ કદ વધારો"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"ફોન્ટનું કદ બદલો"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"સ્ક્રીન રીડર"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ઑડિઓ અને સ્ક્રીન પરની ટેક્સ્ટ"</string>
     <string name="display_category_title" msgid="685461049938269166">"ડિસ્પ્લે"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><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_screen_magnification_navbar_summary" msgid="1996584694050087161">"જ્યારે વિસ્તૃતિકરણ ચાલુ હોય, ત્યારે ઝડપથી વિસ્તૃત કરવા માટે સ્ક્રીનના તળિયે આપેલ ઍક્સેસિબિલિટી બટનનો ઉપયોગ કરો.\n\n"<b>"ઝૂમ કરવા માટે"</b>", ઍક્સેસિબિલિટી બટનને ટૅપ કરો, પછી સ્ક્રીન પર ગમે ત્યાં ટૅપ કરો.\n"<ul><li>"સ્ક્રોલ કરવા માટે 2 કે તેથી વધુ આંગળી વડે ખેંચો"</li>\n<li>"ઝૂમ ગોઠવવા માટે 2 કે તેથી વધુ આંગળીથી પિંચ કરો"</li></ul>\n\n<b>"અસ્થાયી રૂપે ઝૂમ કરવા માટે"</b>", ઍક્સેસિબિલિટી બટનને ટૅપ કરો, પછી સ્ક્રીન પર ગમે ત્યાં આંગળી દબાવીને રાખો.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"ઍક્સેસિબિલિટી બટનને <xliff:g id="SERVICE">%1$s</xliff:g> પર સેટ કરેલું છે. વિસ્તૃતીકરણનો ઉપયોગ કરવા માટે, ઍક્સેસિબિલિટી બટનને દબાવી રાખો, પછી વિસ્તૃતીકરણ પસંદ કરો."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"ઍક્સેસિબિલિટી શોર્ટકટ"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"વૉલ્યૂમ કી શૉર્ટકટ"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"શૉર્ટકટ સેવા"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"લૉક સ્ક્રીન પરથી મંજૂરી આપો"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"જ્યારે શૉર્ટકટ ચાલુ હોય, ત્યારે ઍક્સેસિબિલિટી સુવિધા શરૂ કરવા માટે તમે બન્ને વૉલ્યૂમ બટનને 3 સેકન્ડ સુધી દબાવી રાખી શકો છો."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"જ્યારે શૉર્ટકટ ચાલુ હોય, ત્યારે ઍક્સેસિબિલિટી સુવિધા શરૂ કરવા માટે તમે બન્ને વૉલ્યૂમ કીને 3 સેકન્ડ સુધી દબાવી રાખી શકો છો."</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">"સ્ક્રીન વિસ્તૃતીકરણ સ્વતઃ અપડેટ કરો"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"ઍપ્લિકેશન સંક્રમણો પર સ્ક્રીન વિસ્તૃતીકરણને અપડેટ કરો"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"કાર્યપ્રદર્શનને અસર થઈ શકે છે"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"પોઇન્ટર અટકે પછી ક્લિક કરો"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"ક્લિક કરતાં પહેલાં વિલંબ"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ચાલુ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"બંધ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"ઝડપી સેટિંગ્સમાં બતાવો"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g> માંથી <xliff:g id="NUMBER">%1$d</xliff:g> પસંદ કરી"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g> માંથી <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"બધા પસંદ કરો"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"પ્લાન સંચાલિત કરો"</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>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"મોબાઇલ નેટવર્ક્સ"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"મીટર કરેલ વાઇ-ફાઇ નેટવર્ક્સ"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"મીટર કરેલ નેટવર્ક્સ પસંદ કરવા માટે, વાઇ-ફાઇ ચાલુ કરો."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"આપમેળે"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"મીટર કરેલ"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"મીટર કરેલ નથી"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"કેરિઅર ડેટા એકાઉન્ટિંગ તમારા ઉપકરણથી અલગ હોઈ શકે છે."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"કટોકટીનો કૉલ"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"કૉલ પર પાછા ફરો"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"કૉલ સંચાલક"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"કટોકટીના બ્રોડકાસ્ટ્સ"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"કટોકટીની ચેતવણીઓ"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"નેટવર્ક ઓપરેટર્સ"</string>
     <string name="access_point_names" msgid="1381602020438634481">"ઍક્સેસ પોઇન્ટના નામ"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"વધુ સારો 4G LTE મોડ"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"આ માટે પસંદગીનું સિમ"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"દર વખતે પૂછો"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"પસંદગી જરૂરી"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"સિમની પસંદગી"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"સેટિંગ્સ"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="one">%d છુપાયેલ આઇટમ બતાવો</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"ઍપ્લિકેશન સૂચનાઓ"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"નોટિફિકેશન શ્રેણી"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"મહત્વ"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"ઍપ્લિકેશનને નક્કી કરવા દો"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"ધ્વનિની મંજૂરી આપો"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"સૂચનાઓ ક્યારેય બતાવશો નહીં"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"કોઈ અવાજ અથવા વિઝ્યુઅલ અવરોધ નહીં"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"કોઈ ધ્વનિ નથી"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"અવાજ કરો"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"અવાજ કરો અને સ્ક્રીન પર બતાવો"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"સ્ક્રીન પર પૉપ કરો"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"નિમ્ન"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"મધ્યમ"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"ઉચ્ચ"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"તાત્કાલિક"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"ધ્વનિની મંજૂરી આપો"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"વર્તમાન સ્ક્રીન પર દૃશ્યમાં આ સૂચનાઓને અવાજ કરવા, વાઇબ્રેટ કરવા કે ઝબકારારૂપે દેખાવા દેશો નહીં."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"વિક્ષેપોને મંજૂરી આપો"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"ઍપ્લિકેશનને ધ્વનિ, વાઇબ્રેટ અને/અથવા સ્ક્રીન પર સૂચનાઓ હાઇલાઇટ કરવા દો"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"ઓછી મહત્ત્વની"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"સામાન્ય મહત્ત્વની"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"ખૂબ જ મહત્ત્વની"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"ચિત્ર-માં-ચિત્રમાં ચિત્ર"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"ચિત્ર-માં-ચિત્ર"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"ચિત્રમાં-ચિત્રને મંજૂરી આપો"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"આ ઍપ્લિકેશનને જ્યારે ઍપ્લિકેશન ખુલ્લી હોય અથવા તમે તેને છોડી દીધી હોય (ઉદાહરણ તરીકે, વીડિઓ જોવા માટે), ત્યારે ચિત્રમાં-ચિત્ર વિંડો બનાવવાની મંજૂરી આપો. આ વિંડો તમે ઉપયોગમાં લો છો તે અન્ય ઍપ્લિકેશનોની ટોચે પ્રદર્શિત થાય છે."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"જ્યારે ઍપ્લિકેશન ખુલ્લી હોય અથવા તમે તેમાંથી બહાર આવી ગયા હો (ઉદાહરણ તરીકે, વીડિઓ જોવાનું ચાલુ રાખવા માટે), ત્યારે આ ઍપ્લિકેશનને ચિત્રમાં-ચિત્ર વિંડો બનાવવાની મંજૂરી આપો. આ વિંડો તમે ઉપયોગ કરતાં હોય તે અન્ય ઍપ્લિકેશનોની સૌથી ઉપર પ્રદર્શિત થાય છે."</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>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"ફાઇલો ટ્રાન્સફર કરવી"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"ફોટો ટ્રાન્સફર કરવા (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"ઉપકરણનો MIDI તરીકે ઉપયોગ કરવો"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS મિરરિંગ"</string>
     <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>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"રાત્રિ પ્રકાશ માટે શેડ્યૂલ સેટ કરો"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"ઊંઘવામાં સહાય માટે સ્ક્રીન અમ્બર રંગછટા બનાવો"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"રાત્રિ પ્રકાશ ચાલુ છે"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"સ્ક્રીનની રંગછટા પીળાશ પડતી નારંગી કરેલ છે. તે તમને ઊંઘવામાં સહાય કરી શકે છે."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"સૂચનો"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"વધુ કૂલ પ્રદર્શન રંગોનો ઉપયોગ કરો"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"રંગ ફેરફાર લાગુ કરવા માટે, સ્ક્રીન બંધ કરો"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telephony Monitor ના ફેરફારો લાગુ કરવા, ઉપકરણને રીબૂટ કરો"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"કૅમેરા HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"કૅમેરા HAL HDR+ ફેરફાર લાગુ કરવા માટે, ઉપકરણને રીબૂટ કરો."</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"કૅમેરાનું લેસર સેન્સર"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"સ્વચાલિત સિસ્ટમ અપડેટ્સ"</string>
     <string name="usage" msgid="2977875522080448986">"વપરાશ"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"મોબાઇલ ડેટા વપરાશ"</string>
@@ -3410,7 +3427,7 @@
     <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="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g> ના રોજ <xliff:g id="ID_1">%1$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">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"સાફ અને રૂપાંતરિત કરો"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager દરને મર્યાદિત કરવાનું ફરીથી સેટ કરો"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager દરને મર્યાદિત કરવાનું ફરીથી સેટ કરવામાં આવ્યું"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"લૉક સ્ક્રીન સૂચનાઓ નિયંત્રિત કરો"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"લૉક સ્ક્રીન પરની માહિતી નિયંત્રિત કરો"</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="8483187649355540109">"સમર્થન અને ટિપ"</string>
@@ -3487,7 +3504,7 @@
     <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="2456198532288640046">"અન્ય ઉપકરણો માટે દૃશ્યક્ષમ નથી"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"બંધ"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> સાથે કનેક્ટ કરેલું છે"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"બહુવિધ ઉપકરણો સાથે કનેક્ટ કરેલું છે"</string>
     <string name="demo_mode" msgid="2798762752209330277">"સિસ્ટમ UI ડેમો મોડ"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"ઝટપટ ઍપ્લિકેશનો"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"લિંકને ઍપ્લિકેશનમાં ખોલો, જો તે ઇન્સ્ટૉલ ન કરેલ હોય તો પણ"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"ઝટપટ ઍપ્લિકેશનો"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"ઝટપટ ઍપ્લિકેશનોનું એકાઉન્ટ"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"ઝટપટ ઍપ પસંદગીઓ"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ઇન્સ્ટૉલ કરેલ ઍપ્લિકેશનો"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"તમારું સ્ટોરેજ, હવે સ્ટોરેજ સંચાલક દ્વારા સંચાલિત કરવામાં આવી રહ્યું છે"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> માટેના એકાઉન્ટ"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"તમારી વ્યક્તિગત પ્રોફાઇલમાં હંમેશાં ચાલુ VPN ચાલુ કર્યું"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"તમારી કાર્ય પ્રોફાઇલમાં હંમેશાં ચાલુ VPN ચાલુ કર્યું"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"વૈશ્વિક HTTP પ્રોક્સી સેટ કરી"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"વિશ્વસનીય ઓળખપત્રો"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"વિશ્વસનીય ઓળખપત્રો"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"તમારી વ્યક્તિગત પ્રોફાઇલમાંનાં વિશ્વસનીય ઓળખપત્રો"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"તમારા કાર્યાલયની પ્રોફાઇલમાંનાં વિશ્વસનીય ઓળખપત્રો"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">ન્યૂનતમ <xliff:g id="COUNT_1">%d</xliff:g> CA પ્રમાણપત્ર</item>
       <item quantity="other">ન્યૂનતમ <xliff:g id="COUNT_1">%d</xliff:g> CA પ્રમાણપત્ર</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"કૅરિઅર જોગવાઈ માહિતી"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"કૅરિઅર જોગવાઈ ટ્રિગર કરો"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"નવું અને રોમાંચક શું છે?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ટોચની 5 સુવિધાઓ તપાસો"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"તમારા નવા ફોનની ઓળખ મેળવો"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"તમારા નવા ટેબ્લેટની ઓળખ મેળવો"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"તમારા નવા ઉપકરણની ઓળખ મેળવો"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"આ ઉપકરણ પર આ સુવિધા ઉપલબ્ધ નથી"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS રજિસ્ટ્રેશનની સ્થિતિ"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"રજિસ્ટર કરેલ"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"રજિસ્ટર કરેલ નથી"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index f618aee..b0555c85 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s आपके मैसेज तक पहुंचना चाहता है. %2$s को पहुंचने दें?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"सिम का इस्तेमाल करने के लिए अनुरोध"</string>
     <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="bluetooth_device_name_summary" msgid="4757990010751789977">"दूसरे डिवाइस को \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' के रूप में दिखाई देता है"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"दूसरे डिवाइस को \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' के रूप में दिखाई देता है"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"आपके डिवाइस"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"नया डिवाइस जोड़ें"</string>
     <string name="date_and_time" msgid="9062980487860757694">"तारीख और समय"</string>
@@ -223,7 +223,7 @@
     <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="6625185764803245075">"DNS जाँच टॉगल करें"</string>
     <string name="oem_radio_info_label" msgid="6163141792477958941">"OEM-खास जानकारी/सेटिंग"</string>
     <string name="band_mode_title" msgid="4071411679019296568">"रेडियो बैंड मोड सेट करें"</string>
     <string name="band_mode_loading" msgid="3555063585133586152">"बैंड सूची लोड कर रहा है..."</string>
@@ -325,7 +325,7 @@
     <string name="date_picker_title" msgid="1338210036394128512">"तारीख"</string>
     <string name="time_picker_title" msgid="483460752287255019">"समय"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"अपने आप लॉक करें"</string>
-    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> निष्क्रियता के बाद"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> तक इस्तेमाल न होने के बाद"</string>
     <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="TRUST_AGENT_NAME">%2$s</xliff:g> के अनलॉक रखे जाने के अलावा, कम बैटरी मोड में होने के बाद <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"लॉक स्‍क्रीन पर अपनी जानकारी दिखाएं"</string>
@@ -353,7 +353,7 @@
     <string name="security_status_title" msgid="5848766673665944640">"सुरक्षा स्थिति"</string>
     <string name="security_dashboard_summary" msgid="6757421634477554939">"स्क्रीन लॉक, फ़िंगरप्रिंट"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"स्क्रीन लॉक"</string>
-    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"अंगुली की छाप"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"उंगली की छाप"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"फ़िंगरप्रिंट प्रबंधित करें"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"इनके हेतु फ़िंगरप्रिंट उपयोग करें"</string>
     <string name="fingerprint_add_title" msgid="1926752654454033904">"फ़िंगरप्रिंट जोड़ें"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"आगे बढ़ें"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"फ़िंगरप्रिंट छोड़ें?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"फ़िंगरप्रिंट सेटअप में सिर्फ़ एक या दो मिनट लगते हैं. अगर आप इसे छोड़ते हैं, तो आप बाद में सेटिंग में अपना फ़िंगरप्रिंट जोड़ सकते हैं."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"स्क्रीन लॉक छोड़ें?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"डिवाइस सुरक्षा सुविधाओं को चालू नहीं किया जाएगा. अगर आपका टैबलेट खो जाता है, चोरी हो जाता है या उसे रीसेट कर दिया जाता है, तो आप दूसरों को इसका उपयोग करने से रोक नहीं पाएंगे."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"डिवाइस सुरक्षा सुविधाओं को चालू नहीं किया जाएगा. अगर आपका डिवाइस खो जाता है, चोरी हो जाता है या उसे रीसेट कर दिया जाता है, तो आप दूसरों को इसका उपयोग करने से रोक नहीं पाएंगे."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"डिवाइस सुरक्षा सुविधाओं को चालू नहीं किया जाएगा. अगर आपका फ़ोन खो जाता है, चोरी हो जाता है या उसे रीसेट कर दिया जाता है, तो आप दूसरों को इसका उपयोग करने से रोक नहीं पाएंगे."</string>
@@ -381,7 +384,7 @@
     <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="3051496861358227199">"सेंसर को छुएं"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"यह आपके फ़ोन के पीछे दिया गया है. अपने अंगूठे के पास की अंगुली का उपयोग करें."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"यह आपके फ़ोन के पीछे दिया गया है. अपने अंगूठे के पास की उंगली का उपयोग करें."</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>
@@ -389,7 +392,7 @@
     <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"सेंसर को छुएं"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"अपनी उंगली सेंसर पर रखें और कंपन (वाइब्रेशन) महसूस होने पर उठा लें"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"उठाएं, फिर दोबारा छुएं"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"अपने फ़िंगरप्रिंट के अलग-अलग भागों को जोड़ने के लिए अपनी अंगुली को उठाते रहें"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"अपने फ़िंगरप्रिंट के अलग-अलग भागों को जोड़ने के लिए अपनी उंगली को उठाते रहें"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"फ़िंगरप्रिंट जोड़ा गया"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"जब आपको यह आइकॉन दिखाई दे, तब पहचान के लिए या खरीदारियों की स्वीकृति देने के लिए अपने फ़िंगरप्रिंट का इस्तेमाल करें."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"इसे बाद में करें"</string>
@@ -398,10 +401,10 @@
     <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="2989019978041986175">"अपने फ़ोन के पीछे लगे सेंसर को छुएं. अपनी तर्जनी (अंगूठे के बगल वाली) अंगुली का इस्तेमाल करें."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"अपने फ़ोन के पीछे लगे सेंसर को छुएं. अपनी तर्जनी (अंगूठे के बगल वाली) उंगली का इस्तेमाल करें."</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>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"फ़िंगरप्रिंट नामांकन ने काम नहीं किया. फिर से प्रयास करें या किसी दूसरी उंगली का उपयोग करें."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"कोई और जोड़ें"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"आगे"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"अपना फ़ोन अनलॉक करने के साथ-साथ, खरीदारी और ऐप ऐक्‍सेस को अधिकृत करने के लिए आप अपनी फ़िंगरप्रिंट का भी उपयोग कर सकते हैं. "<annotation id="url">"ज़्यादा जानें"</annotation></string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"आप अधिकतम संख्या में फ़िंगरप्रिंट जोड़ चुके हैं"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"और अधिक फ़िंगरप्रिंट नहीं जोड़े जा सकते"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"सभी फ़िंगरप्रिंट निकालें?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' निकालें"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"क्या आप इस फ़िंगरप्रिंट को हटाना चाहते हैं?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"आप अपना फ़ोन अनलॉक करने, खरीदी अधिकृत करने या ऐप्लिकेशन में प्रवेश करने के लिए अपने फ़िंगरप्रिंट का उपयोग नहीं कर सकेंगे"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"आप अपनी कार्य प्रोफ़ाइल अनलॉक करने, खरीदारी अधिकृत करने या अपने कार्य ऐप्लिकेशन में प्रवेश करने के लिए अपने फ़िंगरप्रिंट का उपयोग नहीं कर सकेंगे."</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"हां, निकालें"</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"अतिरिक्त सुरक्षा के लिए, बैकअप स्‍क्रीन लॉक सेट करें."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"ज़्यादा सुरक्षा के लिए, बैकअप स्‍क्रीन लॉक सेट करें."</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>
@@ -492,42 +497,42 @@
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"आकार"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"पिन"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"पासवर्ड"</string>
-    <string name="unlock_setup_wizard_fingerprint_details" msgid="7893457665921363009">"स्‍क्रीन लॉक सेट करने के बाद, आप सेटिंग और सुरक्षा में अपनी अंगुली की छाप भी सेट कर सकते हैं."</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7893457665921363009">"स्‍क्रीन लॉक सेट करने के बाद, आप सेटिंग और सुरक्षा में अपनी उंगली की छाप भी सेट कर सकते हैं."</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_fingerprint" msgid="8212242533942400457">"डिवाइस सुरक्षा सुविधाएं आपके प्रतिमान के बिना काम नहीं करेंगी.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"डिवाइस सुरक्षा सुविधाएं आपके पैटर्न के बिना काम नहीं करेंगी.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>आपके सहेजे गए फ़िंगरप्रिंट भी इस डिवाइस से निकाल दिए जाएंगे और आप अपने फ़ोन को अनलॉक नहीं कर सकेंगे, खरीदारियों को अधिकृत नहीं कर सकेंगे या उनके साथ ऐप्स में प्रवेश नहीं कर सकेंगे.\""</string>
+</xliff:g>आपके सहेजे गए फ़िंगरप्रिंट भी इस डिवाइस से निकाल दिए जाएंगे और आप अपने फ़ोन को अनलॉक नहीं कर सकेंगे, खरीदारी अधिकृत नहीं कर सकेंगे या उनके ज़रिए ऐप्लिकेशन में प्रवेश नहीं कर सकेंगे."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"डिवाइस सुरक्षा सुविधाएं आपके पिन के बिना काम नहीं करेंगी."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"डिवाइस सुरक्षा सुविधाएं आपके पिन के बिना काम नहीं करेंगी.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"डिवाइस सुरक्षा सुविधाएं आपके पिन के बिना काम नहीं करेंगी.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>आपके सहेजे गए फ़िंगरप्रिंट भी इस डिवाइस से निकाल दिए जाएंगे और आप अपने फ़ोन को अनलॉक नहीं कर सकेंगे, खरीदारियों को अधिकृत नहीं कर सकेंगे या उनके साथ ऐप्स में प्रवेश नहीं कर सकेंगे.\""</string>
+</xliff:g>आपके सहेजे गए फ़िंगरप्रिंट भी इस डिवाइस से निकाल दिए जाएंगे और आप अपने फ़ोन को अनलॉक नहीं कर सकेंगे, खरीदारी अधिकृत नहीं कर सकेंगे या उनके ज़रिए ऐप्लिकेशन में प्रवेश नहीं कर सकेंगे."</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"डिवाइस सुरक्षा सुविधाएं आपके पासवर्ड के बिना काम नहीं करेंगी.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>आपके सहेजे गए फ़िंगरप्रिंट भी इस डिवाइस से निकाल दिए जाएंगे और आप अपने फ़ोन को अनलॉक नहीं कर सकेंगे, खरीदारियों को अधिकृत नहीं कर सकेंगे या उनके साथ ऐप्स में प्रवेश नहीं कर सकेंगे.\""</string>
+</xliff:g>आपके सहेजे गए फ़िंगरप्रिंट भी इस डिवाइस से निकाल दिए जाएंगे और आप अपने फ़ोन को अनलॉक नहीं कर सकेंगे, खरीदारी अधिकृत नहीं कर सकेंगे या उनके ज़रिए ऐप्लिकेशन में प्रवेश नहीं कर सकेंगे."</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"डिवाइस सुरक्षा सुविधाएं आपके स्क्रीन लॉक के बिना काम नहीं करेंगी.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>आपके सहेजे गए फ़िंगरप्रिंट भी इस डिवाइस से निकाल दिए जाएंगे और आप अपने फ़ोन को अनलॉक नहीं कर सकेंगे, खरीदारियों को अधिकृत नहीं कर सकेंगे या उनके साथ ऐप्स में प्रवेश नहीं कर सकेंगे.\""</string>
+</xliff:g>आपके सहेजे गए फ़िंगरप्रिंट भी इस डिवाइस से निकाल दिए जाएंगे और आप अपने फ़ोन को अनलॉक नहीं कर सकेंगे, खरीदारी अधिकृत नहीं कर सकेंगे या उनके ज़रिए ऐप्लिकेशन में प्रवेश नहीं कर सकेंगे."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"प्रोफ़ाइल सुरक्षा सुविधाएं आपके पैटर्न के बिना काम नहीं करेंगी."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"प्रोफ़ाइल सुरक्षा सुविधाएं आपके पैटर्न के बिना काम नहीं करेंगी.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"प्रोफ़ाइल सुरक्षा सुविधाएं आपके पैटर्न के बिना काम नहीं करेंगी.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>आपके सहेजे गए फ़िंगरप्रिंट भी इस प्रोफ़ाइल से निकाल दिए जाएंगे और आप उनसे अपनी प्रोफ़ाइल अनलॉक नहीं कर सकेंगे, खरीदारी अधिकृत नहीं कर सकेंगे, या ऐप्‍स में प्रवेश नहीं कर सकेंगे.\""</string>
+</xliff:g>आपके सहेजे गए फ़िंगरप्रिंट भी इस प्रोफ़ाइल से निकाल दिए जाएंगे और आप अपनी प्रोफ़ाइल को अनलॉक नहीं कर सकेंगे, खरीदारी अधिकृत नहीं कर सकेंगे या उनके ज़रिए ऐप्लिकेशन में प्रवेश नहीं कर सकेंगे."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"प्रोफ़ाइल सुरक्षा सुविधाएं आपके पिन के बिना काम नहीं करेंगी."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"प्रोफ़ाइल सुरक्षा सुविधाएं आपके पिन के बिना काम नहीं करेंगी.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"प्रोफ़ाइल सुरक्षा सुविधाएं आपके पिन के बिना काम नहीं करेंगी.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>आपके सहेजे गए फ़िंगरप्रिंट भी इस प्रोफ़ाइल से निकाल दिए जाएंगे और आप उनसे अपनी प्रोफ़ाइल अनलॉक नहीं कर सकेंगे, खरीदारी अधिकृत नहीं कर सकेंगे, या ऐप्‍स में प्रवेश नहीं कर सकेंगे.\""</string>
+</xliff:g>आपके सहेजे गए फ़िंगरप्रिंट भी इस प्रोफ़ाइल से निकाल दिए जाएंगे और आप अपनी प्रोफ़ाइल को अनलॉक नहीं कर सकेंगे, खरीदारी अधिकृत नहीं कर सकेंगे या उनके ज़रिए ऐप्लिकेशन में प्रवेश नहीं कर सकेंगे."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"प्रोफ़ाइल सुरक्षा सुविधाएं आपके पासवर्ड के बिना काम नहीं करेंगी."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"प्रोफ़ाइल सुरक्षा सुविधाएं आपके पासवर्ड के बिना काम नहीं करेंंगी.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"प्रोफ़ाइल सुरक्षा सुविधाएं आपके पासवर्ड के बिना काम नहीं करेंंगी.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>आपके सहेजे गए फ़िंगरप्रिंट भी इस प्रोफ़ाइल से निकाल दिए जाएंगे और आप उनसे अपनी प्रोफ़ाइल अनलॉक नहीं कर सकेंगे, खरीदारी अधिकृत नहीं कर सकेंगे, या ऐप्‍स में प्रवेश नहीं कर सकेंगे.\""</string>
+</xliff:g>आपके सहेजे गए फ़िंगरप्रिंट भी इस प्रोफ़ाइल से निकाल दिए जाएंगे और आप अपनी प्रोफ़ाइल को अनलॉक नहीं कर सकेंगे, खरीदारी अधिकृत नहीं कर सकेंगे या उनके ज़रिए ऐप्लिकेशन में प्रवेश नहीं कर सकेंगे."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"प्रोफ़ाइल सुरक्षा सुविधाएं आपके स्क्रीन लॉक के बिना काम नहीं करेंगी."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"प्रोफ़ाइल सुरक्षा सुविधाएं आपके स्‍क्रीन लॉक के बिना काम नहीं करेंगी.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"प्रोफ़ाइल सुरक्षा सुविधाएं आपके स्‍क्रीन लॉक के बिना काम नहीं करेंगी.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>आपके सहेजे गए फ़िंगरप्रिंट भी इस प्रोफ़ाइल से निकाल दिए जाएंगे और आप उनसे अपनी प्रोफ़ाइल अनलॉक नहीं कर सकेंगे, खरीदारी अधिकृत नहीं कर सकेंगे, या ऐप्‍स में प्रवेश नहीं कर सकेंगे.\""</string>
+</xliff:g>आपके सहेजे गए फ़िंगरप्रिंट भी इस प्रोफ़ाइल से निकाल दिए जाएंगे और आप अपनी प्रोफ़ाइल को अनलॉक नहीं कर सकेंगे, खरीदारी अधिकृत नहीं कर सकेंगे या उनके ज़रिए ऐप्लिकेशन में प्रवेश नहीं कर सकेंगे."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"हां, निकालें"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"अनलॉक आकार बदलें"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"अनलॉक पिन बदलें"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"अंकों के बढ़ते, घटते या दोहराए जाने वाले क्रम की अनुमति नहीं है"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ठीक है"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"रद्द करें"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"साफ़ करें"</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>
@@ -631,7 +637,7 @@
     <string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="2271954176947879628">"कीबोर्ड"</string>
     <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="7747163316331917594">"संपर्क और कॉल इतिहास"</string>
     <string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"इस डिवाइस से जोड़ें?"</string>
-    <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"फ़ोन बुक साझा करें?"</string>
+    <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"फ़ोन बुक शेयर करें?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> आपके संपर्कों और कॉल इतिहास तक पहुंचना चाहता है."</string>
     <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> Bluetooth से जुड़ना चाहता है. कनेक्ट होने पर, वो आपके संपर्कों और कॉल इतिहास को देख सकेगा."</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"जोड़े गए डिवाइस"</string>
@@ -645,7 +651,7 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"विकल्प…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"बेहतर सेटिंग"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"बेहतर ब्लूटूथ"</string>
-    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ब्लूटूथ के चालू होने पर, आपका डिवाइस आस-पास के और ब्लूटूथ डिवाइस से संचार कर सकता है."</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ब्लूटूथ चालू होने पर, आपका डिवाइस आस-पास के दूसरे ब्लूटूथ डिवाइस से संपर्क कर सकता है."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"जगह की सटीकता को बेहतर बनाने के लिए, सिस्‍टम ऐप और सेवाएं अभी भी ब्‍लूटूथ डिवाइसों का पता लगा सकती हैं. आप इसे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्‍कैन करने की सेटिंग<xliff:g id="LINK_END_1">LINK_END</xliff:g> में बदल सकते हैं."</string>
     <string name="bluetooth_connect_failed" msgid="4500234659813241053">"कनेक्ट नहीं हो सका. फिर से कोशिश करें."</string>
     <string name="device_details_title" msgid="6576953269221085300">"डिवाइस विवरण"</string>
@@ -692,13 +698,13 @@
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> वाई-फ़ाई को चालू करना चाहता है"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> वाई-फ़ाई को बंद करना चाहता है"</string>
-    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"आस-पास के उपकरणों से संपर्क (एन एफ सी)"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"आस-पास के डिवाइस से संपर्क (एनएफसी)"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"जब टैबलेट अन्य डिवाइस को स्पर्श करे तो डेटा ट्रांसफर करने दें"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"जब फ़ोन अन्य डिवाइस को स्पर्श करे तो डेटा ट्रांसफर करने दें"</string>
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"NFC चालू करें"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC इस डिवाइस और आस-पास के अन्य डिवाइस या लक्ष्यों के बीच डेटा का आदान-प्रदान करता है, जैसे कि भुगतान टर्मिनल, एक्सेस रीडर और सहभागी विज्ञापन या टैग."</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android बीम"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"NFC के माध्यम से ऐप सामग्री प्रसारित करने के लिए तैयार"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"एनएफसी के ज़रिए ऐप की सामग्री भेजने के लिए तैयार"</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 बीम"</string>
@@ -786,7 +792,7 @@
     <string name="wifi_signal" msgid="5514120261628065287">"सिग्‍नल शक्ति"</string>
     <string name="wifi_status" msgid="4824568012414605414">"स्थिति"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"लिंक गति"</string>
-    <string name="wifi_frequency" msgid="7791090119577812214">"आवृत्ति"</string>
+    <string name="wifi_frequency" msgid="7791090119577812214">"फ़्रीक्वेंसी"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"आईपी पता"</string>
     <string name="passpoint_label" msgid="6381371313076009926">"के द्वारा सहेजा गया"</string>
     <string name="passpoint_content" msgid="8447207162397870483">"<xliff:g id="NAME">%1$s</xliff:g> प्रमाणिकता"</string>
@@ -803,7 +809,7 @@
     <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz बैंड"</string>
     <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz बैंड"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP सेटिंग"</string>
-    <string name="wifi_shared" msgid="844142443226926070">"अन्‍य डिवाइस उपयोगकर्ताओं से साझा करें"</string>
+    <string name="wifi_shared" msgid="844142443226926070">"अन्‍य डिवाइस उपयोगकर्ताओं से शेयर करें"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(अपरिवर्तित)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"कृपया चुनें"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(एकाधिक प्रमाणपत्र जोड़े गए)"</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS उपलब्‍ध"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS उपलब्‍ध)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"अपना नेटवर्क पासवर्ड डालें"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी वाई-फ़ाई नेटवर्क"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> से कनेक्ट करें"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"जगह की सटीकता को बेहतर बनाने और दुसरे कामों के लिए, Wi-Fi बंद होने पर भी <xliff:g id="APP_NAME">%1$s</xliff:g> नेटवर्क को स्कैन करना चालू करना चाहता है.\n\nउन सभी ऐप को इसकी अनुमति दें जो स्कैन करना चाहते हैं?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"इसे बंद करने के लिए, ओवरफ़्लो मेन्यू में बेहतर पर जाएं."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"अनुमति दें"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"जोड़ दें"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"नेटवर्क से कनेक्ट करने में विफल रहा"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"भूलें"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"बदलें"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"नेटवर्क भूलने में विफल रहा"</string>
     <string name="wifi_save" msgid="3331121567988522826">"जोड़ें"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"नेटवर्क सहेजने में विफल रहा"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"बेहतर वाई-फ़ाई"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC पता"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"आईपी पता"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"नेटवर्क की जानकारी"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"सबनेट मास्क"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 पते"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"आमंत्रण ना करें?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"क्या आप <xliff:g id="PEER_NAME">%1$s</xliff:g> से कनेक्ट होने का आमंत्रण रद्द करना चाहते हैं?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"इस समूह को भूलें?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"पोर्टेबल वाई-फ़ाई  हॉटस्‍पॉट"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"वाई-फ़ाई हॉटस्पॉट"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"दूसरे डिवाइस से इंटरनेट या सामग्री को साझा नहीं किया जा रहा है"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"हॉटस्पॉट के ज़रिए इस टैबलेट का इंटरनेट कनेक्शन साझा किया जा रहा है"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"हॉटस्पॉट के ज़रिए इस फ़ोन का इंटरनेट कनेक्शन साझा किया जा रहा है"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"ऐप्लिकेशन सामग्री साझा कर रहा है. इंटरनेट कनेक्शन साझा करने के लिए, हॉटस्पॉट बंद करें, फिर उसे चालू करें"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"वाई-फ़ाई का नाम"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"हॉटस्पॉट का नाम"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> चालू किया जा रहा है..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"दूसरे डिवाइस <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> से कनेक्ट हो सकते हैं"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"वाई-फ़ाई पासवर्ड"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"हॉटस्पॉट का पासवर्ड"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP बैंड"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"हॉटस्पॉट का इस्तेमाल करके अपने दूसरे डिवाइस के लिए वाई-फ़ाई नेटवर्क बनाएं. हॉटस्पॉट आपके मोबाइल डेटा कनेक्शन का इस्तेमाल करके इंटरनेट की सुविधा देता है. अतिरिक्त मोबाइल डेटा शुल्क लागू हो सकते हैं."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ऐप्लिकेशन आस-पास के डिवाइस से सामग्री साझा करने के लिए कोई हॉटस्पॉट बना सकते हैं."</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"वाई-फ़ाई कॉलिंग चालू होने पर, आपका फ़ोन वाई-फ़ाई या मोबाइल और इंटरनेट सेवा देने वाली कंपनी के नेटवर्क के ज़रिए कॉल कर सकता है. यह इस बात पर निर्भर करेगा कि आप क्या चाहते हैं और इनमें से कौन सा सिग्नल बेहतर काम कर रहा है. इस सुविधा को चालू करने से पहले, शुल्‍क और अन्‍य जानकारी के बारे में अपनी मोबाइल और इंटरनेट सेवा देने वाली कंपनी से बात करें."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"आपातकालीन पता अपडेट करें"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"जब आप वाई-फ़ाई का इस्तेमाल करके 911 पर कॉल करते है तब आपातकालीन सेवाओं के ज़रिये आपकी जगह के तौर पर इस्तेमाल किया जाने वाला पता"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"जब आप वाई-फ़ाई का इस्तेमाल करके 911 पर कॉल करते है तब आपातकालीन सेवाओं के ज़रिये आपकी जगह के तौर पर इस्तेमाल किया जाने वाला पता"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"स्क्रीन सेटिंग देखें"</string>
     <string name="sound_settings" msgid="5534671337768745343">"आवाज़"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"आवाज़"</string>
@@ -992,8 +1001,9 @@
     <string name="search_settings" msgid="1910951467596035063">"सर्च"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"सर्च सेटिंग और इतिहास प्रबंधित करें"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"कोई परिणाम नहीं"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"इतिहास साफ़ करें"</string>
     <string name="display_settings" msgid="7965901687241669598">"स्क्रीन सेटिंग"</string>
-    <string name="accelerometer_title" msgid="7854608399547349157">"स्‍क्रीन अपनेआप घुमाएं"</string>
+    <string name="accelerometer_title" msgid="7854608399547349157">"स्‍क्रीन अपने आप घुमाएं"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"चमकीले रंग"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"टैबलेट घुमाने पर स्क्रीन की दिशा अपने आप बदलें"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"फ़ोन घुमाने पर स्क्रीन की दिशा अपने आप बदलें"</string>
@@ -1040,7 +1050,7 @@
     <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"सूर्योदय होने पर अपने आप बंद हो जाएगा"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"सुलाएं (कम बैटरी मोड)"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"स्क्रीन बंद हो जाती है"</string>
-    <string name="screen_timeout_summary" msgid="327761329263064327">"नि‍ष्‍क्रि‍यता के <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> के बाद"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> तक इस्तेमाल न होने पर"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"वॉलपेपर"</string>
     <string name="wallpaper_settings_summary_default" msgid="3395741565658711416">"डिफ़ॉल्ट"</string>
     <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"कस्टम"</string>
@@ -1212,9 +1222,9 @@
     <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>
-    <string name="usb_mtp_summary" msgid="4617321473211391236">"आपको Windows पर मीडि‍या फ़ाइल स्‍थानांतरि‍त करने, या Mac पर Android File Transfer का उपयोग करने देता है (www.android.com/filetransfer देखें)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"आपको Windows पर मीडि‍या फ़ाइल ट्रांसफ़र करने, या Mac पर Android File Transfer का इस्तेमाल करने देता है (www.android.com/filetransfer देखें)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"कैमरा (PTP)"</string>
-    <string name="usb_ptp_summary" msgid="7406889433172511530">"आपको कैमरा सॉफ़्टवेयर का उपयोग करके फ़ोटो स्‍थानांतरित करने देता है, और MTP का समर्थन न करने वाले कंप्‍यूटरों पर कोई भी फ़ाइलें स्‍थानांतरित करने देता है"</string>
+    <string name="usb_ptp_summary" msgid="7406889433172511530">"आपको कैमरा सॉफ़्टवेयर का इस्तेमाल करके फ़ोटो ट्रांसफ़र करने देता है और जिन कंप्‍यूटर पर MTP काम नहीं करता, उन पर कोई भी फ़ाइल ट्रांसफ़र करने देता है"</string>
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"MIDI सक्षम ऐप्‍लिकेशन को आपके कंप्‍यूटर पर MIDI सॉफ़्टवेयर के साथ USB पर कार्य करने देती है."</string>
     <string name="storage_other_users" msgid="808708845102611856">"अन्य उपयोगकर्ता"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"डिफ़ॉल्‍ट APN सेटिंग पुनर्स्थापित हो रही हैं."</string>
     <string name="menu_restore" msgid="8260067415075573273">"डिफ़ॉल्ट पर रीसेट करें"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"डिफ़ॉल्‍ट APN सेटिंग रीसेट करना पूर्ण हुआ."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"रीसेट करें"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"नेटवर्क सेटिंग रीसेट कर दी गई"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"रीसेट विकल्प"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"नेटवर्क, ऐप्लिकेशन या डिवाइस रीसेट किए जा सकते हैं"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"वाई-फ़ाई, मोबाइल और ब्लूटूथ रीसेट करें"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"इससे सभी नेटवर्क सेटिंग रीसेट हो जाएंगी, जिनमें ये भी शामिल हैं:\n\n"<li>"वाई-फ़ाई"</li>\n<li>"मोबाइल डेटा"</li>\n<li>"ब्लूटूथ"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"सेटिंग रीसेट करें"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"सभी नेटवर्क सेटिंग रीसेट करें? आप इस कार्रवाई को वापस नहीं ला सकते!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"रीसेट करें?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"इस उपयोगकर्ता के लिए नेटवर्क रीसेट मौजूद नहीं है"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"नेटवर्क सेटिंग रीसेट कर दी गई हैं"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"फ़ैक्टरी डेटा रीसेट"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> खाते रीसेट किए जाएंगे</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> खाते रीसेट किए जाएंगे</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"डिवाइस की मेमोरी और सभी डेटा रीसेट कर दिया जाएगा"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"सभी डेटा मिटाएं (फ़ैक्टरी रीसेट)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"इससे आपके टैबलेट के "<b>"मोबाइल मेमोरी"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम और ऐप्स डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए ऐप्स"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"इससे आपके फ़ोन के "<b>"मोबाइल मेमोरी"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम और ऐप्स डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए ऐप्स"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"आप वर्तमान में निम्‍न खातों में प्रवेश किए हुए हैं:\n"</string>
@@ -1378,9 +1384,9 @@
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB से इंटरनेट पर शेयर करें"</string>
     <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"USB के ज़रिए फ़ोन का इंटरनेट कनेक्‍शन शेयर करें"</string>
-    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"USB के ज़रिए टैबलेट का इंटरनेट कनेक्‍शन साझा करें"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"USB के ज़रिए टैबलेट का इंटरनेट कनेक्‍शन शेयर करें"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ब्लूटूथ से इंटरनेट पर शेयर करें."</string>
-    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"ब्लूटूथ के ज़रिए टैबलेट का इंटरनेट कनेक्शन साझा करें"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"ब्लूटूथ के ज़रिए टैबलेट का इंटरनेट कनेक्शन शेयर करें"</string>
     <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"ब्लूटूथ के ज़रिए फ़ोन का इंटरनेट कनेक्शन शेयर करें"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"<xliff:g id="DEVICE_NAME">%1$d</xliff:g> का इंटरनेट कनेक्शन ब्लूटूथ से साझा हो रहा है"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> डिवाइस से अधिक को टेदर नहीं कर सकता."</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"सुरक्षा की जानकारी"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"आपके पास डेटा कनेक्‍शन नहीं है. इस जानकारी को अभी देखने के लिए, इंटरनेट से कनेक्‍ट किसी भी कंप्‍यूटर से %s पर जाएं."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"लोड हो रहा है..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"अपना पासवर्ड चुनें"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"स्क्रीन लॉक सेट करें"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"सुरक्षा के लिए, पासवर्ड सेट करें"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"फ़िंगरप्रिंट का उपयोग करने के लिए, पासवर्ड सेट करें"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"अपना आकार चुनें"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"फ़िंगरप्रिंट का उपयोग करने के लिए, पैटर्न सेट करें"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"अपना पिन चुनें"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"सुरक्षा के लिए, पिन सेट करें"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"फ़िंगरप्रिंट का उपयोग करने के लिए, पिन सेट करें"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"अपने पासवर्ड की पुष्टि करें"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"पासवर्ड फिर से दर्ज करें"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"अपने पैटर्न की पुष्टि करें"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"अपने पिन की पुष्टि करें"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"पिन फिर से दर्ज करें"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"पासवर्ड मेल नहीं खाते"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"पिन मेल नहीं खाते"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"अनलॉक करने के लिए चुनें"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"जारी रखने के लिए अपने कार्य पैटर्न का उपयोग करें"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"जारी रखने के लिए अपना कार्य पिन डालें"</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">"जारी रखने के लिए अपना डिवाइस पिन डालें. डिवाइस पुन: प्रारंभ होने पर आवश्यकता होगी."</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">"जारी रखने के लिए अपना कार्य पिन डालें. डिवाइस पुन: प्रारंभ होने पर आवश्यकता होगी."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"जारी रखने के लिए अपना कार्य पासवर्ड डालें. डिवाइस पुन: प्रारंभ होने पर आवश्यकता होगी."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"अतिरिक्त सुरक्षा के लिए, अपने पैटर्न का इस्तेमाल करें"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"अतिरिक्त सुरक्षा के लिए, अपना पिन डालें"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"अतिरिक्त सुरक्षा के लिए, अपना पासवर्ड डालें"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"अतिरिक्त सुरक्षा के लिए, अपने वर्क पैटर्न का इस्तेमाल करें"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"अतिरिक्त सुरक्षा के लिए, अपना वर्क पिन डालें"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"अतिरिक्त सुरक्षा के लिए, अपना वर्क पासवर्ड डालें"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"आपके फ़ोन को फ़ैक्टरी सेटिंग पर रीसेट किया गया था. इस फ़ोन का उपयोग करने के लिए, अपना पिछला पैटर्न डालें."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"आपके फ़ोन को फ़ैक्ट्री सेटिंग पर रीसेट किया गया था. इस फ़ोन का इस्तेमाल करने के लिए, अपना पिछला पिन डालें."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"आपके फ़ोन को फ़ैक्ट्री सेटिंग पर रीसेट किया गया था. इस फ़ोन का इस्तेमाल करने के लिए, अपना पिछला पासवर्ड डालें."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"पैटर्न की पुष्टि करें"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"पिन की पुष्टि करें"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"पासवर्ड की पुष्टि करें"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"गलत पिन"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"गलत पासवर्ड"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"गलत पैटर्न"</string>
@@ -1497,7 +1510,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"अनलॉक पिन बदलें"</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_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>
@@ -1587,7 +1600,7 @@
     <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_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>
@@ -1726,7 +1739,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"\".\" सम्‍मिलित करने के लिए Space कुंजी दो बार दबाएं"</string>
     <string name="show_password" msgid="4837897357002495384">"पासवर्ड दिखाएं"</string>
     <string name="show_password_summary" msgid="3365397574784829969">"लिखते समय वर्ण दिखाएं"</string>
-    <string name="spellchecker_security_warning" msgid="9060897418527708922">"यह स्पेलिंग जांचने वाला निजी डेटा, जैसे पासवर्ड और क्रेडिट कार्ड नंबर के साथ आपके लिखे सभी लेख इकट्ठा कर सकता है. यह एप्‍लिकेशन <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> से आता है. इस स्पेलिंग जांचने वाले का इस्तेमाल करें?"</string>
+    <string name="spellchecker_security_warning" msgid="9060897418527708922">"यह स्पेलिंग जाँचने वाला निजी डेटा, जैसे पासवर्ड और क्रेडिट कार्ड नंबर के साथ आपके लिखे सभी लेख इकट्ठा कर सकता है. यह एप्‍लिकेशन <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> से आता है. इस स्पेलिंग जाँचने वाले का इस्तेमाल करें?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"सेटिंग"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"भाषा"</string>
     <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"कीबोर्ड और इनपुट"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"विजेट बनाएं और पहुंच की अनुमति दें?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"विजेट बना लेने के बाद, इसके द्वारा प्रदर्शित सभी डेटा पर <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> पहुंच सकता है."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> को हमेशा शॉर्टकट बनाने दें और उनके डेटा पर पहुंचने दें"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>दि <xliff:g id="HOURS">%2$d</xliff:g>घं <xliff:g id="MINUTES">%3$d</xliff:g>मि <xliff:g id="SECONDS">%4$d</xliff:g>से"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>घं <xliff:g id="MINUTES">%2$d</xliff:g>मि <xliff:g id="SECONDS">%3$d</xliff:g>से"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>मि <xliff:g id="SECONDS">%2$d</xliff:g>से"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>से"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"उपयोग के आंकड़े"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"उपयोग के आंकड़े"</string>
     <string name="display_order_text" msgid="8592776965827565271">"इसके अनुसार क्रमित करें:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"स्क्रीन रीडर, डिसप्ले, इंटरैक्शन नियंत्रण"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"दृश्य संबंधी सेटिंग"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"आप इस डिवाइस में अपनी जरूरतों के हिसाब से बदलाव ला सकते हैं. ये सुलभता सुविधाएं बाद में सेटिंग में बदली जा सकती हैं."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"फ़ॉन्ट का आकार बढ़ाएं"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"फ़ॉन्ट का आकार बदलें"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"स्क्रीन रीडर"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ऑडियो और ऑन-स्क्रीन लेख"</string>
     <string name="display_category_title" msgid="685461049938269166">"डिसप्ले"</string>
@@ -1828,12 +1834,12 @@
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"ज़ूम करने के लिए 3 बार टैप करें"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"ज़ूम करने के लिए किसी बटन पर टैप करें"</string>
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><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_screen_magnification_navbar_summary" msgid="1996584694050087161">"बड़ा करने की सुविधा चालू होने पर, फटाफट बड़ा करने के लिए स्क्रीन के नीचे दिए गए सुलभता बटन का इस्तेमाल करें.\n\n"<b>"ज़ूम करने के लिए"</b>", सुलभता बटन पर टैप करें, फिर स्क्रीन पर कहीं भी टैप करें.\n"<ul><li>"स्क्रोल करने के लिए 2 या उससे ज़्यादा अंगुलियां खींचें"</li>\n<li>"ज़ूम को कम या ज़्यादा करने के लिए 2 या उससे ज़्यादा अंगुलियों से पिंच करें"</li></ul>\n\n<b>"थोड़े समय तक ज़ूम करने के लिए"</b>", सुलभता बटन पर टैप करें, फिर स्क्रीन पर कहीं भी छुएं और दबाकर रखें.\n"<ul><li>"स्क्रीन पर इधर-उधर ले जाने के लिए खींचें"</li>\n<li>"ज़ूम आउट करने के लिए अंगुली उठाएं"</li></ul>\n\n"आप कीबोर्ड या नेविगेशन बार पर ज़ूम इन नहीं कर सकते."</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"बड़ा करने की सुविधा चालू होने पर, फटाफट बड़ा करने के लिए स्क्रीन के नीचे दिए गए सुलभता बटन का इस्तेमाल करें.\n\n"<b>"ज़ूम करने के लिए"</b>", सुलभता बटन पर टैप करें, फिर स्क्रीन पर कहीं भी टैप करें.\n"<ul><li>"स्क्रोल करने के लिए 2 या उससे ज़्यादा अंगुलियां खींचें"</li>\n<li>"ज़ूम को कम या ज़्यादा करने के लिए 2 या उससे ज़्यादा अंगुलियों से पिंच करें"</li></ul>\n\n<b>"थोड़े समय तक ज़ूम करने के लिए"</b>", सुलभता बटन पर टैप करें, फिर स्क्रीन पर कहीं भी छुएं और दबाकर रखें.\n"<ul><li>"स्क्रीन पर इधर-उधर ले जाने के लिए खींचें"</li>\n<li>"ज़ूम आउट करने के लिए उंगली उठाएं"</li></ul>\n\n"आप कीबोर्ड या नेविगेशन बार पर ज़ूम इन नहीं कर सकते."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"सुलभता बटन <xliff:g id="SERVICE">%1$s</xliff:g> पर सेट है. बड़ा करने के लिए, सुलभता बटन को दबाकर रखें, फिर बड़ा करना चुनें."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"सरल उपयोग शॉर्टकट"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"वॉल्यूम कुंजी शॉर्टकट"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"शॉर्टकट सेवा"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"लॉक स्क्रीन से अनुमति दें"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"शॉर्टकट चालू होने पर, दोनों वॉल्यूम बटनों को 3 सेकंड तक दबाए रखकर आप किसी सुलभता सेवा को चालू कर सकते हैं."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"शॉर्टकट चालू होने पर, आप किसी सुलभता सेवा को शुरू करने के लिए दोनों वॉल्यूम कुंजियों को 3 सेकंड तक दबाए रख सकते हैं."</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">"स्क्रीन को बड़ा करने की सुविधा को अपने आप अपडेट करें"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"एेप ट्रांज़िशन पर स्क्रीन को बड़ा दिखाना अपडेट करें"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"डिसप्ले पर असर पड़ सकता है"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"पॉइंटर के रुकने के बाद क्लिक करें"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"क्लिक करने से पहले का विलंब"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"चालू"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"बंद"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"त्वरित सेटिंग में दिखाएं"</string>
@@ -2351,13 +2356,14 @@
     <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"गलत पैटर्न"</string>
     <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"गलत पासवर्ड"</string>
     <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"गलत पिन"</string>
-    <string name="checking_decryption" msgid="8287458611802609493">"जांच की जा रही है..."</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"जाँच की जा रही है..."</string>
     <string name="starting_android" msgid="4001324195902252681">"Android प्रारंभ किया जा रहा है..."</string>
     <string name="delete" msgid="4219243412325163003">"मिटाएं"</string>
     <string name="misc_files" msgid="6720680815969643497">"विविध फ़ाइलें"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g> में से <xliff:g id="NUMBER">%1$d</xliff:g> चयनित"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g> में से <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"सभी को चुनें"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"योजनाएं प्रबंधित करें"</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>
@@ -2423,7 +2429,7 @@
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"सेट करें"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"डेटा खर्च की चेतावनी सेट करें"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"डेटा खर्च की सीमा सेट करें"</string>
-    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"डेटा र्खच सीमित करना"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"डेटा खर्च सीमित करना"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"जैसे ही आपका टैबलेट डेटा, आपकी सेट की हुई सीमा पर पहुंचेगा, आपका टैबलेट उसे बंद कर देगा.\n\nचूंकि डेटा खर्च आपके टैबलेट से मापा जाता है और आपकी मोबाइल और इंटरनेट सेवा देने वाली कंपनी, इस्तेमाल किए गए डेटा का हिसाब अलग तरीके से लगा सकती है. इसलिए सीमा को कम पर सेट करने के बारे में विचार करें."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"जैसे ही आपका मोबाइल डेटा आपकी सेट की हुई सीमा पर पहुंचेगा, आपका फ़ोन उसे बंद कर देगा.\n\nचूंकि डेटा खर्च आपके फ़ोन से मापा जाता है और आपकी मोबाइल और इंटरनेट सेवा देने वाली कंपनी, इस्तेमाल किए गए डेटा का हिसाब अलग तरीके से लगा सकती है. इसलिए सीमा को कम पर सेट करने के बारे में विचार करें."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"पृष्ठभूमि डेटा प्रतिबंधित करें?"</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"मोबाइल नेटवर्क"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"बिल किए गए वाई-फ़ाई नेटवर्क"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"बिल किए जाने वाले नेटवर्क चुनने के लिए, वाई-फ़ाई चालू करें."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"ऑटोमैटिक"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"बिल किया गया"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"बिल नहीं किया गया"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"डेटा खर्च को लेकर मोबाइल और इंटरनेट सेवा देने वाली कंपनी का हिसाब आपके डिवाइस के हिसाब से अलग हो सकता है."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"आपातकालीन कॉल"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"कॉल पर वापस लौटें"</string>
@@ -2509,7 +2518,7 @@
     <string name="vpn_no_network" msgid="3050233675132726155">"कोई नेटवर्क कनेक्शन नहीं है. कृपया बाद में पुन: प्रयास करें."</string>
     <string name="vpn_disconnected" msgid="280531508768927471">"VPN से डिसकनेक्ट किया गया"</string>
     <string name="vpn_disconnected_summary" msgid="3082851661207900606">"कोई नहीं"</string>
-    <string name="vpn_missing_cert" msgid="5357192202207234745">"एक प्रमाणपत्र मौजूद नहीं है. प्रोफ़ाइल संपादित करके देखें."</string>
+    <string name="vpn_missing_cert" msgid="5357192202207234745">"एक प्रमाणपत्र मौजूद नहीं है. प्रोफ़ाइल में बदलाव करके देखें."</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>
@@ -2527,7 +2536,7 @@
     <string name="user_credential_title" msgid="1954061209643070652">"क्रेडेंशियल की पूरी जानकारी"</string>
     <string name="user_credential_removed" msgid="6514189495799401838">"क्रेडेंशियल निकाला गया: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
     <string name="user_credential_none_installed" msgid="3729607560420971841">"कोई यूज़र क्रेडेंशियल इंस्टॉल नहीं है"</string>
-    <string name="spellcheckers_settings_title" msgid="399981228588011501">"शब्द जांच"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"शब्द जाँच"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"अपना वर्तमान पूर्ण बैकअप पासवर्ड यहां लिखें"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"पूर्ण बैकअप के लिए यहां नया पासवर्ड लिखें"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"यहां अपना नया पूर्ण बैकअप पासवर्ड फिर से लिखें"</string>
@@ -2553,8 +2562,8 @@
     </plurals>
     <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="other">प्रमाणपत्रों की जांच करें</item>
+      <item quantity="one">प्रमाणपत्रों की जाँच करें</item>
+      <item quantity="other">प्रमाणपत्रों की जाँच करें</item>
     </plurals>
     <string name="user_settings_title" msgid="6151874007858148344">"उपयोगकर्ता"</string>
     <string name="user_list_title" msgid="7937158411137563543">"उपयोगकर्ता और प्रोफ़ाइल"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"कॉल प्रबंधक"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"आपातकालीन प्रसारण"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"आपातकालीन सूचनाएं"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"नेटवर्क ऑपरेटर"</string>
     <string name="access_point_names" msgid="1381602020438634481">"एक्सेस पॉइंट का नाम"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"बेहतर 4G LTE मोड"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"इसके लिए पसंदीदा सिम"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"हर बार पूछें"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"चयन आवश्यक है"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"सिम का चुनाव"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"सेटिंग"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="one">छिपे हुए %d आइटम दिखाएं</item>
@@ -2840,7 +2850,7 @@
     <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="5105443455143476201">"परेशान न करें के नियम सेट करें"</string>
-    <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"निश्चित समय पर ध्वनियों और कंपनों को सीमित करें"</string>
+    <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"तय समय पर आवाज़ और वाइब्रेशन को सीमित करें"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"सिर्फ़ प्राथमिकता"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"केवल अलार्म"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"पूरी तरह शांत"</string>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"ऐप सूचनाएं"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"सूचना की श्रेणी"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"महत्‍व"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"ऐप्लिकेशन को तय करने दें"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"आवाज़ की अनुमति दें"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"सूचनाएं कभी न दिखाएं"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ध्वनि या दृश्य संबंधी कोई रुकावट नहीं"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"कोई ध्वनि नहीं"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"ध्वनि करें"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"ध्वनि करें और स्क्रीन पर दिखाएं"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"स्क्रीन पर दिखाएं"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"कम"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"मध्यम"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"उच्च"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"बहुत ज़रूरी"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"ध्वनि की अनुमति दें"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"मौजूद स्क्रीन पर इन सूचनाओं के लिए न तो आवाज़ करें, ना कंपन करें और ना ही झलक दिखाएं."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"रुकावटों की अनुमति दें"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"ऐप को आवाज़, थरथराहट (वाइब्रेशन) करने दें और/या स्क्रीन पर सूचना नई विंडो में खुलने दें"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"कम महत्व"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"मध्यम महत्व"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"बहुत अधिक महत्व"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"पीआईपी तस्वीर डालें"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"पिक्चर में पिक्चर"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"पिक्चर में पिक्चर बनाने की अनुमति दें"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"ऐप के खुले होने पर या आपके उसे छोड़ देने के बाद, उस ऐप को पिक्चर में पिक्चर बनाने की अनुमति दें (उदाहरण के लिए, कोई वीडियो देखते रहने के लिए). यह विंडो उन दूसरे ऐप्लिकेशन के ऊपर दिखाई देती है जिनका आप उपयोग कर रहे हैं."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"ऐप के खुले होने पर या आपके उसे छोड़ देने के बाद, उस ऐप को पिक्चर में पिक्चर बनाने की अनुमति दें (उदाहरण के लिए, कोई वीडियो देखते रहने के लिए). यह विंडो उन दूसरे ऐप्लिकेशन के ऊपर दिखाई देती है जिनका आप उपयोग कर रहे हैं."</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>
@@ -3206,7 +3217,7 @@
     <string name="share_remote_bugreport_dialog_message_finished" msgid="4973886976504823801">"आपके आईटी एडमिन ने इस डिवाइस की समस्या हल करने में मदद के लिए एक गड़बड़ी की रिपोर्ट का अनुरोध किया है. ऐप्लिकेशन और डेटा को शेयर किया जा सकता है."</string>
     <string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"आपके आईटी एडमिन ने इस डिवाइस की समस्या को हल करने में सहायता के लिए एक गड़बड़ी की रिपोर्ट का अनुरोध किया है. ऐप्लिकेशन और डेटा को शेयर किया जा सकता है और आपका डिवाइस कुछ देर के लिए धीमा हो सकता है."</string>
     <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"यह गड़बड़ी की रिपोर्ट आपके आईटी एडमिन से शेयर की जा रही है. और जानकारी के लिए उनसे संपर्क करें."</string>
-    <string name="share_remote_bugreport_action" msgid="532226159318779397">"साझा करें"</string>
+    <string name="share_remote_bugreport_action" msgid="532226159318779397">"शेयर करें"</string>
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"अस्वीकार करें"</string>
     <string name="usb_use_charging_only" msgid="2180443097365214467">"इस डिवाइस को चार्ज करें"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"केवल इस डिवाइस को चार्ज करें"</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"फ़ाइलें स्थानान्तरित करना"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"फ़ोटो स्थानान्तरित करना (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"डिवाइस का उपयोग MIDI के रूप में करना"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"मैसेज (एसएमएस) नकल"</string>
     <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>
@@ -3252,7 +3264,7 @@
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> ऐप्स द्वारा पिछले <xliff:g id="DURATION_1">%2$s</xliff:g> में उपयोग की गई मेमोरी</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ऐप्स द्वारा पिछले <xliff:g id="DURATION_1">%2$s</xliff:g> में उपयोग की गई मेमोरी</item>
     </plurals>
-    <string name="running_frequency" msgid="6622624669948277693">"आवृत्ति"</string>
+    <string name="running_frequency" msgid="6622624669948277693">"फ़्रीक्वेंसी"</string>
     <string name="memory_maximum_usage" msgid="6513785462055278341">"अधिकतम उपयोग"</string>
     <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>
@@ -3337,7 +3349,7 @@
     <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_off_summary" msgid="6474350053215707957">"बंद"</string>
-    <string name="backup_disabled" msgid="485189128759595412">"बैक अप अक्षम किया गया"</string>
+    <string name="backup_disabled" msgid="485189128759595412">"बैक अप बंद किया गया"</string>
     <string name="about_summary" msgid="924181828102801010">"Android <xliff:g id="VERSION">%1$s</xliff:g> में अपडेट किया गया"</string>
     <string name="disabled_by_policy_title" msgid="627023216027648534">"कार्रवाई की अनुमति नहीं"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="7399450998356045023">"वॉल्यूम बदला नहीं जा सकता"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"नाइट लाइट शेड्यूल सेट करें"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"टिंट स्क्रीन एम्बर की मदद से आप सो जाते हैं"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"नाइट लाइट चालू है"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"स्क्रीन हल्की एम्बर है. इससे आपको नींद आने में सहायता मिल सकती है."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"सुझाव"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"डिसप्ले में हलके रंगों का इस्तेमाल करें"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"रंग बदलाव लागू करने के लिए, स्‍क्रीन बंद करें"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"टेलीफ़ोनी मॉनिटर बदलाव लागू करने के लिए, डिवाइस को रीबूट करें"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"कैमरा HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"कैमरा HAL HDR+ में किये गए बदलाव लागू करने के लिए, डिवाइस को फिर से चालू करें"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"कैमरा लेज़र सेंसर"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"स्वचालित सिस्टम अपडेट"</string>
     <string name="usage" msgid="2977875522080448986">"उपयोग"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"मोबाइल डेटा खर्च"</string>
@@ -3410,7 +3427,7 @@
     <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_2">%2$s</xliff:g> के बीच <xliff:g id="ID_1">%1$s</xliff:g> का उपयोग किया गया"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g> तक <xliff:g id="ID_1">%1$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">
@@ -3431,15 +3448,15 @@
     <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"अपना डिवाइस चालू करने के लिए पिन ज़रूरी बनाएं. बंद होने पर, यह डिवाइस कॉल, मैसेज, नोटिफिकेशन, या अलार्म नहीं पा सकता."</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="5471253233176471245">"किसी दूसरी अंगुली से अनलॉक करें"</string>
+    <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"किसी दूसरी उंगली से अनलॉक करें"</string>
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"चालू / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_off_summary" msgid="8309471955051162327">"बंद / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"कभी अपने आप चालू ना करें"</string>
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"%1$s बैटरी शेष रहने पर अपने आप चालू करें"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"बैटरी ऑप्टिमाइज़ेशन का उपयोग नहीं कर रहा है"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"अगर डिवाइस लॉक है, तो सूचनाओं का जवाब या अन्य लेख लिखने से रोकें"</string>
-    <string name="default_spell_checker" msgid="8506899870026026660">"डिफ़ॉल्ट वर्तनी-जांचकर्ता"</string>
-    <string name="choose_spell_checker" msgid="6596539862291699367">"वर्तनी-जांचकर्ता चुनें"</string>
+    <string name="default_spell_checker" msgid="8506899870026026660">"डिफ़ॉल्ट वर्तनी-जाँचकर्ता"</string>
+    <string name="choose_spell_checker" msgid="6596539862291699367">"वर्तनी-जाँचकर्ता चुनें"</string>
     <string name="spell_checker_not_selected" msgid="8871083796179200696">"नहीं चुना गया"</string>
     <string name="notification_log_no_title" msgid="5678029849672024215">"(कुछ नहीं)"</string>
     <string name="notification_log_details_delimiter" msgid="3116559361552416747">": "</string>
@@ -3447,7 +3464,7 @@
     <string name="notification_log_details_key" msgid="2995791937075862968">"कुंजी"</string>
     <string name="notification_log_details_group" msgid="2430467015200368698">"समूह"</string>
     <string name="notification_log_details_group_summary" msgid="7945543958255585829">"(सारांश)"</string>
-    <string name="notification_log_details_visibility" msgid="2552873780715930971">"दृश्यता"</string>
+    <string name="notification_log_details_visibility" msgid="2552873780715930971">"कैसा दिखाई दे"</string>
     <string name="notification_log_details_public_version" msgid="4247242364605495240">"publicVersion"</string>
     <string name="notification_log_details_priority" msgid="8371354971235991398">"प्राथमिकता"</string>
     <string name="notification_log_details_importance" msgid="2153168790791683139">"महत्व"</string>
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"वाइप करें और रूपांतरित करें"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager दर सीमित करना रीसेट करें"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager दर सीमित करना रीसेट कर दिया गया है"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"लॉक स्क्रीन सूचना नियंत्रित करें"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"लॉक स्क्रीन पर मौजूद जानकारी नियंत्रित करें"</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="8483187649355540109">"सहायता और सलाह"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"इंस्टॉल किए गए किसी भी ऐप ने प्रीमियम मैसेज (एसएमएस) की पहुंच का अनुरोध नहीं किया है"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"प्रीमियम मैसेज (एसएमएस) के लिए आपको पैसे देने पड़ सकते हैं और इससे आपकी मोबाइल और इंटरनेट सेवा देने वाली कंपनी का बिल बढ़ जाएगा. अगर आप किसी ऐप के लिए अनुमति देते हैं, तो आप उस ऐप का इस्तेमाल करके प्रीमियम मैसेज (एसएमएस) भेज सकते हैं."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"प्रीमियम मैसेज (एसएमएस) की पहुंच"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"दूसरे डिवाइसों को दिखाई नहीं देता"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"बंद"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> से कनेक्‍ट है"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"कई डिवाइस से कनेक्ट है"</string>
     <string name="demo_mode" msgid="2798762752209330277">"सिस्टम यूज़र इंटरफ़ेस (यूआई) डेमो मोड"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"झटपट ऐप्स"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"सभी लिंक एप्लिकेशन में खोलें, भले ही वे इंस्टॉल न हों"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"झटपट ऐप्स"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"झटपट ऐप्स खाता"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"झटपट ऐप प्राथमिकताएं"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"इंस्‍टॉल किए गए ऐप्‍लिकेशन"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"आपकी जगह का प्रबंधन अब जगह प्रबंधक द्वारा किया जा रहा है"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> के खाते"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"आपकी व्यक्तिगत प्रोफ़ाइल में हमेशा-चालू VPN चालू है"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"आपकी कार्य प्रोफ़ाइल में हमेशा-चालू VPN चालू है"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"वैश्विक HTTP प्रॉक्सी सेट है"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"भरोसेमंद क्रेडेंशियल"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"भरोसेमंद क्रेडेंशियल"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"आपकी निजी प्रोफ़ाइल में मौजूद भरोसेमंद क्रेडेंशियल"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"आपकी कार्य प्रोफ़ाइल में मौजूद भरोसेमंद क्रेडेंशियल"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">कम से कम <xliff:g id="COUNT_1">%d</xliff:g> CA प्रमाणपत्र</item>
       <item quantity="other">कम से कम <xliff:g id="COUNT_1">%d</xliff:g> CA प्रमाणपत्र</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी की नेटवर्क से जुड़ी जानकारी"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी का नेटवर्क ट्रिगर करें"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"नया और रोमांचक क्या है?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"प्रमुख 5 सुविधाएं देखें"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"अपने नए फ़ोन के बारे में अच्छी तरह जानें"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"अपने नए टैबलेट के बारे में अच्छी तरह जानें"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"अपने नए डिवाइस के बारे में अच्छी तरह जानें"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"यह सुविधा इस डिवाइस पर उपलब्ध नहीं है"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS रजिस्ट्रेशन की स्थिति"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"रजिस्टर है"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"रजिस्टर नहीं है"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 7ff503f..ecf7257 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -167,7 +167,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s želi pristupiti vašim porukama. Želite li dati pristup korisniku %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Zahtjev za pristup SIM-u"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> želi pristupiti SIM kartici. Dopuštanjem pristupa SIM kartici onemogućit će se podatkovna veza na uređaju za vrijeme povezanosti. Dopustite pristup uređaju <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Drugim uređajima vidljiv kao \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\""</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Drugim uređajima vidljiv kao \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\""</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaši uređaji"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Uparivanje novog uređaja"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum i vrijeme"</string>
@@ -375,6 +375,9 @@
     <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="1961957425135180242">"Dalje"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Želite li preskočiti otisak prsta?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Postavljanje otisaka prstiju traje samo jednu ili dvije minute. Ako to preskočite, otiske prstiju možete dodati kasnije u postavkama."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Želite li preskočiti zaključavanje zaslona?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Značajke za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge da upotrebljavaju ovaj tablet u slučaju gubitka, krađe ili vraćanja na zadano."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Značajke za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge da upotrebljavaju ovaj uređaj u slučaju gubitka, krađe ili vraćanja na zadano."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Značajke za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge da upotrebljavaju ovaj telefon u slučaju gubitka, krađe ili vraćanja na zadano."</string>
@@ -414,6 +417,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Dodali ste maksimalan broj otisaka prstiju"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Nije moguće dodati više otisaka prstiju"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Želite ukloniti sve otiske prstiju?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Uklanjanje otiska prsta \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\""</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Želite li izbrisati taj otisak prsta?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Nećete moći otiskom prsta otključati telefon, autorizirati kupnje niti se prijaviti u aplikacije"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Nećete moći otiskom prsta otključati radni profil, autorizirati kupnje niti se prijaviti u aplikacije za posao"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Da, ukloni"</string>
@@ -458,7 +463,7 @@
     <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 telefon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Za dodatnu sigurnost postavite pričuvno zaključavanje zaslona."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Za dodatnu sigurnost postavite pričuvno zaključavanje zaslona."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Aktivirajte značajke zaštite uređaja kako biste onemogućili drugima da upotrebljavaju ovaj tablet bez vašeg dopuštenja. Odaberite zaključavanje zaslona koje želite upotrebljavati."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Aktivirajte značajke zaštite uređaja kako biste onemogućili drugima da upotrebljavaju ovaj uređaj bez vašeg dopuštenja. Odaberite zaključavanje zaslona koje želite upotrebljavati."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Aktivirajte značajke zaštite uređaja kako biste onemogućili drugima da upotrebljavaju ovaj telefon bez vašeg dopuštenja. Odaberite zaključavanje zaslona koje želite upotrebljavati."</string>
@@ -500,37 +505,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Želite li ukloniti zaštitu uređaja?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Želite li ukloniti zaštitu profila?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Značajke zaštite uređaja neće funkcionirati bez uzorka."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Značajke zaštite uređaja neće funkcionirati bez uzorka.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Značajke zaštite uređaja neće funkcionirati bez uzorka.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>S uređaja će se ukloniti i spremljeni otisci prsta i nećete moći otključati telefon, autorizirati kupnje ili se prijaviti na aplikacije pomoću njih."</string>
+</xliff:g>S uređaja će se ukloniti i spremljeni otisci prstiju i nećete moći otključati telefon, autorizirati kupnje niti se prijaviti u aplikacije pomoću njih."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Značajke zaštite uređaja neće funkcionirati bez PIN-a."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Značajke zaštite uređaja neće funkcionirati bez PIN-a.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Značajke zaštite uređaja neće funkcionirati bez PIN-a.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>S uređaja će se ukloniti i spremljeni otisci prsta i nećete moći otključati telefon, autorizirati kupnje ili se prijaviti na aplikacije pomoću njih."</string>
+</xliff:g>S uređaja će se ukloniti i spremljeni otisci prstiju i nećete moći otključati telefon, autorizirati kupnje niti se prijaviti u aplikacije pomoću njih."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Značajke zaštite uređaja neće funkcionirati bez zaporke."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Značajke zaštite uređaja neće funkcionirati bez zaporke.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Značajke zaštite uređaja neće funkcionirati bez zaporke.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>S uređaja će se ukloniti i spremljeni otisci prsta i nećete moći otključati telefon, autorizirati kupnje ili se prijaviti na aplikacije pomoću njih."</string>
+</xliff:g>S uređaja će se ukloniti i spremljeni otisci prsta i nećete moći otključati telefon, autorizirati kupnje niti se prijaviti u aplikacije pomoću njih."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Značajke zaštite uređaja neće funkcionirati bez zaključavanja zaslona."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Značajke zaštite uređaja neće funkcionirati bez zaključavanja zaslona.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Značajke zaštite uređaja neće funkcionirati bez zaključavanja zaslona.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>S uređaja će se ukloniti i spremljeni otisci prsta i nećete moći otključati telefon, autorizirati kupnje ili se prijaviti na aplikacije pomoću njih."</string>
+</xliff:g>S uređaja će se ukloniti i spremljeni otisci prstiju i nećete moći otključati telefon, autorizirati kupnje niti se prijaviti u aplikacije pomoću njih."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Značajke za zaštitu profila neće funkcionirati bez uzorka."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Značajke za zaštitu profila neće funkcionirati bez uzorka.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Značajke zaštite profila neće funkcionirati bez uzorka.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>S profila će se ukloniti i spremljeni otisci prstiju i nećete ih moći upotrebljavati za otključavanje profila, autoriziranje kupnji niti za prijavljivanje na aplikacije."</string>
+</xliff:g>S profila će se ukloniti i spremljeni otisci prstiju i nećete moći otključati profil, autorizirati kupnje niti se prijaviti u aplikacije pomoću njih."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Značajke za zaštitu profila neće funkcionirati bez PIN-a."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Značajke za zaštitu profila neće funkcionirati bez PIN-a.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Značajke zaštite profila neće funkcionirati bez PIN-a.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>S profila će se ukloniti i spremljeni otisci prstiju i nećete ih moći upotrebljavati za otključavanje profila, autoriziranje kupnji niti za prijavljivanje na aplikacije."</string>
+</xliff:g>S profila će se ukloniti i spremljeni otisci prstiju i nećete moći otključati profil, autorizirati kupnje niti se prijaviti u aplikacije pomoću njih."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Značajke za zaštitu profila neće funkcionirati bez zaporke."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Značajke za zaštitu profila neće funkcionirati bez zaporke.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Značajke zaštite profila neće funkcionirati bez zaporke.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>S profila će se ukloniti i spremljeni otisci prstiju i nećete ih moći upotrebljavati za otključavanje profila, autoriziranje kupnji niti za prijavljivanje na aplikacije."</string>
+</xliff:g>S profila će se ukloniti i spremljeni otisci prstiju i nećete moći otključati profil, autorizirati kupnje niti se prijaviti u aplikacije pomoću njih."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Značajke za zaštitu profila neće funkcionirati bez zaključavanja zaslona."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Značajke za zaštitu profila neće funkcionirati bez zaključavanja zaslona.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Značajke zaštite profila neće funkcionirati bez zaključavanja zaslona.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>S profila će se ukloniti i spremljeni otisci prstiju i nećete ih moći upotrebljavati za otključavanje profila, autoriziranje kupnji niti za prijavljivanje na aplikacije."</string>
+</xliff:g>S profila će se ukloniti i spremljeni otisci prstiju i nećete moći otključati profil, autorizirati kupnje niti se prijaviti u aplikacije pomoću njih."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Da, ukloni"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Izmijeni uzorak za otključavanje"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Promijeni PIN za otključavanje"</string>
@@ -595,6 +600,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Uzastopno rastući ili padajući slijed brojeva ili ponavljanje brojeva nije dopušteno"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"U redu"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Odustani"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Izbriši"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Odustani"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Dalje"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Postavljanje je završeno."</string>
@@ -827,6 +833,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS dostupan"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS dostupan)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Unesite mrežnu zaporku"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Wi‑Fi mreža mobilnog operatera"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Povežite se putem mreže <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Radi poboljšanja preciznosti lokacije kao i u druge svrhe aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> želi uključiti pregledavanje mreže, čak i kada je Wi-Fi isključen.\n\nŽelite li to dozvoliti za sve aplikacije koje žele izvoditi pregledavanje?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Isključite putem opcije Napredno na dodatnom izborniku."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Dopusti"</string>
@@ -844,6 +852,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Poveži"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Povezivanje s mrežom nije uspjelo"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Zaboravi"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Izmijeni"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Zaboravljanje mreže nije uspjelo"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Spremi"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Spremanje mreže nije uspjelo"</string>
@@ -857,6 +866,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Napredni Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC adresa"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP adresa"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Informacije o mreži"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska podmreže"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 adrese"</string>
@@ -889,16 +899,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Otkazati pozivnicu?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Želite li otkazati pozivnicu za povezivanje s korisnikom <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Zaboraviti ovu grupu?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Prijenosna Wi-Fi žarišna točka"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi žarišna točka"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Internetska veza i sadržaj ne dijele se s drugim uređajima"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Internetska veza ovog tableta dijeli se putem žarišne točke"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Internetska veza ovog telefona dijeli se putem žarišne točke"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplikacija dijeli sadržaj. Da biste dijelili internetsku vezu, isključite žarišnu točku, a zatim je ponovo uključite"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Naziv Wi‑Fi-ja"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Naziv žarišne točke"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Uključivanje žarišne točke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Drugi uređaji mogu se povezati sa žarišnom točkom <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Zaporka za Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Zaporka žarišne točke"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Frekvencija pristupne točke"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Upotrijebite žarišnu točku da biste izradili Wi‑Fi mrežu za ostale uređaje. Žarišna točka omogućuje povezivanje s internetom putem podatkovne veze vašeg mobilnog uređaja. Mogući su dodatni troškovi za prijenos podataka na mobilnom uređaju."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikacije mogu izraditi žarišnu točku radi dijeljenja sadržaja s uređajima u blizini."</string>
@@ -950,7 +959,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Adresa koju hitne službe upotrebljavaju kao vašu lokaciju ako uputite hitni poziv putem Wi‑Fi-ja"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Prikaz"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Glasnoća"</string>
@@ -1004,6 +1013,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Pretraži"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Upravljajte postavkama pretraživanja i poviješću"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nema rezultata"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Izbriši povijest"</string>
     <string name="display_settings" msgid="7965901687241669598">"Prikaz"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Automatski zakreni zaslon"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Žive boje"</string>
@@ -1337,8 +1347,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Vraćanje zadanih APN postavki"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Vrati na zadano"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Poništavanje zadanih postavki APN-a dovršeno."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Vraćanje na zadano"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Poništ. post. mreže"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Poništavanje opcija"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Mreža, aplikacije ili uređaj mogu se poništiti"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Poništi Wi-Fi, mobilnu mrežu i Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Ovime će se poništiti sve postavke mreže, uključujući:\n\n"<li>"Wi‑Fi"</li>\n<li>"mobilne podatke"</li>\n<li>"Bluetooth."</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Poništi postavke"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Želite li vratiti sve postavke mreže na zadano? Tu radnju nije moguće poništiti!"</string>
@@ -1346,13 +1357,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Poništiti?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Vraćanje mreže na zadano nije dostupno za ovog korisnika"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Postavke mreže vraćene su na zadano."</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Povrat na tvorn. post."</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> račun vratit će se na zadano</item>
-      <item quantity="few"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> računa vratit će se na zadano</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> računa vratit će se na zadano</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Interna pohrana i svi podaci vratit će se na zadano"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Izbriši sve podatke (vraćanje na tvorničke postavke)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"To će izbrisati sve podatke s "<b>"unutarnje pohrane"</b>" tabletnog računala, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sustava i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"To će izbrisati sve podatke s "<b>"unutarnje pohrane"</b>" telefona, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sustava i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutačno ste prijavljeni na sljedeće račune:\n"</string>
@@ -1476,15 +1481,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Sigurnosne informacije"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nemate podatkovnu vezu. Da biste tu informaciju vidjeli sada, idite na stranicu %s s bilo kojeg računala povezanog s internetom."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Učitavanje…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Odaberite zaporku"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Postavljanje zaključavanja zaslona"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Radi sigurnosti postavite zaporku"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Otisak prsta zahtijeva zaporku"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Odaberite uzorak"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Otisak prsta zahtijeva uzorak"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Odaberite PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Radi sigurnosti postavite PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Otisak prsta zahtijeva PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Potvrdite zaporku"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Ponovni unos zaporke"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrdite uzorak"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Potvrdite svoj PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Ponovni unos PIN-a"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Zaporke se ne podudaraju"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-ovi se ne podudaraju"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Odabir načina otključavanja"</string>
@@ -1497,12 +1503,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Unesite uzorak radnog profila da biste nastavili"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Unesite PIN radnog profila da biste nastavili"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Unesite zaporku radnog profila da biste nastavili"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Unesite uzorak uređaja da biste nastavili. To je obavezno nakon ponovnog pokretanja uređaja."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Unesite PIN uređaja da biste nastavili. To je obavezno nakon ponovnog pokretanja uređaja."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Unesite zaporku uređaja da biste nastavili. To je obavezno nakon ponovnog pokretanja uređaja."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Unesite radni uzorak da biste nastavili. To je obavezno nakon ponovnog pokretanja uređaja."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Unesite radni PIN da biste nastavili. To je obavezno nakon ponovnog pokretanja uređaja."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Unesite radnu zaporku da biste nastavili. To je obavezno nakon ponovnog pokretanja uređaja."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Za dodatnu sigurnost upotrijebite uzorak uređaja"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Za dodatnu sigurnost unesite PIN uređaja"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Za dodatnu sigurnost unesite zaporku uređaja"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Za dodatnu sigurnost upotrijebite uzorak radnog profila"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Za dodatnu sigurnost unesite PIN radnog profila"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Za dodatnu sigurnost unesite zaporku radnog profila"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Vaš je telefon vraćen na tvorničke postavke. Da biste ga upotrebljavali, unesite prethodni uzorak."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Vaš je telefon vraćen na tvorničke postavke. Da biste ga upotrebljavali, unesite prethodni PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Vaš je telefon vraćen na tvorničke postavke. Da biste ga upotrebljavali, unesite prethodnu zaporku."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Potvrdite uzorak"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Potvrdite PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Potvrdite zaporku"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Pogrešan PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Pogrešna zaporka"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Pogrešan uzorak"</string>
@@ -1806,13 +1818,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Želite izraditi widget i dozvoliti pristup?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Kada izradite widget, aplikacija <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> može pristupiti svim podacima koje taj widget prikazuje."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Uvijek dopusti aplikaciji <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> izradu widgeta i pristupanje njihovim podacima"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> min <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g>min <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> min"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Korisnička statistika"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Korisnička statistika"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Poredati prema:"</string>
@@ -1824,7 +1829,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Čitači zaslona, zaslon, kontrole interakcije"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Postavke za vid"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Ovaj uređaj možete prilagoditi svojim potrebama. Značajke pristupačnosti možete promijeniti kasnije u postavkama."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Povećajte veličinu fonta"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Promjena veličine fonta"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Čitači zaslona"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio i tekst na zaslonu"</string>
     <string name="display_category_title" msgid="685461049938269166">"Zaslon"</string>
@@ -1845,10 +1850,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Da biste zumirali"</b>", brzo dodirnite zaslon tri puta.\n"<ul><li>"Povlačite s dva prsta ili više njih da biste se pomicali"</li>\n<li>"Spojite dva prsta ili više njih da biste prilagodili zumiranje"</li></ul>\n\n<b>"Da biste privremeno zumirali"</b>", brzo dodirnite zaslon tri puta i zadržite prst dolje nakon trećeg dodira.\n"<ul><li>"Povlačite prstom da biste se kretali zaslonom"</li>\n<li>"Podignite prst da biste smanjili prikaz"</li></ul>\n\n"Tipkovnica i navigacijska traka ne mogu se povećati."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Kad je povećavanje uključeno, upotrijebite gumb Pristupačnost na dnu zaslona za brzo povećavanje.\n\n"<b>"Da biste zumirali"</b>", dodirnite gumb Pristupačnost, a zatim dodirnite bilo gdje na zaslonu.\n"<ul><li>"Povlačite s dva prsta ili više njih da biste se pomicali"</li>\n<li>"Spojite dva prsta ili više njih da biste prilagodili zumiranje"</li></ul>\n\n<b>"Da biste privremeno zumirali"</b>", dodirnite gumb Pristupačnost, a zatim dodirnite i zadržite bilo gdje na zaslonu.\n"<ul><li>"Povlačite prstom da biste se kretali zaslonom"</li>\n<li>"Podignite prst da biste smanjili prikaz"</li></ul>\n\n"Tipkovnica i navigacijska traka ne mogu se povećati."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Gumb Pristupačnost postavljen je na <xliff:g id="SERVICE">%1$s</xliff:g>. Da biste upotrijebili povećanje, dodirnite i zadržite gumb Pristupačnost i zatim odaberite povećanje."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Prečac pristupačnosti"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Prečac tipki za glasnoću"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Usluga prečaca"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Dopusti sa zaključanog zaslona"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Kad je taj prečac uključen, možete na tri sekunde pritisnuti oba gumba za glasnoću kako biste pokrenuli značajku prisupačnosti."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Kad je taj prečac uključen, možete na tri sekunde pritisnuti obje tipke za glasnoću kako biste pokrenuli značajku pristupačnosti."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Tekst s visokim kontrastom"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Autom. ažuriranje uvećanja zaslona"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Ažuriranje uvećanja zaslona pri izmjeni aplikacija"</string>
@@ -1861,7 +1866,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Može utjecati na izvedbu"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klik kad se pokazivač zaustavi"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Odgoda prije klika"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"UKLJUČENO"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ISKLJUČENO"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Prikaži u Brzim postavkama"</string>
@@ -2380,6 +2384,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"odabrano <xliff:g id="NUMBER">%1$d</xliff:g> od <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> od <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Odaberi sve"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Upravljaj planovima"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Potrošnja podataka"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Upotreba podataka za apl."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Mobilni operater može obračunavati podatke na drugačiji način od uređaja."</string>
@@ -2465,6 +2470,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilne mreže"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Wi-Fi mreže s naplatom"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Da biste odabrali mreže s naplatom, uključite Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatski"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"S naplatom prijenosa"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Bez naplate prijenosa"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Mobilni operater može obračunavati podatke na drugačiji način od uređaja."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Hitni poziv"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Vrati se na poziv"</string>
@@ -2686,7 +2694,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Upravitelj poziva"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Hitna emitiranja"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Poruke upozorenja"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Mrežni operateri"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Pristupne točke"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Poboljšan 4G LTE način"</string>
@@ -2755,6 +2763,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Željeni SIM za"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Pitaj svaki put"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Potreban je odabir"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Odabir SIM-a"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Postavke"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="one">Prikaži %d skrivenu stavku</item>
@@ -2908,18 +2917,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Obavijesti aplikacije"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategorija obavijesti"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Važnost"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Neka odluči aplikacija"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Dopusti zvuk"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nikad ne prikazuj obavijesti"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Bez zvučnog ili vizualnog ometanja"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Bez zvuka"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Reproduciraj zvuk"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Reproduciraj zvuk i prikaži na zaslonu"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Skočni zaslon"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Niska"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Srednja"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Visoka"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Hitna"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Dopusti zvuk"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Nemoj emitirati zvuk, vibrirati niti prikazivati obavijesti na trenutačnom zaslonu."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Dopusti ometanja"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Aplikacija može emitirati zvuk, vibrirati i/ili prikazivati obavijesti na zaslonu"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Mala važnost"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Srednja važnost"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Velika važnost"</string>
@@ -2951,7 +2961,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"slika u slici"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Slika u slici"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Dopusti sliku u slici"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Omogućite da ova aplikacija stvori prozor sa slikom u slici dok je otvorena ili kad izađete iz nje (npr. da biste nastavili gledati videozapis). Taj se prozor prikazuje iznad drugih aplikacija koje upotrebljavate."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Omogućite da ova aplikacija izradi prozor sa slikom u slici dok je otvorena ili kad izađete iz nje (npr. da biste nastavili gledati videozapis). Taj se prozor prikazuje iznad drugih aplikacija koje upotrebljavate."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Pristup opciji Ne ometaj"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nijedna instalirana aplikacija nije zatražila pristup opciji Ne ometaj"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Učitavanje aplikacija..."</string>
@@ -3264,6 +3274,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Prijenos datoteka"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Prijenos fotografija (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Upotreba uređaja kao MIDI-ja"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Zrcaljenje SMS-ova"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Provjera u pozadini"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Potpuni pristup u pozadini"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Koristi tekst sa zaslona"</string>
@@ -3408,6 +3419,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="night_display_suggestion_title" msgid="6602129097059325291">"Postavite raspored Noćnog svjetla"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Obojite zaslon žuto kako biste lakše zaspali"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Noćno je svjetlo uključeno"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Zaslon je obojen žuto. To bi vam moglo pomoći da zaspite."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Prijedlozi"</string>
@@ -3428,6 +3441,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Upotrebljavaj hladnije boje prikaza"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Da biste primijenili promjenu boje, isključite zaslon"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Da biste primijenili promjenu koju je izvršio TelephonyMonitor, ponovo pokrenite uređaj."</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HAL HDR+ fotoaparata"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Da biste primijenili promjenu HAL HDR+ fotoaparata, ponovo pokrenite uređaj"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Laserski senzor fotoaparata"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatska ažuriranja sustava"</string>
     <string name="usage" msgid="2977875522080448986">"Potrošnja"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Potrošnja mobilnih podataka"</string>
@@ -3454,7 +3470,7 @@
     <string name="data_warning" msgid="209133958008062117">"Upozorenje o potrošnji"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Postavi ograničenje potrošnje"</string>
     <string name="data_limit" msgid="1885406964934590552">"Ograničenje podataka"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"U razdoblju <xliff:g id="ID_2">%2$s</xliff:g> potrošili ste <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> iskorišteno <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfiguriraj"</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">
@@ -3525,7 +3541,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Izbriši i pretvori"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Poništi ograničavanje brzine ShortcutManagera"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Ograničavanje brzine ShortcutManagera poništeno je"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrola obavijesti zaključanog zaslona"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Upravljanje informacijama na zaključanom zaslonu"</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="8483187649355540109">"Podrška i savjeti"</string>
@@ -3533,7 +3549,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Nijedna instalirana aplikacija nije zatražila pristup premium SMS-ovima"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium SMS-ovi mogu se dodatno naplaćivati i povećat će vaš račun. Ako nekoj aplikaciji date to dopuštenje, moći ćete slati premium SMS-ove pomoću te aplikacije."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Pristup premium SMS-ovima"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Nije vidljiv drugim uređajima"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Isključeno"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Povezano s uređajem <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Povezano s više uređaja"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Demo način korisničkog sučelja sustava"</string>
@@ -3638,7 +3654,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Instant aplikacije"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Veze će se otvarati u aplikacijama čak i ako te aplikacije nisu instalirane"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Instant aplikacije"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Račun za instant aplikacije"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Postavke za Instant aplikacije"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Instalirane aplikacije"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Vašom pohranom sada upravlja upravitelj pohrane"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Računi za korisnika <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3687,7 +3703,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Uvijek uključeni VPN aktiviran je u osobnom profilu"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Uvijek uključeni VPN aktiviran je u radnom profilu"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Postavljen je globalni HTTP proxy"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Pouzdane vjerodajnice"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Pouzdane vjerodajnice"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Pouzdane vjerodajnice na vašem osobnom profilu"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Pouzdane vjerodajnice na vašem radnom profilu"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">Najmanje <xliff:g id="COUNT_1">%d</xliff:g> CA certifikat</item>
       <item quantity="few">Najmanje <xliff:g id="COUNT_1">%d</xliff:g> CA certifikata</item>
@@ -3755,7 +3773,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informacije o uslugama mobilnog operatera"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Pokretanje usluga mobilnog operatera"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Što je novo i uzbudljivo?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Pogledajte pet najboljih značajki"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Upoznajte svoj novi telefon"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Upoznajte svoj novi tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Upoznajte svoj novi uređaj"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ova značajka nije dostupna na ovom uređaju"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Stanje registracije IMS-a"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrirano"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Nije registrirano"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 0771cb0..fbcca9a 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"A(z) %1$s hozzáférést kér üzeneteihez. Biztosítja a(z) %2$s számára a hozzáférést?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM-hozzáférési kérelem"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"A következő eszköz szeretne hozzáférni az Ön SIM kártyájához: <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>. A hozzáférés megadásával letiltja eszközén az adatkapcsolatot a csatlakozás idejére. Hozzáférés megadása a következőnek: <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"A többi eszköz számára „<xliff:g id="DEVICE_NAME">^1</xliff:g>” néven jelenik meg"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"A többi eszköz számára „<xliff:g id="DEVICE_NAME">^1</xliff:g>” néven jelenik meg"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Eszközei"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Új eszköz párosítása"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Dátum és idő"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Következő"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Kihagyja az ujjlenyomatot?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Az ujjlenyomat beállítása csupán 1-2 percet vesz igénybe. Ha kihagyja ezt a lépést, később a beállításokban megadhatja ujjlenyomatát."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Kihagyja a lezárási képernyőt?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Az eszköz védelmi funkcióit nem lehet bekapcsolni. Nem fogja tudni megakadályozni, hogy mások használják a táblagépet, ha elveszett, ellopták vagy visszaállították."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Az eszköz védelmi funkcióit nem lehet bekapcsolni. Nem fogja tudni megakadályozni, hogy mások használják az eszközt, ha elveszett, ellopták vagy visszaállították."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Az eszköz védelmi funkcióit nem lehet bekapcsolni. Nem fogja tudni megakadályozni, hogy mások használják a telefont ha elveszett, ellopták vagy visszaállították."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Elérte a hozzáadható ujjlenyomatok maximális számát"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Nem lehet több ujjlenyomatot hozzáadni"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Eltávolítja az összes ujjlenyomatot?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"„<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>” eltávolítása"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Szeretné eltávolítani ezt az ujjlenyomatot?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Nem tudja majd ujjlenyomatát használni telefonja feloldásához, vásárlások engedélyezéséhez és alkalmazásokba való bejelentkezéshez."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Nem tudja majd ujjlenyomatát használni munkaprofilja feloldásához, vásárlások engedélyezéséhez és munkahelyi alkalmazásokba való bejelentkezéshez"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Igen, eltávolítom"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Óvja meg táblagépét"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Óvja meg eszközét"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Óvja meg telefonját"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"A nagyobb biztonság érdekében állítson be másodlagos képernyőzárat."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"A nagyobb biztonság érdekében állítson be másodlagos képernyőzárat."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Az eszköz védelmi funkcióinak aktiválásával megakadályozhatja, hogy mások az Ön engedélye nélkül használják a táblagépet. Válassza ki a használni kívánt képernyőlezárási módot."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Az eszköz védelmi funkcióinak aktiválásával megakadályozhatja, hogy mások az Ön engedélye nélkül használják az eszközt. Válassza ki a használni kívánt képernyőlezárási módot."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Az eszköz védelmi funkcióinak aktiválásával megakadályozhatja, hogy mások az Ön engedélye nélkül használják a telefont. Válassza ki a használni kívánt képernyőlezárási módot."</string>
@@ -497,37 +502,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Kikapcsolja az eszközvédelmet?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Eltávolítja a profilvédelmet?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Az eszközvédelmi funkciók nem működnek a minta nélkül."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Az eszközvédelmi funkciók nem működnek a minta nélkül.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Az eszközvédelmi funkciók nem működnek a minta nélkül.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>A mentett ujjlenyomatok is törlődnek az eszközről, és a segítségükkel nem fogja tudni feloldani a telefon zárolását, jóváhagyni a vásárlásokat, illetve bejelentkezni az alkalmazásokba."</string>
+</xliff:g>A mentett ujjlenyomatokat a rendszer szintén eltávolítja erről az eszközről, és Ön nem tudja majd ujjlenyomat segítségével feloldani a telefon zárolását, engedélyezni a vásárlásokat, illetve bejelentkezni az alkalmazásokba."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Az eszközvédelmi funkciók nem működnek a PIN-kód nélkül."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Az eszközvédelmi funkciók nem működnek a PIN-kód nélkül.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Az eszközvédelmi funkciók nem működnek a PIN-kód nélkül.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>A mentett ujjlenyomatok is törlődnek az eszközről, és a segítségükkel nem fogja tudni feloldani a telefon zárolását, jóváhagyni a vásárlásokat, illetve bejelentkezni az alkalmazásokba."</string>
+</xliff:g>A mentett ujjlenyomatokat a rendszer szintén eltávolítja erről az eszközről, és Ön nem tudja majd ujjlenyomat segítségével feloldani a telefon zárolását, engedélyezni a vásárlásokat, illetve bejelentkezni az alkalmazásokba."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Az eszközvédelmi funkciók nem működnek a jelszó nélkül."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Az eszközvédelmi funkciók nem működnek a jelszó nélkül.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Az eszközvédelmi funkciók nem működnek a jelszó nélkül.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>A mentett ujjlenyomatok is törlődnek az eszközről, és a segítségükkel nem fogja tudni feloldani a telefon zárolását, jóváhagyni a vásárlásokat, illetve bejelentkezni az alkalmazásokba."</string>
+</xliff:g>A mentett ujjlenyomatokat a rendszer szintén eltávolítja erről az eszközről, és Ön nem tudja majd ujjlenyomat segítségével feloldani a telefon zárolását, engedélyezni a vásárlásokat, illetve bejelentkezni az alkalmazásokba."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Az eszközvédelmi funkciók nem működnek a képernyőzár nélkül."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Az eszközvédelmi funkciók nem működnek a képernyőzár nélkül.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Az eszközvédelmi funkciók nem működnek a képernyőzár nélkül.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>A mentett ujjlenyomatok is törlődnek az eszközről, és a segítségükkel nem fogja tudni feloldani a telefon zárolását, jóváhagyni a vásárlásokat, illetve bejelentkezni az alkalmazásokba."</string>
+</xliff:g>A mentett ujjlenyomatokat a rendszer szintén eltávolítja erről az eszközről, és Ön nem tudja majd ujjlenyomat segítségével feloldani a telefon zárolását, engedélyezni a vásárlásokat, illetve bejelentkezni az alkalmazásokba."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"A profilvédelmi funkciók nem működnek a minta nélkül."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"A profilvédelmi funkciók nem működnek a minta nélkül.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"A profilvédelmi funkciók nem működnek a minta nélkül.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Mentett ujjlenyomatait a rendszer szintén eltávolítja ebből a profilból, Ön pedig nem tudja majd nélkülük feloldani profilja zárolását, engedélyezni a vásárlásokat vagy bejelentkezni az alkalmazásokba.\""</string>
+</xliff:g>A mentett ujjlenyomatokat a rendszer szintén eltávolítja ebből a profilból, és Ön nem tudja majd ujjlenyomat segítségével feloldani a profil zárolását, engedélyezni a vásárlásokat, illetve bejelentkezni az alkalmazásokba."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"A profilvédelmi funkciók nem működnek a PIN-kód nélkül."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"A profilvédelmi funkciók nem működnek a PIN-kód nélkül.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"A profilvédelmi funkciók nem működnek a PIN-kód nélkül.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Mentett ujjlenyomatait a rendszer szintén eltávolítja ebből a profilból, Ön pedig nem tudja majd nélkülük feloldani profilja zárolását, engedélyezni a vásárlásokat vagy bejelentkezni az alkalmazásokba.\""</string>
+</xliff:g>A mentett ujjlenyomatokat a rendszer szintén eltávolítja ebből a profilból, és Ön nem tudja majd ujjlenyomat segítségével feloldani a profil zárolását, engedélyezni a vásárlásokat, illetve bejelentkezni az alkalmazásokba."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"A profilvédelmi funkciók nem működnek a jelszó nélkül."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"A profilvédelmi funkciók nem működnek a jelszó nélkül.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"A profilvédelmi funkciók nem működnek a jelszó nélkül.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Mentett ujjlenyomatait a rendszer szintén eltávolítja ebből a profilból, Ön pedig nem tudja majd nélkülük feloldani profilja zárolását, engedélyezni a vásárlásokat vagy bejelentkezni az alkalmazásokba.\""</string>
+</xliff:g>A mentett ujjlenyomatokat a rendszer szintén eltávolítja ebből a profilból, és Ön nem tudja majd ujjlenyomat segítségével feloldani a profil zárolását, engedélyezni a vásárlásokat, illetve bejelentkezni az alkalmazásokba."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"A profilvédelmi funkciók nem működnek a képernyőzár nélkül."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"A profilvédelmi funkciók nem működnek a képernyőzár nélkül.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"A profilvédelmi funkciók nem működnek a képernyőzár nélkül.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Mentett ujjlenyomatait a rendszer szintén eltávolítja ebből a profilból, Ön pedig nem tudja majd nélkülük feloldani profilja zárolását, engedélyezni a vásárlásokat vagy bejelentkezni az alkalmazásokba.\""</string>
+</xliff:g>A mentett ujjlenyomatokat a rendszer szintén eltávolítja ebből a profilból, és Ön nem tudja majd ujjlenyomat segítségével feloldani a profil zárolását, engedélyezni a vásárlásokat, illetve bejelentkezni az alkalmazásokba."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Igen, kikapcsolom"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Feloldási minta módosítása"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"A feloldó PIN-kód módosítása"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Növekvő, csökkenő vagy ismétlődő számsor megadása nem engedélyezett"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Mégse"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Törlés"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Mégse"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Tovább"</string>
     <string name="lock_setup" msgid="3355847066343753943">"A beállítás megtörtént."</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS elérhető"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS elérhető)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Adja meg hálózati jelszavát"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Szolgáltatói Wi‑Fi-hálózat"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Csatlakozás a következőn keresztül: <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"A helymeghatározás pontosságának javítása és egyéb célok érdekében a(z) <xliff:g id="APP_NAME">%1$s</xliff:g> szeretné engedélyezni a hálózatkeresést még kikapcsolt Wi-Fi mellett is.\n\nEngedélyezi ezt az összes olyan alkalmazásnál, amely keresést akar végezni?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"A kikapcsoláshoz menjen a további elemeket tartalmazó menü Speciális pontjához."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Engedélyezés"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Kapcsolódás"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nem sikerült hálózathoz csatlakozni."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Elfelejt"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Módosítás"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Nem sikerült elfelejteni a hálózatot."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Mentés"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Nem sikerült menteni a hálózatot."</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Speciális Wi-Fi-beállítások"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-cím"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-cím"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Hálózati információ"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Alhálózati maszk"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-címek"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Törli a meghívást?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Szeretné törölni a(z) <xliff:g id="PEER_NAME">%1$s</xliff:g> eszközhöz való csatlakozásra vonatkozó meghívást?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Elfelejtse ezt a csoportot?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Hordozható wifi-hotspot"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wifi-hotspot"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Nincs internet- és tartalommegosztás más eszközökkel"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Táblagép internetkapcsolatának megosztása hotspoton keresztül"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Telefon internetkapcsolatának megosztása hotspoton keresztül"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Az alkalmazás tartalmat oszt meg. Internetkapcsolat megosztásához kapcsolja ki, majd újra be a hotspotot."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi-Fi-név"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Hotspot neve"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> bekapcsolása…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Más eszközök is csatlakozhatnak a(z) <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> hotspothoz"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi-jelszó"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Hotspot jelszava"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP-sáv"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Hotspot használatával hozzon létre Wi‑Fi-hálózatot további eszközei számára. A hotspot internetet biztosít mobiladat-kapcsolata használatával. A szolgáltató további díjat számíthat fel."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Az alkalmazások létrehozhatnak hotspotokat tartalom megosztására a közeli eszközökkel."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"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="display_settings_title" msgid="1708697328627382561">"Megjelenítés"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Hang"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Hangerő"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Keresés"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Keresési beállítások és előzmények kezelése"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nincs találat"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Előzmények törlése"</string>
     <string name="display_settings" msgid="7965901687241669598">"Megjelenítés"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Automatikus képernyőforgatás"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Élénk színek"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Alapértelmezett APN-beállítások visszaállítása."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Visszaállítás alaphelyzetbe"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Az alapértelmezett APN-beállítások visszaállítása befejeződött."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Visszaállítás"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Hálózati beállítások visszaállítása"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Beállítások visszaállítása"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Visszaállítható a hálózat, az alkalmazások és az eszköz"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"A Wi-Fi, a mobiladatok és a Bluetooth beállításainak visszaállítása"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Az összes hálózati beállítást visszaállítja, például a következőket:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobiladat"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Beállítások visszaállítása"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Visszaállítja az összes hálózati beállítást? Ezt a műveletet nem lehet visszavonni."</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Visszaállítja?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"A hálózati beállítások visszaállítása nem hajtható végre ennél a felhasználónál"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"A hálózati beállítások vissza lettek állítva."</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Gyári adatok visszaállítása"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> fiók lesz visszaállítva</item>
-      <item quantity="one">1 fiók lesz visszaállítva</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"A belső tárhely és minden adat visszaállításra kerül"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Összes adat törlése (gyári beállítások visszaállítása)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Ez minden adatot töröl a táblagép "<b>"belső tárhelyéről"</b>", többek között: \n \n"<li>"Google-fiókját"</li>\n<li>"A rendszer- és alkalmazásadatokat és beállításokat"</li>" \n "<li>"A letöltött alkalmazásokat"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Ez minden adatot töröl a telefon "<b>"belső tárhelyéről"</b>", többek között: \n \n"<li>"Google-fiókja"</li>\n<li>"a rendszer- és alkalmazásadatok és beállítások"</li>" \n"<li>"a letöltött alkalmazások"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Jelenleg a következő fiókokba van bejelentkezve:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Biztonsági információk"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nincs adatkapcsolat. Az információ azonnali megtekintéséhez keresse fel a következő helyet bármelyik számítógépről, amely csatlakozik az internethez: %s."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Betöltés…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Adjon meg egy jelszót"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Képernyőzár beállítása"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"A biztonság érdekében állítson be jelszót"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Jelszó az ujjlenyomathoz"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Válassza ki a mintát"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Minta az ujjlenyomathoz"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Adja meg PIN-kódját"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"A biztonság érdekében állítson be PIN-kódot"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"PIN-kód az ujjlenyomathoz"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Jelszó megerősítése"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Adja meg újra a jelszót"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Erősítse meg a mintát"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PIN-kód megerősítése"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Adja meg újra a PIN-kódot"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"A jelszavak nem egyeznek"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"A PIN-kódok nem egyeznek"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Feloldás kiválasztása"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"A folytatáshoz használja munkaprofil-feloldási mintáját"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"A folytatáshoz írja be munkaprofilja PIN-kódját"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"A folytatáshoz írja be munkaprofilja jelszavát"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"A folytatáshoz adja meg a mintát. Ez az eszköz újraindítása miatt szükséges."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"A folytatáshoz írja be PIN-kódot. Ez az eszköz újraindítása miatt szükséges."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"A folytatáshoz írja be a jelszót. Ez az eszköz újraindítása miatt szükséges."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"A folytatáshoz adja meg a munkahelyi mintát. Ez az eszköz újraindítása miatt szükséges."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"A folytatáshoz adja meg a munkahelyi PIN-kódot. Ez az eszköz újraindítása miatt szükséges."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"A folytatáshoz adja meg a munkahelyi jelszót. Ez az eszköz újraindítása miatt szükséges."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"A nagyobb biztonság érdekében használja az eszköz feloldó mintáját"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"A nagyobb biztonság érdekében adja meg az eszköz PIN-kódját"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"A nagyobb biztonság érdekében adja meg az eszközhöz tartozó jelszót"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"A nagyobb biztonság érdekében használja munkaprofil-feloldási mintáját"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"A nagyobb biztonság érdekében adja meg munkaprofilja PIN-kódját"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"A nagyobb biztonság érdekében adja meg munkaprofilja jelszavát"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Visszaállítottuk az eszköz gyári beállításait. A telefon használatához adja meg az előző mintáját."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Visszaállítottuk az eszköz gyári beállításait. A telefon használatához adja meg az előző PIN-kódját."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Visszaállítottuk az eszköz gyári beállításait. A telefon használatához adja meg az előző jelszavát."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Minta ellenőrzése"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"PIN-kód ellenőrzése"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Jelszó ellenőrzése"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Helytelen PIN-kód"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Helytelen jelszó"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Helytelen minta"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Létrehozza a modult, és engedélyezi a hozzáférést?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Miután létrehozta a modult, a(z) <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> hozzáférhet az összes általa megjelenített adathoz."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Mindig engedélyezem a(z) <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> számára a modulok létrehozását és az adatokhoz való hozzáférést."</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> n <xliff:g id="HOURS">%2$d</xliff:g> ó <xliff:g id="MINUTES">%3$d</xliff:g> p <xliff:g id="SECONDS">%4$d</xliff:g> mp"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> ó <xliff:g id="MINUTES">%2$d</xliff:g> p <xliff:g id="SECONDS">%3$d</xliff:g> mp"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> p <xliff:g id="SECONDS">%2$d</xliff:g> mp"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> mp"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> nap <xliff:g id="HOURS">%2$d</xliff:g> óra <xliff:g id="MINUTES">%3$d</xliff:g> perc"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> óra <xliff:g id="MINUTES">%2$d</xliff:g> perc"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> perc"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Használati statisztikák"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Használati statisztika"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Rendezési szempont:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Képernyőolvasók, megjelenítés, interakcióvezérlők"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Látási beállítások"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Eszközét saját igényeinek megfelelően testre szabhatja. Ezeket a kisegítő lehetőségeket később a Beállítások menüben módosíthatja."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Betűméret növelése"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Betűméret módosítása"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Képernyőolvasók"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Hang és képernyőn megjelenő szöveg"</string>
     <string name="display_category_title" msgid="685461049938269166">"Megjelenítés"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Nagyításhoz"</b>" gyorsan koppintson háromszor a képernyőre.\n"<ul><li>"Görgetéshez húzza legalább két ujját a képernyőn."</li>\n<li>"A nagyítás mértékét két vagy több ujjának össze- vagy széthúzásával módosíthatja."</li></ul>\n\n<b>"Ideiglenes nagyításhoz"</b>" gyorsan koppintson háromszor a képernyőre, és az utolsó koppintást követően ne emelje fel az ujját.\n"<ul><li>"A képernyőn húzással mozoghat"</li>\n<li>"Kicsinyítéshez emelje fel az ujját."</li></ul>\n\n"A billentyűzetre és a navigációs sávra nem lehet ránagyítani."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Ha be van kapcsolva a nagyítás, a képernyő alján található Kisegítő lehetőségek gomb segítségével gyorsan ránagyíthat a kívánt részre.\n\n"<b>"Nagyításhoz"</b>" koppintson a Kisegítő lehetőségek gombra, majd bárhova a képernyőn.\n"<ul><li>"Görgetéshez húzza legalább két ujját a képernyőn."</li>\n<li>"A nagyítás/kicsinyítés mértékének módosításához húzza össze/szét legalább két ujját."</li></ul>\n\n<b>"Ideiglenes nagyításhoz"</b>" koppintson a Kisegítő lehetőségek gombra, majd tartsa ujját lenyomva bárhol a képernyőn.\n"<ul><li>"A képernyőn húzással mozoghat."</li>\n<li>"Kicsinyítéshez emelje fel az ujját."</li></ul>\n\n"A billentyűzetre és a navigációs sávra nem lehet ránagyítani."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"A Kisegítő lehetőségek gomb a következőre van állítva: <xliff:g id="SERVICE">%1$s</xliff:g>. Nagyításhoz tartsa lenyomva a Kisegítő lehetőségek gombot, majd válassza a nagyítás lehetőséget."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Kisegítő lehetőségek gyorsparancsa"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Gyorsparancs a hangerőgombokkal"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Gyorsparancs-szolgáltatás"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Engedélyezés a lezárási képernyőn"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Ha be van kapcsolva a gyorsparancs, a két hangerőgomb 3 másodpercig tartó lenyomásával elindíthatja a kisegítő lehetőségek funkciót."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Ha be van kapcsolva a gyorsparancs, a két hangerőgomb 3 másodpercig tartó lenyomásával elindíthatja a kisegítő lehetőségek funkciót."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Nagy kontrasztú szöveg"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Képernyőnagyítás automatikus frissítése"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Nagyítás frissítése az alkalmazások közti átmeneteknél"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Ennek hatása lehet a teljesítményre"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Kattintás a mutató megállítását követően"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Késleltetés kattintás előtt"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"BE"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"KI"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Megjelenítés a Gyorsbeállítások között"</string>
@@ -2360,6 +2365,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g>/<xliff:g id="NUMBER">%1$d</xliff:g> kiválasztva"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g>/<xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Az összes kijelölése"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Előfizetések kezelése"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Adathasználat"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Alkalmazás adathasználata"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"A szolgáltató adatszámlálási módja eltérhet az eszközétől."</string>
@@ -2445,6 +2451,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilhálózatok"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Forgalomkorlátos Wi-Fi-hálózatok"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Forgalomkorlátos hálózat kiválasztásához kapcsolja be a Wi-Fit."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatikus"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Mért"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Nem mért"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"A szolgáltató adatszámlálási módja eltérhet az eszközétől."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Segélyhívás"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Hívás folytatása"</string>
@@ -2662,7 +2671,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Híváskezelő"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Vészhelyzeti adások"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Vészriasztások"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Mobilszolgáltatók"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Hozzáférési pontok nevei"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Javított 4G LTE mód"</string>
@@ -2731,6 +2740,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Előnyben részesített SIM-kártya a következőhöz:"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Mindig kérdezzen rá"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Ki kell választani"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"SIM-kártya kiválasztása"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Beállítások"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">%d rejtett elem megjelenítése</item>
@@ -2882,18 +2892,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Alkalmazásértesítések"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Értesítés kategóriája"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Fontosság"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Döntsön az alkalmazás"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Hang engedélyezése"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Soha ne jelenjen meg értesítés"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Hangjelzés és vizuális megszakítás nélkül"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Hang nélkül"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Hangjelzés"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Hangjelzés és felugró értesítés a képernyőn"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Felugró értesítés a képernyőn"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Alacsony"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Közepes"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Magas"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Sürgős"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Hang engedélyezése"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Ne legyen hangjelzés vagy rezgés, illetve az értesítések ne jelenjenek meg rövid időre sem az aktuális képernyőn."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Megszakítások engedélyezése"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Az alkalmazás aktiválhat hangjelzést, rezgést és/vagy értesítéseket jeleníthet meg a képernyőn"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Kevésbé fontos"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Átlagos"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Fontos"</string>
@@ -2924,7 +2935,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"kép a képben"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Kép a képben"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Kép a képben funkció engedélyezése"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Annak engedélyezése, hogy ez az alkalmazás kép a képben ablakot hozzon létre, miközben meg van nyitva, vagy miután Ön kilépett (például azért, hogy tovább nézzen egy videót). Az említett ablak az Ön által használt többi alkalmazás fölött jelenik majd meg."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Engedélyezi, hogy az alkalmazás kép a képben ablakot hozzon létre, miközben meg van nyitva, vagy miután Ön kilépett belőle (például azért, hogy tovább nézzen egy videót). Az említett ablak az Ön által használt többi alkalmazás fölött jelenik majd meg."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"„Ne zavarjanak” elérés"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Egy telepített alkalmazás sem kért „Ne zavarjanak” elérést"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Alkalmazások betöltése…"</string>
@@ -3227,6 +3238,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Fájlátvitel"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Fotók átvitele (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Eszköz használata MIDI-eszközként"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS-tükrözés"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Háttérellenőrzés"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Teljes hozzáférés a háttérhez"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Képernyő szövegének használata"</string>
@@ -3369,6 +3381,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="night_display_suggestion_title" msgid="6602129097059325291">"Az Éjszakai fény ütemezésének beállítása"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"A sárgás szín segít elaludni"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Éjszakai fény be van kapcsolva"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"A képernyő borostyánsárga árnyalatúra színeződött; ez megkönnyítheti az elalvást."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Javaslatok"</string>
@@ -3387,6 +3401,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Hidegebb színhőmérséklet használata a kijelzőn"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"A színmódosítások alkalmazásához kapcsolja ki a képernyőt"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"A telefonos szolgáltatások figyelésének módosításához indítsa újra az eszközt"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"A Kamera HAL HDR+ módosításához indítsa újra az eszközt"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"A kamera lézeres érzékelője"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatikus rendszerfrissítések"</string>
     <string name="usage" msgid="2977875522080448986">"Használat"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobiladat-forgalom"</string>
@@ -3412,7 +3429,7 @@
     <string name="data_warning" msgid="209133958008062117">"Adatforgalmi figyelmeztetés"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Adatkorlát beállítása"</string>
     <string name="data_limit" msgid="1885406964934590552">"Adatforgalmi korlátozás"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> felhasználva a következő időszakban: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> felhasználva (<xliff:g id="ID_2">%2$s</xliff:g>)"</string>
     <string name="configure" msgid="1029654422228677273">"Beállítás"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Adathasználat – egyéb alkalmazások"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3481,7 +3498,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Törlés és konvertálás"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Visszaállítja a ShortcutManager gyakoriságkorlátozását"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"A ShortcutManager gyakoriságkorlátozása visszaállítva"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Lezárási képernyő értesítéseinek kezelése"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"A lezárási képernyő adatainak 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="8483187649355540109">"Súgó és tippek"</string>
@@ -3489,7 +3506,7 @@
     <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>
     <string name="premium_sms_warning" msgid="9086859595338944882">"A Prémium sms-ek használata pénzbe kerülhet Önnek, és a szolgáltató által kiállított számlák végösszegét növeli. Ha engedélyt ad valamelyik alkalmazásnak, akkor azzal lehetősége lesz prémium sms-eket küldeni."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Prémium sms-hozzáférés"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Nem látható más eszközök számára"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Kikapcsolva"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"A(z) <xliff:g id="ID_1">%1$s</xliff:g> eszközhöz csatlakozik"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Több eszközhöz csatlakozik"</string>
     <string name="demo_mode" msgid="2798762752209330277">"A rendszer kezelőfelületének demómódja"</string>
@@ -3591,7 +3608,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Azonnali alkalmazások"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Linkek megnyitása alkalmazásokban, akkor is, ha nincsenek telepítve"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Azonnali alkalmazások"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Az azonnali alkalmazásokhoz tartozó fiók"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Instant Apps-beállítások"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Telepített alkalmazások"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Tárhelyét mostantól a tárhelykezelő kezeli"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> fiókjai"</string>
@@ -3638,7 +3655,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"A „mindig bekapcsolt VPN” lehetőség be van kapcsolva az Ön személyes profiljában"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"A „mindig bekapcsolt VPN” lehetőség be van kapcsolva az Ön munkaprofiljában"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globális HTTP proxy beállítva"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Megbízható hitelesítési adatok"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Megbízható hitelesítési adatok"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Megbízható hitelesítési adatok a személyes profilban"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Megbízható hitelesítési adatok a munkaprofilban"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Legalább <xliff:g id="COUNT_1">%d</xliff:g> CA tanúsítvány</item>
       <item quantity="one">Legalább <xliff:g id="COUNT_0">%d</xliff:g> CA tanúsítvány</item>
@@ -3701,7 +3720,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Információ a szolgáltatói hozzáférésről"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Szolgáltatói ellátás aktiválása"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Mi új és említésre méltó?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Tekintse meg az 5 legnépszerűbb funkciót"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Az új telefon bemutatójának megtekintése"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Az új táblagép bemutatójának megtekintése"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Az új eszköz bemutatójának megtekintése"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ez a funkció nem áll rendelkezésre ezen az eszközön"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS-regisztráció állapota"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Regisztrált"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Nem regisztrált"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index bfe901f..5feaa6d 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s-ը ցանկանում է մատչել ձեր հաղորդագրությունները: Մուտք տա՞լ %2$s-ին:"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM քարտից օգտվելու հարցում"</string>
     <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="bluetooth_device_name_summary" msgid="4757990010751789977">"Մյուս սարքերին տեսանելի է որպես «<xliff:g id="DEVICE_NAME">^1</xliff:g>»"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Մյուս սարքերին տեսանելի է որպես «<xliff:g id="DEVICE_NAME">^1</xliff:g>»"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Ձեր սարքերը"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Նոր սարքի զուգակցում"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Ամսաթիվ և ժամ"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"Հաջորդը"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Բա՞ց թողնել"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Մատնահետքի կարգավորումն ընդամենը մեկ-երկու րոպե է տևում: Եթե բաց թողնեք, ավելի ուշ կարող եք անցնել կարգավորումներ և ավելացնել ձեր մատնահետքը:"</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Բա՞ց թողնել"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Սարքի պաշտպանության գործառույթները չեն միացվելու: Դուք չեք կարողանա կանխել այլ անձանց կողմից այս պլանշետի օգտագործումը՝ այն կորցնելու, գողանալու կամ վերակայելու դեպքում:"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Սարքի պաշտպանության գործառույթները չեն միացվելու: Դուք չեք կարողանա կանխել այլ անձանց կողմից այս սարքի օգտագործումը՝ այն կորցնելու, գողանալու կամ վերակայելու դեպքում:"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Սարքի պաշտպանության գործառույթները չեն միացվելու: Դուք չեք կարողանա կանխել այլ անձանց կողմից այս հեռախոսի օգտագործումը՝ այն կորցնելու, գողանալու կամ վերակայելու դեպքում:"</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Դուք ավելացրել եք մատնահետքերի առավելագույն թույլատրելի քանակը"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Հնարավոր չէ ավելացնել այլ մատնահետքեր"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Հեռացնե՞լ բոլոր մատնահետքերը:"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Ջնջել «<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>»-ը"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Ջնջե՞լ այս մատնահետքը։"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Դուք չեք կարողանա ապակողպել հեռախոսը, հաստատել գնումները կամ մուտք գործել հավելվածներ ձեր մատնահետքերի միջոցով"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Դուք չեք կարողանա ապակողպել աշխատանքային պրոֆիլը, հաստատել գնումները կամ մուտք գործել աշխատանքային հավելվածներ ձեր մատնահետքերի միջոցով"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Այո, հեռացնել"</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"Ավելի ապահով լինելու համար սահմանեք էկրանի կողպման լրացուցիչ տարբերակ:"</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Ապահովության համար սահմանեք էկրանի կողպման լրացուցիչ եղանակ:"</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>
@@ -497,37 +502,37 @@
     <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_fingerprint" msgid="8212242533942400457">"Սարքի պաշտպանության գործառույթները չեն աշխատի առանց ապակողպման նախշի:<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Սարքի պաշտպանության գործառույթները չեն աշխատի առանց ձեր ապակողպման նախշի:<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Ձեր պաված մատնահետքերը նույնպես կհեռացվեն սարքից, ուստի չեք կարողանա ապակողպել հեռախոսը, կատարել գնումներ և մուտք գործել հավելվածներ:"</string>
+</xliff:g>Ձեր պահված մատնահետքերը նույնպես կջնջվեն այս սարքից, և դուք չեք կարողանա ապակողպել հեռախոսը, թույլատրել գնումներ և մուտք գործել հավելվածներ:"</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">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Սարքի պաշտպանության գործառույթները չեն աշխատի առանց PIN կոդի:<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Ձեր պաված մատնահետքերը նույնպես կհեռացվեն սարքից, ուստի չեք կարողանա ապակողպել հեռախոսը, կատարել գնումներ և մուտք գործել հավելվածներ:"</string>
+</xliff:g>Ձեր պահված մատնահետքերը նույնպես կջնջվեն այս սարքից, և դուք չեք կարողանա ապակողպել հեռախոսը, թույլատրել գնումներ կամ դրանց միջոցով մուտք գործել հավելվածներ:"</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Սարքի պաշտպանության գործառույթները չեն աշխատի առանց ձեր գաղտնաբառի:<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Ձեր պաված մատնահետքերը նույնպես կհեռացվեն սարքից, ուստի չեք կարողանա ապակողպել հեռախոսը, կատարել գնումներ և մուտք գործել հավելվածներ:"</string>
+</xliff:g>Ձեր պահված մատնահետքերը նույնպես կջնջվեն այս սարքից, և դուք չեք կարողանա ապակողպել հեռախոսը, թույլատրել գնումները կամ դրանց միջոցով մուտք գործել հավելվածներ:"</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Սարքի պաշտպանության գործառույթները չեն աշխատի առանց էկրանի կողպման:<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Ձեր պաված մատնահետքերը նույնպես կհեռացվեն սարքից, ուստի չեք կարողանա ապակողպել հեռախոսը, կատարել գնումներ և մուտք գործել հավելվածներ:"</string>
+</xliff:g>Ձեր պահված մատնահետքերը նույնպես կջնջվեն այս սարքից, և դուք չեք կարողանա ապակողպել հեռախոսը, թույլատրել գնումները կամ դրանց միջոցով մուտք գործել հավելվածներ:"</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Պրոֆիլի պաշտպանության գործառույթները չեն աշխատի առանց ձեր նախշի:"</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Պրոֆիլի պաշտպանության գործառույթները չեն աշխատի առանց ձեր նախշի:<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Պրոֆիլի պաշտպանության գործառույթները չեն աշխատի առանց ձեր ապակողպման նախշի:<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Ձեր պահված մատնահետքերը նույնպես կհեռացվեն այս պրոֆիլից, ուստի չեք կարողանա ապակողպել պրոֆիլը, թույլատրել գնումները կամ դրանց միջոցով մուտք գործել հավելվածներ:\""</string>
+</xliff:g>Ձեր պահված մատնահետքերը նույնպես կջնջվեն այս պրոֆիլից, և դուք չեք կարողանա ապակողպել պրոֆիլը, թույլատրել գնումները կամ դրանց միջոցով մուտք գործել հավելվածներ:"</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Պրոֆիլի պաշտպանության գործառույթները չեն աշխատի առանց ձեր PIN կոդի:"</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Պրոֆիլի պաշտպանության գործառույթները չեն աշխատի առանց ձեր PIN կոդի:<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Պրոֆիլի պաշտպանության գործառույթները չեն աշխատի առանց ձեր PIN կոդի:<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Ձեր պահված մատնահետքերը նույնպես կհեռացվեն այս պրոֆիլից, ուստի չեք կարողանա ապակողպել պրոֆիլը, թույլատրել գնումները կամ դրանց միջոցով մուտք գործել հավելվածներ:\""</string>
+</xliff:g>Ձեր պահված մատնահետքերը նույնպես կջնջվեն այս պրոֆիլից, և դուք չեք կարողանա ապակողպել պրոֆիլը, թույլատրել գնումները կամ դրանց միջոցով մուտք գործել հավելվածներ:"</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Պրոֆիլի պաշտպանության գործառույթները չեն աշխատի առանց ձեր գաղտնաբառի:"</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Պրոֆիլի պաշտպանության գործառույթները չեն աշխատի առանց ձեր գաղտնաբառի:<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Պրոֆիլի պաշտպանության գործառույթները չեն աշխատի առանց ձեր գաղտնաբառի:<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Ձեր պահված մատնահետքերը նույնպես կհեռացվեն այս պրոֆիլից, ուստի չեք կարողանա ապակողպել պրոֆիլը, թույլատրել գնումները կամ դրանց միջոցով մուտք գործել հավելվածներ:\""</string>
+</xliff:g>Ձեր պահված մատնահետքերը նույնպես կջնջվեն այս պրոֆիլից, և դուք չեք կարողանա ապակողպել պրոֆիլը, թույլատրել գնումները կամ դրանց միջոցով մուտք գործել հավելվածներ:"</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Պրոֆիլի պաշտպանության գործառույթները չեն աշխատի առանց էկրանի կողպման:"</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Պրոֆիլի պաշտպանության գործառույթները չեն աշխատի առանց էկրանի կողպման:<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Պրոֆիլի պաշտպանության գործառույթները չեն աշխատի առանց էկրանի կողպման:<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Ձեր պահված մատնահետքերը նույնպես կհեռացվեն այս պրոֆիլից, ուստի չեք կարողանա ապակողպել պրոֆիլը, թույլատրել գնումները կամ դրանց միջոցով մուտք գործել հավելվածներ:\""</string>
+</xliff:g>Ձեր պահված մատնահետքերը նույնպես կջնջվեն այս պրոֆիլից, և դուք չեք կարողանա ապակողպել պրոֆիլը, թույլատրել գնումները կամ դրանց միջոցով մուտք գործել հավելվածներ:"</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Այո, հեռացնել"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Փոխել ապակողպման նախշը"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Փոխել ապակողպման PIN-ը"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Թվանշանների աճող, նվազող կամ կրկնվող հաջորդականությունն արգելված է"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Հաստատել"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Չեղարկել"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Մաքրել"</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>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS-ը հասանելի է"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS-ը հասանելի է)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Մուտքագրեք ձեր ցանցի գաղտնաբառը"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Օպերատորի Wi‑Fi ցանց"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Միանալ <xliff:g id="NAME">%1%s</xliff:g>-ի միջոցով"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Տեղադրության ճշգրտությունը կատարելագործելու կամ այլ նպատակների համար` <xliff:g id="APP_NAME">%1$s</xliff:g>-ը ցանկանում է միացնել ցանցի սկանավորումը, նույնիսկ եթե Wi-Fi-ը անջատված է:\n\nԹույլատրե՞լ բոլոր սկանավորում ցանկացող ծրագրերին:"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Սա անջատելու համար գերբեռնված ցանկում անցեք Ընդլայնված:"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Թույլատրել"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Միանալ"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Ցանցին միանալ չհաջողվեց"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Մոռանալ"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Փոփոխել"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Ցանցը մոռանալ չհաջողվեց"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Պահել"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Չհաջողվեց պահել ցանցը"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Ընդլայնված Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC հասցե"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP հասցե"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Ցանցի տեղեկություններ"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Ենթացանցի դիմակ"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 հասցեներ"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Չեղարկե՞լ հրավերը:"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Ցանկանու՞մ եք չեղարկել <xliff:g id="PEER_NAME">%1$s</xliff:g>-ին միացման հրավերը:"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Մոռանա՞լ այս խումբը:"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Դյուրակիր Wi‑Fi թեժ կետ"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi թեժ կետ"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Ինտերնետն ու բովանդակությունը հասանելի չեն ուրիշ սարքերի"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Այս պլանշետն ինտերնետ կապը տրամադրվում է թեժ կետի միջոցով"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Այս հեռախոսն ինտերնետ կապը տրամադրվում է թեժ կետի միջոցով"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Հավելվածը տրամադրում է բովանդակություն: Ինտերնետ կապ տրամադրելու համար անջատեք, ապա կրկին միացրեք թեժ կետը"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi-ի անվանումը"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Թեժ կետի անվանումը"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-ը միանում է…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Այլ սարքերը կարող են միանալ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-ին"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi-ի գաղտնաբառը"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Թեժ կետի գաղտնաբառը"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Հաճախականությունների դիապազոն"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Թեժ կետն օգտագործեք ձեր այլ սարքերի համար Wi‑Fi ցանց ստեղծելու համար: Թեժ կետը տրամադրում է ինտերնետ կապ բջջային ցանցի միջոցով: Բջջային ինտերնետի համար կարող են լրացուցիչ վճարներ գանձվել:"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Հավելվածները կարող են ստեղծել թեժ կետ՝ բովանդակությունը մոտակա սարքերին փոխանցելու համար:"</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Երբ Wi-Fi-ի միջոցով զանգերը միացված են, հեռախոսը կարող է ուղարկել զանգերը Wi-Fi ցանցերի կամ ձեր օպերատորի ցանցի միջոցով՝ կախված ձեր նախընտրություններից և ազդանշանի ուժգնությունից: Մինչ այս գործառույթը միացնելը՝ տեղեկացեք վճարների և այլ մանրամասների մասին ձեր օպերատորից:"</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Թարմացնել արտակարգ իրավիճակների հասցեն"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"WiFi-ի միջոցով 911 զանգ կատարելու դեպքում արտակարգ իրավիճակների ծառայությունները այս հասցեն դիտարկում են որպես ձեր տեղադրությունը"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"Հասցե, որն արտակարգ իրավիճակների ծառայության կողմից օգտագործվում է որպես ձեր տեղորոշում Wi‑Fi-ի միջոցով շտապ կանչ կատարելու դեպքում"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Էկրան"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ձայն"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Հնչողությունը"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Որոնել"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Կառավարել որոնման կարգավորումները և պատմությունը"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Արդյունքներ չկան"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Մաքրել պատմությունը"</string>
     <string name="display_settings" msgid="7965901687241669598">"Էկրան"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Ավտոմատ պտտել էկրանը"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Վառ գույներ"</string>
@@ -1324,21 +1334,17 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Լռելյայն APN կարգավորումների վերականգնում:"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Վերականգնել լռելյայնը"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Սկզբնական APN կարգավորումների վերակարգավորումն ավարտված է:"</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Վերակայել"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Վերակայել ցանցի կարգավորումները"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Վերակայել ընտրանքները"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Ցանցը, հավելվածները և սարքը հնարավոր է վերակայել"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Վերակայել Wi-Fi-ը, բջջային տվյալների կարգավորումները և Bluetooth-ը"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Արդյունքում կվերակայվեն բոլոր ցանցային կարգավորումները, ներառյալ հետևյալը՝\n\n"<li>"Wi‑Fi"</li>\n<li>"Բջջային ինտերնետ"</li>\n<li>"Bluetooth"</li></string>
-    <string name="reset_network_button_text" msgid="2035676527471089853">"Վերակայել կարգավորումները"</string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Զրոյացնել կարգավորումները"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Վերակայե՞լ ցանցի բոլոր կարգավորումները: Այլևս չեք կարող հետարկել այս գործողությունը:"</string>
-    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Վերակայել կարգավորումները"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Զրոյացնել կարգավորումները"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Վերակայե՞լ:"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Ցանցի վերակայումը հասանելի չէ այս օգտատիրոջ"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Ցանցի կարգավորումները վերակայվել են"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Վերակայել բոլոր տվյալները"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> accounts will be reset</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> հաշիվ կվերակայվի</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Ներքին հիշողությունը և բոլոր տվյալները կվերակայվեն"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Ջնջել բոլոր տվյալները (գործարանային վերակայում)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Սա կջնջի բոլոր տվյալները ձեր պլանշետի "<b>" ներքին պահոցից"</b>", այդ թվում՝\n\n"<li>"Ձեր Google հաշիվը"</li>\n<li>"Համակարգի և հավելվածների տվյալներն ու կարգավորումները"</li>\n<li>"Ներբեռնված հավելվածները"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Կջնջվեն բոլոր տվյալները ձեր սարքի "<b>"ներքին հիշողությունից"</b>", ներառյալ`\n\n"<li>"ձեր Google հաշիվը"</li>\n<li>"համակարգի և հավելվածների տվյալներն ու կարգավորումները"</li>\n<li>"ներբեռնված հավելվածները"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Հաշիվներն այս սարքում՝\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Անվտանգության տեղեկատվություն"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Դուք չունեք տվյալների կապ: Այս տեղեկատվությունը հիմա դիտելու համար անցեք %s` ցանկացած ինտերնետ կապ ունեցող համակարգչով:"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Բեռնում..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Ընտրեք ձեր գաղտնաբառը"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Էկրանի կողպման կարգավորում"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Անվտանգության նկատառումներից ելնելով՝ ավելացրեք գաղտնաբառ"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Մատնահետքն օգտագործելու համար տեղադրեք գաղտնաբառ"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Ընտրեք ձեր կաղապարը"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Մատնահետքն օգտագործելու համար ստեղծեք նախշ"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Ընտրեք ձեր PIN-ը"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Անվտանգության նկատառումներից ելնելով՝ ավելացրեք PIN կոդ"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Մատնահետքն օգտագործելու համար տեղադրեք PIN կոդ"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Հաստատեք ձեր գաղտնաբառը"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Նորից մուտքագրեք գաղտնաբառը"</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_pin_header" msgid="7744513791910572550">"Նորից մուտքագրեք 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>
@@ -1483,12 +1490,18 @@
     <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_strong_auth_required_device_pattern" msgid="530802132223800623">"Լրացուցիչ ապահովության համար օգտագործեք ձեր սարքի նախշը"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Լրացուցիչ ապահովության համար մուտքագրեք ձեր սարքի PIN կոդը"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Լրացուցիչ ապահովության համար մուտքագրեք ձեր սարքի գաղտնաբառը"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Լրացուցիչ ապահովության համար օգտագործեք ձեր աշխատանքային նախշը"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Լրացուցիչ ապահովության համար մուտաքագրեք ձեր աշխատանքային PIN կոդը"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Լրացուցիչ ապահովության համար մուտքագրեք ձեր աշխատանքային գաղտնաբառը"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Ձեր սարքը վերակայվել է: Այս հեռախոսն օգտագործելու համար մուտքագրեք ձեր նախորդ նախշը:"</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Ձեր սարքը վերակայվել է: Այս հեռախոսն օգտագործելու համար մուտքագրեք ձեր նախորդ PIN կոդը:"</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Ձեր սարքը վերակայվել է: Այս հեռախոսն օգտագործելու համար մուտքագրեք ձեր նախորդ գաղտնաբառը:"</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Հաստատեք նախշը"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Հաստատեք PIN կոդը"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Հաստատեք գաղտնաբառը"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN կոդը սխալ է"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Գաղտնաբառը սխալ է"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Նախշը սխալ է"</string>
@@ -1585,7 +1598,7 @@
     <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" 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>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Ստեղծե՞լ վիջեթ և թույլատրե՞լ մատչումը:"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Վիջեթը ստեղծելուց հետո <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>-ը կարող է օգտվել ողջ ցուցադրվող տվյալներից:"</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Միշտ թույլատրել <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>-ին ստեղծել վիջեթներ և մուտք գործել իրենց տվյալներ"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>օր <xliff:g id="HOURS">%2$d</xliff:g>ժ <xliff:g id="MINUTES">%3$d</xliff:g>ր <xliff:g id="SECONDS">%4$d</xliff:g>վրկ"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>ժ <xliff:g id="MINUTES">%2$d</xliff:g>ր <xliff:g id="SECONDS">%3$d</xliff:g>վ"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>ր <xliff:g id="SECONDS">%2$d</xliff:g>վ"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>վրկ"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"Օգտագործման վիճակագրություն"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Օգտագործման վիճակագրություն"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Դասակարգել ըստ`"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Էկրանի ընթերցիչներ, էկրան, փոխազդման կառավարման տարրեր"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Տեսողության կարգավորումներ"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Օգտվեք հատուկ հնարավորություններից՝ հարմար աշխատանքի համար։ Այս գործառույթները կարող եք փոփոխել սարքի կարգավորումներում։"</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Մեծացրեք տառաչափը"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Փոխել տառաչափը"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Էկրանի ընթերցիչներ"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Աուդիո և էկրանի տեքստ"</string>
     <string name="display_category_title" msgid="685461049938269166">"Էկրան"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><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_screen_magnification_navbar_summary" msgid="1996584694050087161">"Երբ խոշորացումը միացված է, կարող եք օգտագործել էկրանի ներքևում գտնվող Մատչելիություն կոճակը՝ արագ խոշորացնելու համար:\n\n"<b>"Մասշտաբը փոխելու համար"</b>" հպեք Մատչելիության կոճակին, ապա էկրանի ցանկացած հատվածին:\n"<ul><li>"Ոլորելու համար 2 կամ ավելի մատները քաշեք էկրանի վրայով"</li>\n<li>"Մասշտաբը փոխելու համար 2 կամ ավելի մատները մոտեցրեք միմյանց"</li></ul>\n\n<b>"Մասշտաբը ժամանակավորապես փոխելու համար"</b>" հպեք Մատչելիության կոճակին, ապա հպեք և պահեք էկրանի ցանկացած հատվածին:\n"<ul><li>"Քաշեք՝ էկրանով մեկ շարժելու համար"</li>\n<li>"Բարձրացրեք մատը՝ փոքրացնելու համար"</li></ul>\n\n"Ստեղնաշարի կամ նավարկման գոտու միջոցով հնարավոր չէ մեծացնել:"</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Մատչելիության կոճակի համար կարգավորված է <xliff:g id="SERVICE">%1$s</xliff:g> ծառայությունը: Խոշորացումն օգտագործելու համար հպեք և պահեք Մատչելիության կոճակը, ապա ընտրեք խոշորացումը:"</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Մատչելիության դյուրանցում"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Ձայնի կոճակի դյուրանցում"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Դյուրանցման ծառայությունը"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Թույլատրել կողպէկրանից"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Մատչելիության գործառույթն օգտագործելու համար սեղմեք և 3 վայրկյան սեղմած պահեք ձայնի ուժգնության երկու կոճակները, երբ գործառույթը միացված է։"</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Մատչելիության գործառույթն օգտագործելու համար սեղմեք և 3 վայրկյան սեղմած պահեք ձայնի ուժգնության երկու կոճակները, երբ դյուրանցումը միացված է։"</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">"Ավտոմատ թարմացնել էկրանի խոշորությունը"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Թարմացնել էկրանի խոշորությունը ծրագրի տարանցումների վրա"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Կարող է ազդել սարքի աշխատանքի վրա"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Սեղմում նշորդը կանգնելուց հետո"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Հապաղումը սեղմելուց առաջ"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ՄԻԱՑՎԱԾ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ԱՆՋԱՏՎԱԾ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Ցույց տալ Արագ կարգավորումներում"</string>
@@ -2358,6 +2363,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Կառավարել փաթեթները"</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>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Շարժական ցանցեր"</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_metered_auto" msgid="1262028400911918865">"Ինքնաշխատ"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Սահմանափակ"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Անսահմանափակ"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Օպերատորի վիճակագրությունը կարող է տարբերվել սարքի տվյալներից։"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Շտապ կանչ"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Վերադառնալ զանգին"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Զանգերի կառավարիչ"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Ծանուցում արտակարգ իրավիճակների մասին"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Արտակարգ իրավիճակների ահազանգեր"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Կապի օպերատորներ"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Մատչման կետերի անունները"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Ընդլայնված 4G LTE ռեժիմ"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Օգտագործել SIM քարտը հետևյալի համար՝"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Հարցնել ամեն անգամ"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Ընտրեք SIM քարտը"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"SIM քարտի ընտրություն"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Կարգավորումներ"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="one">Show %d hidden items</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Հավելվածների ծանուցումներ"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Ծանուցման կատեգորիա"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Կարևորություն"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Թույլ տալ, որ սարքը որոշի"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Թույլատրել ձայնը"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Երբեք չցուցադրել ծանուցումները"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Առանց ձայնի և տեսողական ընդհատումների"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Առանց ձայնի"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Ձայն հանել"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Ձայն հանել և ցուցադրել էկրանին"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Ցուցադրել էկրանին"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Ցածր"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Միջին"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Բարձր"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Շտապ"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Թույլատրել ձայնը"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Ձայնային ազդանշան չհնչեցնել, չթրթռալ և ընթացիկ էկրանին այս ծանուցումները չցուցադրել:"</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Թույլատրել ընդհատումները"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Թույլ տվեք սարքին ազդանշան հնչեցնել, թրթռալ և/կամ ցուցադրել էկրանին հայտնվող ծանուցումները"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Ցածր կարևորություն"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Միջին կարևորություն"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Բարձր կարևորություն"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"նկարը նկարի մեջ, նկար, ննմ"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Նկար նկարի մեջ"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Թույլատրել «Նկար նկարի մեջ» ռեժիմը"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Թույլ տալ այս հավելվածին ստեղծել «Նկար նկարի մեջ» պատուհան՝ երբ հավելվածը բաց է կամ այն լքելուց հետո (օրինակ՝ տեսանյութի դիտումը շարունակելու համար): Այս պատուհանը ցուցադրվում է ձեր կողմից օգտագործվող այլ հավելվածների վերևում:"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Թույլատրել հավելվածին ստեղծել նկար նկարի մեջ պատուհան, երբ հավելվածը բաց է կամ այն օգտագործելուց հետո (օրինակ՝ տեսանյութի դիտումը շարունակելու համար): Այս պատուհանը ցուցադրվում է ձեր կողմից օգտագործվող այլ հավելվածների վերևում:"</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>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Ֆայլերի փոխանցում"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Լուսանկարների փոխանցում (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Սարքի օգտագործում որպես MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS-ների հեռարձակում"</string>
     <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>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Գիշերային լույսի ժամանակացույցի կարգավորում"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Էկրանին տալ սաթե երանգավորում, ինչը կօգնի ձեզ քնել"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Գիշերային լույսը միացրած է"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Էկրանը սաթե երանգավորում է ստացել: Դա թույլ կտա ձեզ քնել:"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Հուշումներ"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Օգտագործել էկրանի ավելի սառը գույներ"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Գույնի փոփոխությունը կիրառելու համար անջատեք էկրանը"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telephony Monitor-ի փոփոխությունը կիրառելու համար վերագործարկեք սարքը"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Ֆոտոխցիկի HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Ֆոտոխցիկի HAL HDR+ կիրառելու համար վերաբեռնեք սարքը"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Տեսախցիկի լազերային սենսոր"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Ավտոմատ համակարգային թարմացումներ"</string>
     <string name="usage" msgid="2977875522080448986">"Օգտագործում"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Բջջային թրաֆիկ"</string>
@@ -3410,7 +3427,7 @@
     <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_2">%2$s</xliff:g> ժամանակահատվածում օգտագործվել է <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<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">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Սրբել և անցնել"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Վերակայել ShortcutManager-ի արագության սահմանափակումները"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager-ի արագության սահմանափակումները վերակայվել են"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Վերահսկել կողպէկրանի ծանուցումները"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Կառավարեք կողպէկրանին հայտնվող տեղեկությունները"</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="8483187649355540109">"Օգնություն և խորհուրդներ"</string>
@@ -3487,7 +3504,7 @@
     <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="2456198532288640046">"Տեսանելի չէ ուրիշ սարքերի համար"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Անջատված է"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Կապակցված է <xliff:g id="ID_1">%1$s</xliff:g>-ին"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Կապակցված է բազմակի շարժական սարքերի"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Համակարգի միջերեսի ցուցադրական ռեժիմ"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Ակնթարթորեն գործարկվող հավելվածներ"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Բացել հղումները հավելվածներում՝ նույնիսկ եթե դրանք տեղադրված չեն"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Ակնթարթորեն գործարկվող հավելվածներ"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Ակնթարթորեն գործարկվող հավելվածների հաշիվ"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Ակնթարթորեն գործարկվող հավելվածների կարգավորումներ"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Տեղադրված հավելվածներ"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Ձեր սարքի հիշողությունն այժմ կառավարվում է հիշողության կառավարիչի կողմից"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Հաշիվներ <xliff:g id="USER_NAME">%1$s</xliff:g> օգտատիրոջ համար"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"«Միշտ միացված VPN» կարգավորումը միացված է ձեր անձնական պրոֆիլում"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"«Միշտ միացված VPN» կարգավորումը միացված է ձեր աշխատանքային պրոֆիլում"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Ընդհանուր HTTP պրոքսին կարգավորված է"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Վստահելի հավատարմագրեր"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Վստահելի ՀԿ հավաստագրեր"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Վստահելի ՀԿ հավաստագրեր ձեր անձնական պրոֆիլում"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Վստահելի ՀԿ հավաստագրեր ձեր աշխատանքային պրոֆիլում"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">Minimum <xliff:g id="COUNT_1">%d</xliff:g> CA certificates</item>
       <item quantity="other">Նվազագույնը <xliff:g id="COUNT_1">%d</xliff:g> ՎԿ հավաստագիր</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Օպերատորի նախապատրաստման տվյալներ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Գործարկել օպերատորի նախապատրաստումը"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Ի՞նչ նորույթներ կան:"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Փորձեք լավագույն 5 գործառույթները"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Ծանոթացեք ձեր նոր հեռախոսին"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Ծանոթացեք ձեր նոր պլանշետին"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Ծանոթացեք ձեր նոր սարքին"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Տվյալ գործառույթը հասանելի չէ այս սարքի վրա"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS ծառայության գրանցման կարգավիճակը"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Գրանցված է"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Գրանցված չէ"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 8d4733c..1b6b728 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ingin mengakses pesan Anda. Berikan akses pada %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Permintaan akses SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ingin mengakses kartu SIM. Memberi akses ke kartu SIM akan menonaktifkan konektivitas data di perangkat selama tersambung. Berikan akses ke <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Terlihat sebagai \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' oleh perangkat lain"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Terlihat sebagai “<xliff:g id="DEVICE_NAME">^1</xliff:g>” oleh perangkat lain"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Perangkat Anda"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Sambungkan perangkat baru"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Tanggal &amp; waktu"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Berikutnya"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Lewati sidik jari?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Penyiapan sidik jari hanya memerlukan waktu 1 atau 2 menit. Jika langkah ini dilewati, selanjutnya Anda dapat menambahkan sidik jari di setelan."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Lewati kunci layar?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak akan dapat mencegah orang lain menggunakan tablet ini jika hilang, dicuri, atau disetel ulang."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak akan dapat mencegah orang lain menggunakan perangkat ini jika hilang, dicuri, atau disetel ulang."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak akan dapat mencegah orang lain ponsel perangkat ini jika hilang, dicuri, atau disetel ulang."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Anda telah menambahkan jumlah maksimum sidik jari"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Tidak dapat menambahkan sidik jari lagi"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Hapus semua sidik jari?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Hapus \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Ingin menghapus sidik jari ini?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Anda tidak dapat menggunakan sidik jari untuk membuka kunci ponsel, mengotorisasi pembelian, atau login ke aplikasi."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Anda tidak dapat menggunakan sidik jari untuk membuka kunci profil kerja, mengotorisasi pembelian, atau login ke aplikasi kerja."</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Ya, hapus"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Lindungi tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Lindungi perangkat"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Lindungi ponsel"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Untuk tambahan keamanan, siapkan kunci layar cadangan."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Untuk tambahan keamanan, siapkan kunci layar backup."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Cegah orang lain menggunakan tablet ini tanpa izin Anda dengan mengaktifkan fitur perlindungan perangkat. Pilih kunci layar yang ingin Anda gunakan."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Cegah orang lain menggunakan perangkat ini tanpa izin Anda dengan mengaktifkan fitur perlindungan perangkat. Pilih kunci layar yang ingin Anda gunakan."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Cegah orang lain menggunakan ponsel ini tanpa izin Anda dengan mengaktifkan fitur perlindungan perangkat. Pilih kunci layar yang ingin Anda gunakan."</string>
@@ -497,37 +502,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Hapus perlindungan perangkat?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Hapus perlindungan profil?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Fitur perlindungan perangkat tidak akan berfungsi tanpa pola."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Fitur perlindungan perangkat tidak akan berfungsi tanpa pola.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Fitur perlindungan perangkat tidak akan berfungsi tanpa pola.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Sidik jari yang tersimpan juga akan dihapus dari perangkat ini dan Anda tidak dapat membuka kunci ponsel, mengotorisasi pembelian, atau masuk ke aplikasi\"."</string>
+</xliff:g>Sidik jari yang tersimpan juga akan dihapus dari perangkat ini dan Anda tidak dapat membuka kunci ponsel, mengotorisasi pembelian, atau login ke aplikasi."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Fitur perlindungan perangkat tidak akan berfungsi tanpa PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Fitur perlindungan perangkat tidak akan berfungsi tanpa PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Fitur perlindungan perangkat tidak akan berfungsi tanpa PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Sidik jari yang tersimpan juga akan dihapus dari perangkat ini dan Anda tidak dapat membuka kunci ponsel, mengotorisasi pembelian, atau masuk ke aplikasi\"."</string>
+</xliff:g>Sidik jari yang tersimpan juga akan dihapus dari perangkat ini dan Anda tidak dapat membuka kunci ponsel, mengotorisasi pembelian, atau login ke aplikasi."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Fitur perlindungan perangkat tidak akan berfungsi tanpa sandi."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Fitur perlindungan perangkat tidak akan berfungsi tanpa sandi.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Fitur perlindungan perangkat tidak akan berfungsi tanpa sandi.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Sidik jari yang tersimpan juga akan dihapus dari perangkat ini dan Anda tidak dapat membuka kunci ponsel, mengotorisasi pembelian, atau masuk ke aplikasi\"."</string>
+</xliff:g>Sidik jari yang tersimpan juga akan dihapus dari perangkat ini dan Anda tidak dapat membuka kunci ponsel, mengotorisasi pembelian, atau login ke aplikasi."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Fitur perlindungan perangkat tidak akan berfungsi tanpa kunci layar."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Fitur perlindungan perangkat tidak akan berfungsi tanpa kunci layar.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Fitur perlindungan perangkat tidak akan berfungsi tanpa kunci layar.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Sidik jari yang tersimpan juga akan dihapus dari perangkat ini dan Anda tidak dapat membuka kunci ponsel, mengotorisasi pembelian, atau masuk ke aplikasi\"."</string>
+</xliff:g>Sidik jari yang tersimpan juga akan dihapus dari perangkat ini dan Anda tidak dapat membuka kunci ponsel, mengotorisasi pembelian, atau login ke aplikasi."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Fitur perlindungan profil tidak akan berfungsi tanpa pola."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Fitur perlindungan profil tidak akan berfungsi tanpa pola.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Fitur perlindungan profil tidak akan berfungsi tanpa pola.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Sidik jari yang tersimpan juga akan dihapus dari profil ini dan Anda tidak dapat membuka kunci profil, mengotorisasi pembelian, atau masuk aplikasi.\""</string>
+</xliff:g>Sidik jari yang tersimpan juga akan dihapus dari profil ini dan Anda tidak dapat membuka kunci profil, mengotorisasi pembelian, atau login ke aplikasi."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Fitur perlindungan profil tidak akan berfungsi tanpa PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Fitur perlindungan profil tidak akan berfungsi tanpa PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Fitur perlindungan profil tidak akan berfungsi tanpa PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Sidik jari yang tersimpan juga akan dihapus dari profil ini dan Anda tidak dapat membuka kunci profil, mengotorisasi pembelian, atau masuk aplikasi.\""</string>
+</xliff:g>Sidik jari yang tersimpan juga akan dihapus dari profil ini dan Anda tidak dapat membuka kunci profil, mengotorisasi pembelian, atau login ke aplikasi."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Fitur perlindungan profil tidak akan berfungsi tanpa sandi."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Fitur perlindungan profil tidak akan berfungsi tanpa sandi.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Fitur perlindungan profil tidak akan berfungsi tanpa sandi.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Sidik jari yang tersimpan juga akan dihapus dari profil ini dan Anda tidak dapat membuka kunci profil, mengotorisasi pembelian, atau masuk aplikasi.\""</string>
+</xliff:g>Sidik jari yang tersimpan juga akan dihapus dari profil ini dan Anda tidak dapat membuka kunci profil, mengotorisasi pembelian, atau login ke aplikasi."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Fitur perlindungan profil tidak akan berfungsi tanpa kunci layar."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Fitur perlindungan profil tidak akan berfungsi tanpa kunci layar.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Fitur perlindungan profil tidak akan berfungsi tanpa kunci layar.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Sidik jari yang tersimpan juga akan dihapus dari profil ini dan Anda tidak dapat membuka kunci profil, mengotorisasi pembelian, atau masuk aplikasi.\""</string>
+</xliff:g>Sidik jari yang tersimpan juga akan dihapus dari profil ini dan Anda tidak dapat membuka kunci profil, mengotorisasi pembelian, atau login ke aplikasi."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Ya, hapus"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Ubah pola pembuka kunci"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Ubah PIN pembuka kunci"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Urutan digit naik, turun, atau berulang tidak diizinkan"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Oke"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Batal"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Hapus"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Batal"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Selanjutnya"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Penyiapan selesai."</string>
@@ -618,7 +624,7 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Untuk menyandingkan dengan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pastikan bahwa perangkat tersebut menampilkan kode sandi:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Dari:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Sandingkan dengan perangkat ini?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Untuk menyandingkan dengan:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Ketikkan:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, kemudian tekan Kembali atau Enter."</string>
-    <string name="bluetooth_pairing_shares_phonebook" msgid="2277931851483023208">"Izinkan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> mengakses kontak dan riwayat panggilan"</string>
+    <string name="bluetooth_pairing_shares_phonebook" msgid="2277931851483023208">"Izinkan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> mengakses kontak dan histori panggilan"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
     <string name="bluetooth_connecting_error_message" msgid="1397388344342081090">"Tidak dapat tersambung ke <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Memindai perangkat"</string>
@@ -629,11 +635,11 @@
     <string name="bluetooth_preference_paired_dialog_name_label" msgid="8111146086595617285">"Nama"</string>
     <string name="bluetooth_preference_paired_dialog_internet_option" msgid="7112953286863428412">"Sambungan internet"</string>
     <string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="2271954176947879628">"Keyboard"</string>
-    <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="7747163316331917594">"Kontak dan riwayat panggilan"</string>
+    <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="7747163316331917594">"Kontak dan histori panggilan"</string>
     <string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"Sandingkan dengan perangkat ini?"</string>
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"Bagikan buku telepon?"</string>
-    <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ingin mengakses kontak dan riwayat panggilan Anda."</string>
-    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ingin menyandingkan dengan Bluetooth. Saat tersambung, perangkat dapat mengakses kontak &amp; riwayat panggilan Anda."</string>
+    <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ingin mengakses kontak dan histori panggilan Anda."</string>
+    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ingin menyandingkan dengan Bluetooth. Saat tersambung, perangkat dapat mengakses kontak &amp; histori panggilan Anda."</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Perangkat disambungkan"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Perangkat yang tersedia"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"Perangkat tak tersedia"</string>
@@ -785,7 +791,7 @@
     <string name="wifi_security" msgid="6603611185592956936">"Keamanan"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Kekuatan sinyal"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Status"</string>
-    <string name="wifi_speed" msgid="3526198708812322037">"Kecepatan tautan"</string>
+    <string name="wifi_speed" msgid="3526198708812322037">"Kecepatan link"</string>
     <string name="wifi_frequency" msgid="7791090119577812214">"Frekuensi"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"Alamat IP"</string>
     <string name="passpoint_label" msgid="6381371313076009926">"Disimpan melalui"</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tersedia"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tersedia)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Masukkan sandi jaringan Anda"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Jaringan Wi‑Fi operator"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Sambungkan melalui <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Untuk meningkatkan ketepatan lokasi dan untuk tujuan lainnya, <xliff:g id="APP_NAME">%1$s</xliff:g> ingin mengaktifkan pemindaian jaringan, bahkan saat Wi-Fi sedang tidak aktif.\n\nIzinkan ini untuk semua aplikasi yang ingin memindai?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Untuk menonaktifkannya, buka Lanjutan di menu luapan."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Izinkan"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Sambungkan"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Gagal menyambung ke jaringan"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Lupakan"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Ubah"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Gagal melupakan jaringan"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Simpan"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Gagal menyimpan jaringan"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi Lanjutan"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Alamat MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Alamat IP"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Info jaringan"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet mask"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Alamat IPv6"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Batalkan undangan?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Apakah Anda ingin membatalkan undangan untuk tersambung dengan <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Lupakan grup ini?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Hotspot Wi-Fi portabel"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Hotspot Wi‑Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Tidak berbagi sambungan Internet atau konten dengan perangkat lainnya"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Membagikan sambungan internet tablet ini melalui hotspot"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Membagikan sambungan Internet ponsel ini melalui hotspot"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplikasi membagikan konten. Untuk membagikan sambungan Internet, nonaktifkan hotspot, kemudian aktifkan kembali"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nama Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Nama hotspot"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Mengaktifkan <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Perangkat lainnya dapat terhubung ke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Sandi Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Sandi hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Pita AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Gunakan hotspot guna membuat jaringan Wi‑Fi untuk perangkat Anda lainnya. Hotspot menyediakan sambungan Internet menggunakan sambungan data seluler Anda. Biaya data tambahan mungkin berlaku."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikasi dapat membuat hotspot untuk berbagi konten dengan perangkat di sekitar."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Alamat yang digunakan oleh layanan darurat sebagai lokasi Anda jika Anda melakukan panggilan darurat melalui Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Tampilan"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Suara"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volume"</string>
@@ -990,8 +999,9 @@
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Akun kerja - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_personal_account_title" msgid="2169071663029067826">"Akun pribadi - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="search_settings" msgid="1910951467596035063">"Telusuri"</string>
-    <string name="search_settings_summary" msgid="9205656546570654169">"Kelola setelan dan riwayat penelusuran"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"Kelola setelan dan histori penelusuran"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Tidak ada hasil"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Hapus histori"</string>
     <string name="display_settings" msgid="7965901687241669598">"Tampilan"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotasi layar otomatis"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Warna jernih"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Memulihkan setelan APN default."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Setel ulang ke default"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Penyetelan ulang setelan APN default selesai."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Setel ulang"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Setelan jaringan diatur ulang"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Opsi setel ulang"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Jaringan, aplikasi, atau perangkat dapat disetel ulang"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Setel ulang Wi-Fi, data seluler &amp; Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Tindakan ini akan menyetel ulang semua setelan jaringan, termasuk:\n\n"<li>"Wi‑Fi"</li>\n<li>"Data seluler"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Setel ulang setelan"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Setel ulang semua setelan jaringan? Tindakan ini tidak dapat diurungkan!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Setel ulang?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Setel ulang jaringan tidak tersedia untuk pengguna ini"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Setelan jaringan telah disetel ulang"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Reset ke setelan pabrik"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> akun akan disetel ulang</item>
-      <item quantity="one">1 akun akan disetel ulang</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Penyimpanan internal &amp; semua data akan disetel ulang"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Hapus semua data (reset ke setelan pabrik)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" tablet Anda, termasuk:\n\n"<li>"Akun Google Anda"</li>\n<li>"Data sistem dan apl serta setelan"</li>\n<li>"Apl download"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" ponsel Anda, termasuk:\n\n"<li>"Akun Google Anda"</li>\n<li>"Data sistem dan apl serta setelan"</li>\n<li>"Apl download"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Saat ini Anda telah login ke akun berikut:\n"</string>
@@ -1374,7 +1380,7 @@
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Hotspot aktif, tethering"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Hotspot aktif"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Tethering"</string>
-    <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Tidak dapat tethering atau menggunakan hotspot portabel saat Penghemat Data aktif"</string>
+    <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Tidak dapat tethering atau menggunakan hotspot portabel saat Penghemat Kuota Internet aktif"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Tethering USB"</string>
     <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Berbagi sambungan internet ponsel melalui USB"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informasi keselamatan"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Anda tidak memiliki koneksi data. Untuk menampilkan informasi ini sekarang, buka %s dari komputer mana pun yang tersambung ke internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Memuat…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Pilih sandi Anda"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Setel kunci layar"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Untuk keamanan, setel sandi"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Setel sandi guna memakai sidik jari"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Pilih pola Anda"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Setel pola untuk fitur sidik jari"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Pilih PIN Anda"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Untuk keamanan, setel PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Setel PIN guna memakai sidik jari"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Konfirmasi sandi Anda"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Masukkan ulang sandi"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Konfirmasi pola Anda"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Konfirmasi PIN Anda"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Masukkan ulang PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Sandi tidak cocok"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN tidak cocok"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Buka pilihan"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Gunakan pola kerja untuk melanjutkan"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Masukkan PIN kerja untuk melanjutkan"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Masukkan sandi kerja untuk melanjutkan"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Gunakan pola perangkat untuk melanjutkan. Diperlukan setelah perangkat dimulai ulang."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Masukkan PIN perangkat untuk melanjutkan. Diperlukan setelah perangkat dimulai ulang."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Masukkan sandi perangkat untuk melanjutkan. Diperlukan setelah perangkat dimulai ulang."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Gunakan pola kerja untuk melanjutkan. Diperlukan setelah perangkat dimulai ulang."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Masukkan PIN kerja untuk melanjutkan. Diperlukan setelah perangkat dimulai ulang."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Masukkan sandi kerja untuk melanjutkan. Diperlukan setelah perangkat dimulai ulang."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Untuk tambahan keamanan, gunakan pola perangkat"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Untuk tambahan keamanan, masukkan PIN perangkat"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Untuk tambahan keamanan, masukkan sandi perangkat"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Untuk tambahan keamanan, gunakan pola profil kerja"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Untuk tambahan keamanan, masukkan PIN profil kerja"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Untuk tambahan keamanan, masukkan sandi profil kerja"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Ponsel telah disetel ulang ke setelan pabrik. Masukkan pola sebelumnya untuk menggunakan ponsel."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Ponsel telah disetel ulang ke setelan pabrik. Masukkan PIN sebelumnya untuk menggunakan ponsel."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Ponsel telah disetel ulang ke setelan pabrik. Masukkan sandi sebelumnya untuk menggunakan ponsel."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verifikasi pola"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verifikasi PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verifikasi sandi"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN Salah"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Sandi salah"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Pola salah"</string>
@@ -1654,8 +1667,8 @@
     <string name="app_disable_dlg_text" msgid="5632072173181990531">"Jika Anda menonaktifkan aplikasi ini, Android dan aplikasi lain mungkin tidak berfungsi lagi sesuai harapan."</string>
     <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Hapus data dan nonaktifkan aplikasi?"</string>
     <string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Jika Anda menonaktifkan aplikasi ini, Android dan aplikasi lain mungkin tidak berfungsi lagi sesuai harapan. Data juga akan dihapus."</string>
-    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Nonaktifkan notifikasi?"</string>
-    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Jika Anda mematikan notifikasi untuk aplikasi ini, Anda dapat melewatkan pembaruan dan lansiran penting."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Matikan notifikasi?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Jika Anda mematikan notifikasi untuk aplikasi ini, Anda dapat melewatkan pembaruan dan notifikasi penting."</string>
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Toko Aplikasi"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Detail aplikasi"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Aplikasi diinstal dari <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Buat widget dan izinkan akses?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Setelah Anda membuat widget, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> dapat mengakses semua data yang ditampilkannya."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Selalu izinkan <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> untuk membuat widget dan mengakses data mereka"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>h <xliff:g id="HOURS">%2$d</xliff:g>j <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>d"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>jam <xliff:g id="MINUTES">%2$d</xliff:g>mnt <xliff:g id="SECONDS">%3$d</xliff:g>dtk"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>menit <xliff:g id="SECONDS">%2$d</xliff:g> detik"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>dtk"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>h <xliff:g id="HOURS">%2$d</xliff:g>j <xliff:g id="MINUTES">%3$d</xliff:g>m"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>j <xliff:g id="MINUTES">%2$d</xliff:g>m"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Statistik penggunaan"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Statistik penggunaan"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Urutkan menurut:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Pembaca layar, tampilan, kontrol interaksi"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Setelan Pandangan"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Anda dapat menyesuaikan perangkat ini sesuai kebutuhan. Fitur aksesibilitas ini dapat diubah nanti di Setelan."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Tambahkan ukuran font"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Ubah ukuran font"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Pembaca layar"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio &amp; teks di layar"</string>
     <string name="display_category_title" msgid="685461049938269166">"Tampilan"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Untuk melakukan zoom"</b>", tap layar 3 kali dengan cepat.\n"<ul><li>"Seret menggunakan 2 jari atau lebih untuk men-scroll"</li>\n<li>"Cubit menggunakan 2 jari atau lebih untuk menyesuaikan zoom"</li></ul>\n\n<b>"Untuk melakukan zoom sementara"</b>", tap layar 3 kali dengan cepat dan tahan jari pada tap ke-3.\n"<ul><li>"Seret untuk memindahkan zoom ke bagian layar yang lain"</li>\n<li>"Angkat jari untuk memperkecil"</li></ul>\n\n"Anda tidak dapat memperbesar keyboard dan menu navigasi."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Jika pembesaran diaktifkan, gunakan tombol Aksesibilitas di bagian bawah layar untuk memperbesar dengan cepat.\n\n"<b>"Untuk melakukan zoom"</b>", tap tombol Aksesibilitas, kemudian tap layar di bagian mana saja.\n"<ul><li>"Seret menggunakan 2 jari atau lebih untuk men-scroll"</li>\n<li>"Cubit menggunakan 2 jari atau lebih untuk menyesuaikan zoom"</li></ul>\n\n<b>"Untuk melakukan zoom sementara"</b>", tap tombol Aksesibilitas, kemudian sentuh &amp; tahan layar di bagian mana saja.\n"<ul><li>"Seret untuk memindahkan zoom ke bagian layar yang lain"</li>\n<li>"Angkat jari untuk memperkecil"</li></ul>\n\n"Anda tidak dapat memperbesar keyboard atau menu navigasi."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Tombol Aksesibilitas disetel ke <xliff:g id="SERVICE">%1$s</xliff:g>. Untuk menggunakan fitur pembesaran, sentuh &amp; tahan tombol Aksesibilitas, kemudian pilih pembesaran."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Pintasan aksesibilitas"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Pintasan tombol volume"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Layanan pintasan"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Izinkan dari layar kunci"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Jika pintasan aktif, Anda dapat menekan kedua tombol volume selama 3 detik untuk memulai fitur aksesibilitas."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Jika pintasan aktif, Anda dapat menekan kedua tombol volume selama 3 detik untuk memulai fitur aksesibilitas."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Teks kontras tinggi"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Perbarui otomatis pembesaran layar"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Perbarui pembesaran layar di transisi aplikasi"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Mungkin memengaruhi performa"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klik setelah penunjuk mouse berhenti bergerak"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Keterlambatan sebelum klik"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"AKTIF"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"NONAKTIF"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Tampilkan di Setelan Cepat"</string>
@@ -1991,7 +1996,7 @@
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi berdasarkan waktu"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi berdasarkan waktu"</string>
     <string name="advanced_battery_title" msgid="2068039111517508622">"Penggunaan baterai lanjutan"</string>
-    <string name="history_details_title" msgid="3608240585315506067">"Detail riwayat"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Detail histori"</string>
     <string name="battery_details_title" msgid="6101394441569858580">"Penggunaan baterai"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Detail penggunaan"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Sesuaikan penggunaan daya"</string>
@@ -2240,8 +2245,8 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Saat ini, tidak ada akun yang menyimpan data cadangan"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Berhenti mencadangkan sandi Wi-Fi, bookmark, setelan lainnya, dan data aplikasi, serta menghapus semua salinan di server Google?"</string>
-    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"Berhenti mencadangkan data perangkat (seperti sandi Wi-Fi dan riwayat panggilan) dan data aplikasi (seperti setelan dan file yang disimpan oleh aplikasi), serta hapus semua salinan di server jarak jauh?"</string>
-    <string name="fullbackup_data_summary" msgid="960850365007767734">"Otomatis cadangkan data perangkat (seperti sandi Wi-Fi dan riwayat panggilan) dan data aplikasi (seperti setelan dan file yang disimpan oleh aplikasi) dari jarak jauh.\n\nJika Anda mengaktifkan cadangan otomatis, data perangkat dan aplikasi secara berkala disimpan dari jarak jauh. Data aplikasi dapat berupa data apa saja yang telah disimpan oleh aplikasi (menurut setelan pengembang), termasuk data yang berpotensi sensitif seperti kontak, pesan, dan foto."</string>
+    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"Berhenti mencadangkan data perangkat (seperti sandi Wi-Fi dan histori panggilan) dan data aplikasi (seperti setelan dan file yang disimpan oleh aplikasi), serta hapus semua salinan di server jarak jauh?"</string>
+    <string name="fullbackup_data_summary" msgid="960850365007767734">"Otomatis cadangkan data perangkat (seperti sandi Wi-Fi dan histori panggilan) dan data aplikasi (seperti setelan dan file yang disimpan oleh aplikasi) dari jarak jauh.\n\nJika Anda mengaktifkan cadangan otomatis, data perangkat dan aplikasi secara berkala disimpan dari jarak jauh. Data aplikasi dapat berupa data apa saja yang telah disimpan oleh aplikasi (menurut setelan pengembang), termasuk data yang berpotensi sensitif seperti kontak, pesan, dan foto."</string>
     <string name="device_admin_settings_title" msgid="4960761799560705902">"Setelan admin perangkat"</string>
     <string name="active_device_admin_msg" msgid="578748451637360192">"Aplikasi admin perangkat"</string>
     <string name="remove_device_admin" msgid="9207368982033308173">"Nonaktifkan aplikasi admin perangkat ini"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Terpilih <xliff:g id="NUMBER">%1$d</xliff:g> dari <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> dari <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Pilih semua"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Kelola paket"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Penggunaan data"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Penggunaan data aplikasi"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Penghitungan data operator mungkin berbeda dengan perangkat Anda."</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Jaringan seluler"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Jaringan Wi‑Fi berbayar"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Untuk memilih jaringan berbayar, aktifkan Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Otomatis"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Berbayar"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Tidak berbayar"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Penghitungan data operator mungkin berbeda dengan perangkat Anda."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Panggilan darurat"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Kembali ke panggilan"</string>
@@ -2612,9 +2621,9 @@
     <string name="user_enable_calling_sms" msgid="9172507088023097063">"Aktifkan panggilan telepon &amp; SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Hapus pengguna"</string>
     <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Aktifkan panggilan telepon?"</string>
-    <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Riwayat panggilan akan dibagikan dengan pengguna ini."</string>
+    <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Histori panggilan akan dibagikan dengan pengguna ini."</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Aktifkan panggilan telepon &amp; SMS?"</string>
-    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Riwayat panggilan dan SMS akan dibagikan dengan pengguna ini."</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Histori panggilan dan SMS akan dibagikan dengan pengguna ini."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informasi darurat"</string>
     <string name="emergency_info_summary" msgid="5062945162967838521">"Info &amp; kontak untuk <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Izinkan aplikasi dan konten"</string>
@@ -2649,10 +2658,10 @@
     <string name="user_account_title" msgid="1127193807312271167">"Akun untuk konten"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID Foto"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Ancaman ekstrem"</string>
-    <string name="extreme_threats_summary" msgid="8777860706500920667">"Terima lansiran untuk ancaman ekstrem bagi nyawa &amp; properti"</string>
+    <string name="extreme_threats_summary" msgid="8777860706500920667">"Terima peringatan untuk ancaman genting bagi harta dan nyawa"</string>
     <string name="severe_threats_title" msgid="8362676353803170963">"Ancaman berat"</string>
-    <string name="severe_threats_summary" msgid="8848126509420177320">"Terima lansiran untuk ancaman berat bagi nyawa dan properti"</string>
-    <string name="amber_alerts_title" msgid="2772220337031146529">"Lansiran AMBER"</string>
+    <string name="severe_threats_summary" msgid="8848126509420177320">"Terima peringatan untuk ancaman berat bagi harta dan nyawa"</string>
+    <string name="amber_alerts_title" msgid="2772220337031146529">"Notifikasi AMBER"</string>
     <string name="amber_alerts_summary" msgid="4312984614037904489">"Terima buletin tentang penculikan anak"</string>
     <string name="repeat_title" msgid="6473587828597786996">"Ulangi"</string>
     <string name="call_manager_enable_title" msgid="7718226115535784017">"Aktifkan Pengelola Panggilan"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Pengelola Telepon"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Notifikasi darurat"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Notifikasi darurat"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Operator jaringan"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Nama poin akses"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Mode LTE 4G yang Ditingkatkan"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"SIM pilihan untuk"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Selalu tanya"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Perlu dipilih"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"pilihan SIM"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Setelan"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">Tampilkan %d item tersembunyi</item>
@@ -2764,7 +2774,7 @@
     <string name="keywords_storage" msgid="3299217909546089225">"ruang, disk, hard drive, penggunaan perangkat"</string>
     <string name="keywords_battery" msgid="1173830745699768388">"penggunaan daya, isi daya"</string>
     <string name="keywords_spell_checker" msgid="1399641226370605729">"ejaan, kamus, periksaejaan, koreksi-otomatis"</string>
-    <string name="keywords_voice_input" msgid="769778245192531102">"pengenal, masukan, ucapan, ucapkan, bahasa, handsfree, hands free, pengenalan, menyinggung, kata, audio, riwayat, bluetooth headset"</string>
+    <string name="keywords_voice_input" msgid="769778245192531102">"pengenal, masukan, ucapan, ucapkan, bahasa, handsfree, hands free, pengenalan, menyinggung, kata, audio, histori, bluetooth headset"</string>
     <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"beri nilai, bahasa, default, ucapkan, berbicara, text to speech, aksesibilitas, pembaca layar, tunanetra"</string>
     <string name="keywords_date_and_time" msgid="758325881602648204">"jam, militer"</string>
     <string name="keywords_network_reset" msgid="6024276007080940820">"setel ulang, memulihkan, pabrik"</string>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Notifikasi apl"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategori notifikasi"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Tingkat Kepentingan"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Biarkan aplikasi memutuskan"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Izinkan suara"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Jangan pernah tampilkan notifikasi"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Tidak ada gangguan suara atau visual"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Tanpa suara"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Buat suara"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Buat suara dan munculkan di layar"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Munculkan di layar"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Rendah"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Sedang"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Tinggi"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Penting"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Izinkan suara"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Jangan bersuara, bergetar, atau mengintip notifikasi tersebut untuk ditampilkan di layar saat ini."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Izinkan notifikasi"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Izinkan aplikasi bersuara, bergetar, dan/atau menampilkan notifikasi di layar"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Tingkat kepentingan rendah"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Tingkat kepentingan sedang"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Tingkat kepentingan tinggi"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"masukkan gambar"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Izinkan picture-in-picture"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Mengizinkan aplikasi ini membuat jendela picture-in-picture saat aplikasi terbuka atau setelah Anda membiarkannya terbuka (misalnya, untuk melanjutkan menonton video). Jendela ini ditampilkan di atas aplikasi lain yang sedang digunakan."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Mengizinkan aplikasi ini membuat jendela picture-in-picture saat aplikasi terbuka atau setelah Anda membiarkannya terbuka (misalnya, untuk melanjutkan menonton video). Jendela ini ditampilkan di atas aplikasi lain yang sedang digunakan."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Akses Jangan Ganggu"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Tidak ada aplikasi terpasang yang meminta akses Jangan Ganggu"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Memuat aplikasi..."</string>
@@ -3046,7 +3057,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Aktif"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Nonaktif"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Pin ke layar"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"Jika setelan ini diaktifkan, Anda dapat menggunakan fitur pin ke layar agar tampilan layar tetap seperti ini sampai pin dilepas.\n\nUntuk menggunakan fitur pin ke layar:\n\n1. Pastikan fitur pin ke layar telah diaktifkan.\n\n2. Buka layar yang ingin Anda pasang pin.\n\n3. Ketuk Ringkasan.\n\n4. Gesek ke atas, lalu ketuk ikon pin."</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"Jika setelan ini diaktifkan, Anda dapat menggunakan fitur pin ke layar agar tampilan layar tetap seperti ini sampai pin dilepas.\n\nUntuk menggunakan fitur pin ke layar:\n\n1. Pastikan fitur pin ke layar telah diaktifkan.\n\n2. Buka layar yang ingin Anda pasang pin.\n\n3. Ketuk Ringkasan.\n\n4. Geser ke atas, lalu ketuk ikon pin."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Minta pola pembuka kunci sebelum melepas pin"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Minta PIN sebelum lepas pin"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Minta sandi sebelum melepas pin"</string>
@@ -3076,7 +3087,7 @@
     <string name="slot_number" msgid="3762676044904653577">"(Slot<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
     <string name="launch_by_default" msgid="1840761193189009248">"Buka secara default"</string>
     <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Membuka link"</string>
-    <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"Buka tautan yang didukung"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"Buka link yang didukung"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"Buka tanpa perlu bertanya"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"Tautan yang didukung"</string>
     <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Default lainnya"</string>
@@ -3132,7 +3143,7 @@
     <string name="tap_to_wake" msgid="7211944147196888807">"Ketuk untuk membangunkan"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Ketuk layar dua kali di mana saja untuk membangunkan perangkat"</string>
     <string name="domain_urls_title" msgid="3132983644568821250">"Membuka link"</string>
-    <string name="domain_urls_summary_none" msgid="2639588015479657864">"Jangan buka tautan yang didukung"</string>
+    <string name="domain_urls_summary_none" msgid="2639588015479657864">"Jangan buka link yang didukung"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"Buka <xliff:g id="DOMAIN">%s</xliff:g>"</string>
     <string name="domain_urls_summary_some" msgid="3950089361819428455">"Buka <xliff:g id="DOMAIN">%s</xliff:g> dan URL lain"</string>
     <string name="domain_urls_apps_summary_off" msgid="1833056772600031220">"Tidak ada aplikasi yang membuka link yang didukung"</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Mentransfer file"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Mentransfer foto (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Menggunakan perangkat sebagai MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Pencerminan SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Pemeriksaan latar belakang"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Akses penuh latar belakang"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Gunakan teks dari layar"</string>
@@ -3271,7 +3283,7 @@
     <string name="draw_overlay" msgid="6564116025404257047">"Tampilkan di atas aplikasi lain"</string>
     <string name="system_alert_window_settings" msgid="8466613169103527868">"Tampilkan di atas aplikasi lain"</string>
     <string name="system_alert_window_apps_title" msgid="7005760279028569491">"Aplikasi"</string>
-    <string name="system_alert_window_access_title" msgid="6297115362542361241">"Tampilkan di atas aplikasi lain"</string>
+    <string name="system_alert_window_access_title" msgid="6297115362542361241">"Tampilkan di dalam aplikasi lain"</string>
     <string name="permit_draw_overlay" msgid="7456536798718633432">"Izinkan ditampilkan di atas aplikasi lain"</string>
     <string name="app_overlay_permission_preference" msgid="9039432222453006038">"Izin menampilkan aplikasi di atas"</string>
     <string name="allow_overlay_description" msgid="8961670023925421358">"Izinkan aplikasi ini ditampilkan di atas aplikasi lain yang sedang digunakan. Setelan ini dapat mengganggu penggunaan aplikasi tersebut atau mengubah cara tampilannya atau perilakunya."</string>
@@ -3363,10 +3375,12 @@
     <string name="condition_battery_summary" msgid="4418839236027977450">"Performa diturunkan. Layanan lokasi dan data latar belakang dinonaktifkan."</string>
     <string name="condition_cellular_title" msgid="1327317003797575735">"Data seluler tidak aktif"</string>
     <string name="condition_cellular_summary" msgid="1818046558419658463">"Internet hanya tersedia melalui Wi-Fi"</string>
-    <string name="condition_bg_data_title" msgid="2483860304802846542">"Penghemat Data aktif"</string>
+    <string name="condition_bg_data_title" msgid="2483860304802846542">"Penghemat Kuota Internet aktif"</string>
     <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="night_display_suggestion_title" msgid="6602129097059325291">"Setel jadwal Cahaya Malam"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Ronai layar dengan warna coklat keemasan untuk membantu Anda tidur"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Mode Cahaya Malam aktif"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Layar berona kuning. Mungkin dapat membantu Anda tidur."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Saran"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gunakan suhu tampilan yang lebih sejuk"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Untuk menerapkan perubahan warna, nonaktifkan layar"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Untuk menerapkah perubahan monitor telefoni, reboot perangkat"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Untuk menerapkan perubahan Kamera HAL HDR+, reboot perangkat"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor Laser Kamera"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Pemutakhiran sistem otomatis"</string>
     <string name="usage" msgid="2977875522080448986">"Penggunaan"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Penggunaan data seluler"</string>
@@ -3410,20 +3427,20 @@
     <string name="data_warning" msgid="209133958008062117">"Peringatan data"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Setel batas data"</string>
     <string name="data_limit" msgid="1885406964934590552">"Batas data"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> digunakan antara <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> digunakan <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurasi"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Aplikasi lain yang disertakan dalam penggunaan"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplikasi diizinkan untuk menggunakan data yang tidak dibatasi jika Penghemat Data aktif</item>
-      <item quantity="one">1 aplikasi diizinkan untuk menggunakan data yang tidak dibatasi jika Penghemat Data aktif</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplikasi diizinkan untuk menggunakan data yang tidak dibatasi jika Penghemat Kuota Internet aktif</item>
+      <item quantity="one">1 aplikasi diizinkan untuk menggunakan data yang tidak dibatasi jika Penghemat Kuota Internet aktif</item>
     </plurals>
-    <string name="data_saver_title" msgid="398458827917495765">"Penghemat data"</string>
+    <string name="data_saver_title" msgid="398458827917495765">"Penghemat kuota internet"</string>
     <string name="unrestricted_data_saver" msgid="952796077540228711">"Data tidak dibatasi"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Data latar belakang nonaktif"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Aktif"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Nonaktif"</string>
     <string name="unrestricted_app_title" msgid="4465437191723332066">"Penggunaan data tidak dibatasi"</string>
-    <string name="unrestricted_app_summary" msgid="6458008993501723912">"Izinkan akses data yang tidak dibatasi jika Penghemat Data aktif"</string>
+    <string name="unrestricted_app_summary" msgid="6458008993501723912">"Izinkan akses data yang tidak dibatasi jika Penghemat Kuota Internet aktif"</string>
     <string name="home_app" msgid="4066188520886810030">"Aplikasi layar utama"</string>
     <string name="no_default_home" msgid="7184117487704520238">"Tidak ada Layar Utama default"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"Proses memulai dengan aman"</string>
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Hapus dan konversikan"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Setel ulang pembatasan kecepatan PengelolaPintasan"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Pembatasan kecepatan PengelolaPintasan telah disetel ulang"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Mengontrol notifikasi layar kunci"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Kontrol info di 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="8483187649355540109">"Dukungan &amp; tips"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Tidak ada aplikasi yang terpasang yang meminta akses SMS Premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"SMS Premium mungkin memerlukan biaya dan akan menambah tagihan operator. Jika izin aplikasi diaktifkan, Anda dapat mengirim SMS premium menggunakan aplikasi tersebut."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Akses SMS Premium"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Tidak terlihat oleh perangkat lain"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Nonaktif"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Terhubung ke <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Terhubung ke beberapa perangkat"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Mode demo UI sistem"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Aplikasi instan"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Buka link di aplikasi, walaupun tidak diinstal"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Aplikasi instan"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Akun aplikasi instan"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Preferensi Aplikasi Instan"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplikasi terpasang"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Penyimpanan kini dikelola oleh pengelola penyimpanan"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Akun untuk <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"VPN yang selalu aktif telah diaktifkan di profil pribadi"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"VPN yang selalu aktif telah diaktifkan di profil kerja"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy HTTP global disetel"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Kredensial tepercaya"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Kredensial tepercaya"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Kredensial tepercaya di profil pribadi Anda"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Kredensial tepercaya di profil kerja Anda"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Minimum <xliff:g id="COUNT_1">%d</xliff:g> sertifikat CA</item>
       <item quantity="one">Minimum <xliff:g id="COUNT_0">%d</xliff:g> sertifikat CA</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Info Provisioning Operator"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Memicu Provisioning Operator"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Apa yang baru dan menarik?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Lihat 5 fitur teratas"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Ikuti tur tentang ponsel baru Anda"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Ikuti tur tentang tablet baru Anda"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Ikuti tur tentang perangkat baru Anda"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Fitur ini tidak tersedia di perangkat"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Status pendaftaran IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Terdaftar"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Tidak terdaftar"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index ce997c4..0512294 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s vill fá aðgang að skilaboðunum þínum. Viltu gefa %2$s aðgang?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Beiðni um aðgang að SIM-korti"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> vill fá aðgang að SIM-kortinu þínu. Ef þú veitir aðgang að SIM-kortinu er slökkt á gagnatengingu tækisins á meðan tengingin varir. Veita <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> aðgang"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Sýnilegt öðrum tækjum sem „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Sýnilegt öðrum tækjum sem „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Tækin þín"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Para nýtt tæki"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Dagsetning og tími"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Áfram"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Viltu sleppa fingrafari?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Uppsetning fingrafars tekur bara mínútu eða tvær. Ef þú sleppir þessu skrefi geturðu bætt fingrafarinu við seinna í stillingunum."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Viltu sleppa skjálás?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Öryggiseiginleikar til að vernda tækið verða ekki gerðir virkir. Þú munt ekki geta komið í veg fyrir að aðrir noti spjaldtölvuna ef hún týnist, er stolið eða endurstillt."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Öryggiseiginleikar til að vernda tækið verða ekki gerðir virkir. Þú munt ekki geta komið í veg fyrir að aðrir noti tækið ef það týnist, er stolið eða endurstillt."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Öryggiseiginleikar til að vernda tækið verða ekki gerðir virkir. Þú munt ekki geta komið í veg fyrir að aðrir noti símann ef hann týnist, er stolið eða endurstilltur."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Þú hefur bætt við hámarksfjölda fingrafara"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Ekki er hægt að bæta fleiri fingraförum við"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Fjarlægja öll fingraför?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Fjarlægja „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Viltu eyða þessu fingrafari?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Þú getur ekki notað fingraför til að taka símann úr lás, heimila kaup eða skrá þig inn í forrit"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Þú getur ekki notað fingraför til að taka vinnusniðið úr lás, heimila kaup eða skrá þig inn í vinnuforrit"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Já, fjarlægja"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Auktu öryggi spjaldtölvunnar"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Auktu öryggi tækisins"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Auktu öryggi símans"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Settu upp skjálás til vara til að gæta fyllsta öryggis."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Settu upp skjálás til vara til að gæta fyllsta öryggis."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Komdu í veg fyrir að aðrir noti þessa spjaldtölvu í heimildarleysi með því að virkja varnareiginleika spjaldtölvunnar. Veldu þann skjálás sem þú vilt nota."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Komdu í veg fyrir að aðrir noti þetta tæki í heimildarleysi með því að virkja varnareiginleika tækisins. Veldu þann skjálás sem þú vilt nota."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Komdu í veg fyrir að aðrir noti þennan síma í heimildarleysi með því að virkja varnareiginleika símans. Veldu þann skjálás sem þú vilt nota."</string>
@@ -497,35 +502,35 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Viltu fjarlægja eiginleika til að vernda tækið?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Fjarlægja vernd fyrir sniðið?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Öryggiseiginleikar til að vernda tækið virka ekki án mynsturs."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Öryggiseiginleikar til að vernda tækið virka ekki án mynsturs.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Öryggiseiginleikar til að vernda tækið virka ekki án mynsturs.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Vistuðu fingraförin þín verða einnig fjarlægð úr þessu tæki og þú getur ekki tekið símann úr lás, staðfest kaup eða skráð þig inn í forrit með þeim."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Öryggiseiginleikar til að vernda tækið virka ekki án PIN-númers."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Öryggiseiginleikar til að vernda tækið virka ekki án PIN-númers.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Öryggiseiginleikar til að vernda tækið virka ekki án PIN-númers.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Vistuðu fingraförin þín verða einnig fjarlægð úr þessu tæki og þú getur ekki tekið símann úr lás, staðfest kaup eða skráð þig inn í forrit með þeim."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Öryggiseiginleikar til að vernda tækið virka ekki án aðgangsorðs."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Öryggiseiginleikar til að vernda tækið virka ekki án aðgangsorðs.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Öryggiseiginleikar til að vernda tækið virka ekki án aðgangsorðs.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Vistuðu fingraförin þín verða einnig fjarlægð úr þessu tæki og þú getur ekki tekið símann úr lás, staðfest kaup eða skráð þig inn í forrit með þeim."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Öryggiseiginleikar til að vernda tækið virka ekki án skjáláss."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Öryggiseiginleikar til að vernda tækið virka ekki án skjáláss.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Öryggiseiginleikar til að vernda tækið virka ekki án skjáláss.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Vistuðu fingraförin þín verða einnig fjarlægð úr þessu tæki og þú getur ekki tekið símann úr lás, staðfest kaup eða skráð þig inn í forrit með þeim."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Öryggiseiginleikar til að vernda sniðið virka ekki án mynsturs."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Öryggiseiginleikar til að vernda sniðið virka ekki án mynsturs.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Öryggiseiginleikar til að vernda sniðið virka ekki án mynsturs.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Vistuðu fingraförin þín verða einnig fjarlægð af þessu sniði og þú getur ekki tekið sniðið úr lás, staðfest kaup eða skráð þig inn í forrit með þeim."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Öryggiseiginleikar til að vernda sniðið virka ekki án PIN-númers."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Öryggiseiginleikar til að vernda sniðið virka ekki án PIN-númers.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Öryggiseiginleikar til að vernda sniðið virka ekki án PIN-númers.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Vistuðu fingraförin þín verða einnig fjarlægð af þessu sniði og þú getur ekki tekið sniðið úr lás, staðfest kaup eða skráð þig inn í forrit með þeim."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Öryggiseiginleikar til að vernda sniðið virka ekki án aðgangsorðs."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Öryggiseiginleikar til að vernda sniðið virka ekki án aðgangsorðs.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Öryggiseiginleikar til að vernda sniðið virka ekki án aðgangsorðs.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Vistuðu fingraförin þín verða einnig fjarlægð af þessu sniði og þú getur ekki tekið sniðið úr lás, staðfest kaup eða skráð þig inn í forrit með þeim."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Öryggiseiginleikar til að vernda sniðið virka ekki án skjáláss."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Öryggiseiginleikar til að vernda sniðið virka ekki án skjáláss.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Öryggiseiginleikar til að vernda sniðið virka ekki án skjáláss.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Vistuðu fingraförin þín verða einnig fjarlægð af þessu sniði og þú getur ekki tekið sniðið úr lás, staðfest kaup eða skráð þig inn í forrit með þeim."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Já, fjarlægja"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Hækkandi, lækkandi eða endurtekin röð tölustafa er óheimil"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Í lagi"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Hætta við"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Hreinsa"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Hætta við"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Áfram"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Uppsetningu er lokið."</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tiltækt"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tiltækt)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Sláðu inn aðgangsorð netsins"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Wi-Fi kerfi símafyrirtækis"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Tengjast gegnum <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> vill geta leitað að neti, jafnvel þegar slökkt er á Wi-Fi, m.a. til að gera ákvörðun staðsetningar nákvæmari.\n\nLeyfa þetta fyrir öll forrit sem vilja leita að neti?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Slökkt er á þessu í „Ítarlegt“ í umframvalmyndinni."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Leyfa"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Tengjast"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Ekk tókst að tengjast neti"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Gleyma"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Breyta"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Ekki tókst að gleyma neti"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Vista"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Ekki tókst að vista net"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Ítarlegar Wi-Fi stillingar"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-vistfang"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-tala"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Upplýsingar um kerfi"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Undirnetssía"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-tölur"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Hætta við boð?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Viltu hætta við boð um að tengjast <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Gleyma þessum hópi?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Heitur Wi-Fi reitur"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Heitur Wi-Fi reitur"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Deilir ekki nettengingu eða efni með öðrum tækjum"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Internettengingu þessarar spjaldtölvu er deilt um heitan reit"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Internettengingu þessa síma er deilt um heitan reit"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Forrit deilir efni. Til að deila nettengingu skaltu slökkva á heita reitnum og kveikja á honum aftur."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Heiti Wi‑Fi reits"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Heiti á heitum reit"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Kveikir á <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Önnur tæki geta tengst <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi aðgangsorð"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Aðgangsorð fyrir heitan reit"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Tíðnisvið"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Notaðu heitan reit til að búa til Wi-Fi net fyrir önnur tæki. Heitir reitir bjóða upp á internetaðgang með því að nota farsímagagnatenginguna þína. Viðbótargjöld vegna farsímagagna kunna að eiga við."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Forrit geta búið til heitan reit til að deila efni með nálægum tækjum."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Heimilisfang sem neyðarþjónustur nota sem staðsetningu þína ef þú hringir í neyðarlínuna gegnum Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skjár"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Hljóð"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Hljóðstyrkur"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Leit"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Stjórna leitarstillingum og ferli"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Engar niðurstöður"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Hreinsa feril"</string>
     <string name="display_settings" msgid="7965901687241669598">"Skjár"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Snúa skjá sjálfkrafa"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Skærir litir"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Endurheimtir sjálfgefnar stillingar aðgangsstaðar."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Núllstilla"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Sjálfgefnar stillingar aðgangsstaðar endurheimtar."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Endurstilla"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Endurstilling netstillinga"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Valkostir endurstillingar"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Hægt er að endurstilla netkerfi, forrit eða tæki"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Endurstilla Wi-Fi, farsímagögn og Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Þetta mun endurstilla allar netkerfisstillingar, þar á meðal:\n\n"<li>"Wi‑Fi"</li>\n<li>"Farsímagögn"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Endurstilla"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Endurstilla allar netstillingar? Ekki er hægt að afturkalla þessa aðgerð."</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Endurstilla?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Núllstilling nets er ekki í boði fyrir þennan notanda"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Netstillingar voru endurstilltar"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Núllstilling"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> reikningur verður endurstilltur</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> reikningar verða endurstilltir</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Innra geymslurými og öll gögn verða endurstillt"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Eyða öllum gögnum (núllstilla)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Þessi aðgerð eyðir öllum gögnum úr "<b>"innbyggðri geymslu"</b>" spjaldtölvunnar, þar á meðal:\n\n"<li>"Google reikningnum þínum"</li>\n<li>"Gögnum og stillingum forrita og kerfis"</li>\n<li>"Forritum sem hafa verið sótt"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Þessi aðgerð eyðir öllum gögnum úr "<b>"innbyggðri geymslu"</b>" símans, þar á meðal:\n\n"<li>"Google reikningnum þínum"</li>\n<li>"Gögnum og stillingum forrita og kerfis"</li>\n<li>"Forritum sem hafa verið sótt"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Þú ert skráð(ur) inn á eftirfarandi reikninga:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Öryggisupplýsingar"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Engin gagnatenging er fyrir hendi. Til að skoða þessar upplýsingar núna skaltu fara á %s úr nettengdri tölvu."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Hleður…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Veldu aðgangsorð"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Setja upp skjálás"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Settu upp aðgangsorð til að gæta fyllsta öryggis"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Aðgangsorð þarf fyrir fingrafar"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Veldu þér mynstur"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Mynstur þarf fyrir fingrafar"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Veldu þér PIN-númer"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Settu upp PIN-númer til að gæta fyllsta öryggis"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"PIN-númer þarf fyrir fingrafar"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Staðfestu aðgangsorðið"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Sláðu aðgangsorðið inn aftur"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Staðfestu mynstrið"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Staðfestu PIN-númerið"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Sláðu PIN-númerið inn aftur"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Aðgangsorðin stemma ekki."</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-númerin stemma ekki"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Veldu skjálás"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Notaðu vinnumynstrið þitt til að halda áfram"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Sláðu inn PIN-númerið þitt fyrir vinnuna til að halda áfram"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Sláðu inn vinnuaðgangsorðið þitt til að halda áfram"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Teiknaðu mynstrið þitt fyrir tækið til að halda áfram. Nauðsynlegt eftir endurræsingu."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Sláðu inn PIN-númerið þitt fyrir tækið til að halda áfram. Nauðsynlegt eftir endurræsingu."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Sláðu inn aðgangsorðið þitt fyrir tækið til að halda áfram. Nauðsynlegt eftir endurræsingu."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Notaðu vinnumynstrið þitt til að halda áfram. Nauðsynlegt eftir endurræsingu."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Sláðu inn PIN-númerið þitt fyrir vinnuna til að halda áfram. Nauðsynlegt eftir endurræsingu."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Sláðu inn vinnuaðgangsorðið þitt til að halda áfram. Nauðsynlegt eftir endurræsingu."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Notaðu mynstur tækisins til að gæta fyllsta öryggis"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Færðu inn PIN-númer tækisins til að gæta fyllsta öryggis"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Settu upp aðgangsorð tækisins til að gæta fyllsta öryggis"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Notaðu vinnumynstur til að gæta fyllsta öryggis"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Færðu inn PIN-númer vinnu til að gæta fyllsta öryggis"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Settu upp vinnuaðgangsorð til að gæta fyllsta öryggis"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Síminn var stilltur á verksmiðjustillingar. Til að nota hann skaltu slá inn eldra opnunarmynstur."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Síminn var endurstilltur á verksmiðjustillingar. Til að nota símann skaltu slá inn eldra PIN-númer."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Síminn var endurstilltur á verksmiðjustillingar. Til að nota símann skaltu slá inn eldra aðgangsorð."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Staðfestu mynstur"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Staðfestu PIN-númer"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Staðfestu aðgangsorð"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Rangt PIN-númer"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Rangt aðgangsorð"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Rangt mynstur"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Búa til græju og leyfa aðgang?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Þegar þú hefur búið græjuna til getur <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> fengið aðgang að öllum gögnum sem hún birtir."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Leyfa <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> alltaf að búa til græjur og fá aðgang að gögnum þeirra"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>d. <xliff:g id="HOURS">%2$d</xliff:g>k. <xliff:g id="MINUTES">%3$d</xliff:g>m. <xliff:g id="SECONDS">%4$d</xliff:g>s."</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>k. <xliff:g id="MINUTES">%2$d</xliff:g>m. <xliff:g id="SECONDS">%3$d</xliff:g>s."</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m. <xliff:g id="SECONDS">%2$d</xliff:g>s."</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> sek."</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> dagur, <xliff:g id="HOURS">%2$d</xliff:g> klst. og <xliff:g id="MINUTES">%3$d</xliff:g> mín."</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> klst. og <xliff:g id="MINUTES">%2$d</xliff:g> mín."</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> mín."</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Notkunarupplýsingar"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Notkunarupplýsingar"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Raða eftir:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Skjálesarar, skjár, gagnvirknistýringar"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Útlitsstillingar"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Þú getur sérsniðið þetta tæki eftir þínum þörfum. Þessum aðgengiseiginleikum má breyta síðar í stillingunum."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Stækka letur"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Breyta leturstærð"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Skjálesarar"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Hljóð og skjátexti"</string>
     <string name="display_category_title" msgid="685461049938269166">"Skjár"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Til að stækka"</b>" skaltu ýta snögglega þrisvar sinnum á skjáinn.\n"<ul><li>"Dragðu með tveimur eða fleiri fingrum til að fletta"</li>\n<li>"Færðu tvo eða fleiri fingur saman til að stilla aðdrátt"</li></ul>\n\n<b>"Til að stækka tímabundið"</b>" skaltu ýta snögglega þrisvar sinnum á skjáinn og halda fingrinum á skjánum í þriðja skiptið.\n"<ul><li>"Dragðu til að fara um skjáinn"</li>\n<li>"Lyftu fingri til að minnka aðdrátt"</li></ul>\n\n"Þú getur ekki stækkað á lyklaborði eða yfirlitsstiku."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Þegar kveikt er á stækkun skal nota aðgengishnappinn neðst á skjánum til að stækka á fljótlegan hátt.\n\n"<b>"Til að stækka"</b>" skaltu ýta á aðgengishnappinn og ýta síðan hvar sem er á skjáinn.\n"<ul><li>"Dragðu með tveimur eða fleiri fingrum til að fletta"</li>\n<li>"Færðu tvo eða fleiri fingur saman til að stilla aðdrátt"</li></ul>\n\n<b>"Til að stækka tímabundið"</b>" skaltu ýta á aðgengishnappinn og síðan halda fingri hvar sem er á skjánum.\n"<ul><li>"Dragðu til að fara um skjáinn"</li>\n<li>"Lyftu fingrinum til að minnka aðdrátt"</li></ul>\n\n"Þú getur ekki stækkað á lyklaborðinu eða yfirlitsstikunni."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Aðgengishnappurinn er stilltur á <xliff:g id="SERVICE">%1$s</xliff:g>. Til að nota stækkun skaltu halda aðgengishnappnum inni og velja stækkun."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Flýtileið aðgengisstillingar"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Flýtileið með hljóðstyrkstakka"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Flýtileiðarþjónusta"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Leyfa á lásskjá"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Þegar kveikt er á flýtileiðinni geturðu ýtt á báða hljóðstyrkshnappana í þrjár sekúndur til að opna aðgengiseiginleika."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Þegar kveikt er á flýtileiðinni geturðu ýtt á báða hljóðstyrkshnappana í þrjár sekúndur til að opna aðgengiseiginleika."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Texti með miklum birtuskilum"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Uppfæra skjástækkun sjálfkrafa"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Uppfæra skjástækkun þegar skipt er milli forrita"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Getur haft áhrif á afköst"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Smella þegar bendill stöðvast"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Bíða áður en smellt er"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"KVEIKT"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"SLÖKKT"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Sýna í flýtistillingum"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> valdar af <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> af <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Velja allt"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Stjórna áskriftum"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Gagnanotkun"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Gagnanotkun forrits"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Gagnaútreikningur símafyrirtækisins kann að sýna aðra niðurstöðu en tækið þitt."</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Farsímakerfi"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Wi-Fi net með mælda notkun"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Kveiktu á Wi-Fi til að velja net með mældri notkun."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Sjálfvirkt"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Mæld notkun"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Ekki með mældri notkun"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Gagnaútreikningur símafyrirtækisins kann að sýna aðra niðurstöðu en tækið þitt."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Neyðarsímtal"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Aftur í símtal"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Símtalastjórnun"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Neyðarútsendingar"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Neyðartilkynningar"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Símafyrirtæki"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Heiti aðgangsstaða"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Ítarleg 4G LTE-stilling"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Valið SIM-kort fyrir"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Spyrja í hvert skipti"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Val er áskilið"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"SIM-val"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Stillingar"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="one">Sýna %d falið atriði</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Forritatilkynningar"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Tilkynningaflokkur"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Mikilvægi"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Leyfa forritinu að ákveða"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Leyfa hljóð"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Aldrei sýna tilkynningar"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Ekkert hljóð eða sjónræn truflun"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Ekkert hljóð"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Spila hljóð"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Spila hljóð og birta sprettitilkynningu"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Opnast á skjánum"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Lítið"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Í meðallagi"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Mikið"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Áríðandi"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Leyfa hljóð"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Ekki nota hljóð, titring eða birta tilkynningar á núverandi skjá."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Leyfa truflanir"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Leyfa forriti að nota hljóð, titra og/eða birta tilkynningar á skjá"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Ekki svo mikilvægt"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Í meðallagi mikilvægt"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Mjög mikilvægt"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"mynd í mynd"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Mynd í mynd"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Leyfa mynd í mynd"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Leyfa þessu forriti að opna mynd í mynd þegar forritið er opið eða hætt er að nota það (t.d. til að halda áfram að horfa á myndskeið). Þessi gluggi birtist ofan á öðrum opnum forritum."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Leyfa þessu forriti að opna mynd í mynd þegar forritið er opið eða hætt er að nota það (t.d. til að halda áfram að horfa á myndskeið). Þessi gluggi birtist ofan á öðrum opnum forritum."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"„Ónáðið ekki“ aðgangur"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Engin uppsett forrit hafa óskað eftir „Ónáðið ekki“ aðgangi"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Hleður forrit..."</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Flytur skrár"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Flytur myndir (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Notar tæki sem MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS-speglun"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Bakgrunnsathugun"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Fullur bakgrunnsaðgangur"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Nota texta af skjánum"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Stilla áætlun fyrir næturljós"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Lita skjá með gulbrúnum blæ til að hjálpa þér að sofna"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Kveikt á næturljósi"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Skjárinn er með gulbrúnum blæ. Þetta getur hjálpað þér að sofna."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Tillögur"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Nota svalari skjáliti"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Slökktu á skjánum til að virkja litbreytinguna"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Til að breyta fjarskiptaumsjón skaltu endurræsa tækið"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Myndavél HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Endurræstu tækið til að virkja breytingu á myndavél HAL HDR+"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Leysigeislaskynjari myndavélar"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Sjálfvirkar kerfisuppfærslur"</string>
     <string name="usage" msgid="2977875522080448986">"Notkun"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Notkun farsímagagna"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Gagnaviðvörun"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Velja gagnatakmörk"</string>
     <string name="data_limit" msgid="1885406964934590552">"Gagnamörk"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> notuð milli <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> notuð <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Stilla"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Önnur forrit talin með í notkun"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Þurrka út og umbreyta"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Endurstilla ShortcutManager hraðatakmörkun"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Hraðatakmörkun ShortcutManager hefur verið endurstillt"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Stjórna skjálásstilkynningum"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Stjórna upplýsingum á lásskjá"</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="8483187649355540109">"Aðstoð og ábendingar"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Engin uppsett forrit hafa óskað eftir sérstökum SMS-aðgangi"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Sérstök SMS-skilaboð geta kostað þig peninga og munu bætast við símreikninginn þinn. Ef þú virkjar leyfi fyrir forrit geturðu sent sérstök SMS með því forriti."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Sérstakur SMS-aðgangur"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Ekki sýnilegt öðrum tækjum"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Slökkt"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Tengt við <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Tengt við mörg tæki"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Prufustilling kerfisviðmóts"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Skyndiforrit"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Opna tengla í forritum, jafnvel þótt þau séu ekki uppsett"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Skyndiforrit"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Reikningur skyndiforrita"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Kjörstillingar skyndiforrita"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Uppsett forrit"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Geymslurýminu þínu er nú stjórnað af geymslustjórnun"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Reikningar fyrir <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Kveikt á sívirku VPN á þínu eigin sniði"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Kveikt á sívirku VPN á vinnusniði"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Altækur HTTP-staðgengilsþjónn stilltur"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Traust skilríki"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Traust skilríki"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Traust skilríki á eigin sniði"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Traust skilríki á vinnusniði"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">Að lágmarki <xliff:g id="COUNT_1">%d</xliff:g> CA-vottorð</item>
       <item quantity="other">Að lágmarki <xliff:g id="COUNT_1">%d</xliff:g> CA-vottorð</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Úthlutunarupplýsingar símafyrirtækis"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Kveikja á úthlutun símafyrirtækis"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Hvað er nýtt og spennandi?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Skoðaðu fimm helstu eiginleikana"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Skoðaðu kynningu á nýja símanum þínum"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Skoðaðu kynningu á nýju spjaldtölvunni þinni"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Skoðaðu kynningu á nýja tækinu þínu"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Þessi eiginleiki er ekki í boði í þessu tæki"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Staða IMS-skráningar"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Skráð"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Ekki skráð"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 4768e60..ab3dcc3 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s desidera accedere ai tuoi messaggi. Dare accesso a %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Richiesta di accesso alla SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> desidera accedere alla tua scheda SIM. Se consenti l\'accesso, la connettività dati sul dispositivo sarà disattivata per tutta la durata della connessione. Consentire l\'accesso a <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>?"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visibile come <xliff:g id="DEVICE_NAME">^1</xliff:g> agli altri dispositivi"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visibile come <xliff:g id="DEVICE_NAME">^1</xliff:g> agli altri dispositivi"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"I tuoi dispositivi"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Accoppia nuovo dispositivo"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data e ora"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Avanti"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Saltare conf. impr. digitale?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"La configurazione dell\'impronta digitale richiede solo un paio di minuti. Se salti questo passaggio, potrai aggiungere l\'impronta digitale in seguito nelle impostazioni."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Ignorare il blocco schermo?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altre persone di utilizzare questo tablet se viene smarrito, rubato o reimpostato."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altre persone di utilizzare questo dispositivo se viene smarrito, rubato o reimpostato."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altre persone di utilizzare questo telefono se viene smarrito, rubato o reimpostato."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Hai aggiunto il numero massimo di impronte digitali"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Impossibile aggiungere ulteriori impronte digitali"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Rimuovere tutte le impronte digitali?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Rimuovi \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\""</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Vuoi eliminare questa impronta digitale?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Non potrai più utilizzare le impronte digitali per sbloccare il telefono, autorizzare gli acquisti o accedere alle app."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Non potrai utilizzare le impronte digitali per sbloccare il profilo di lavoro, autorizzare gli acquisti o accedere alle app di lavoro."</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Sì, rimuovi"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Proteggi il tuo tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Proteggi dispositivo"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Proteggi il telefono"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Per maggiore sicurezza, imposta un blocco schermo alternativo."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Per maggiore sicurezza, imposta un blocco schermo alternativo."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Impedisci ad altri di utilizzare il tablet senza la tua autorizzazione attivando le funzioni di protezione del dispositivo. Scegli il blocco schermo che desideri utilizzare."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Impedisci ad altri di utilizzare il dispositivo senza la tua autorizzazione attivando le funzioni di protezione del dispositivo. Scegli il blocco schermo che desideri utilizzare."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Impedisci ad altri di utilizzare il telefono senza la tua autorizzazione attivando le funzioni di protezione del dispositivo. Scegli il blocco schermo che desideri utilizzare."</string>
@@ -497,37 +502,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Rimuovere la protezione del dispositivo?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Rimuovere la protezione del profilo?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Le funzionalità di protezione del dispositivo non funzioneranno senza sequenza."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Le funzionalità di protezione del dispositivo non funzioneranno senza sequenza.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Le funzionalità di protezione del dispositivo non funzioneranno senza sequenza.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Anche le impronte digitali salvate verranno eliminate da questo dispositivo e non potrai più utilizzarle per sbloccare il telefono, autorizzare gli acquisti o accedere alle app.\""</string>
+</xliff:g>Anche le impronte digitali salvate verranno eliminate da questo dispositivo e non potrai più utilizzarle per sbloccare il telefono, autorizzare gli acquisti o accedere alle app."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Le funzionalità di protezione del dispositivo non funzioneranno senza PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Le funzionalità di protezione del dispositivo non funzioneranno senza PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Le funzionalità di protezione del dispositivo non funzioneranno senza PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Anche le impronte digitali salvate verranno eliminate da questo dispositivo e non potrai più utilizzarle per sbloccare il telefono, autorizzare gli acquisti o accedere alle app.\""</string>
+</xliff:g>Anche le impronte digitali salvate verranno eliminate da questo dispositivo e non potrai più utilizzarle per sbloccare il telefono, autorizzare gli acquisti o accedere alle app."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Le funzionalità di protezione del dispositivo non funzioneranno senza password."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Le funzionalità di protezione del dispositivo non funzioneranno senza password.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Le funzionalità di protezione del dispositivo non funzioneranno senza password.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Anche le impronte digitali salvate verranno eliminate da questo dispositivo e non potrai più utilizzarle per sbloccare il telefono, autorizzare gli acquisti o accedere alle app.\""</string>
+</xliff:g>Anche le impronte digitali salvate verranno eliminate da questo dispositivo e non potrai più utilizzarle per sbloccare il telefono, autorizzare gli acquisti o accedere alle app."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Le funzionalità di protezione del dispositivo non funzioneranno senza blocco schermo."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Le funzionalità di protezione del dispositivo non funzioneranno senza blocco schermo.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Le funzionalità di protezione del dispositivo non funzioneranno senza blocco schermo.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Anche le impronte digitali salvate verranno eliminate da questo dispositivo e non potrai più utilizzarle per sbloccare il telefono, autorizzare gli acquisti o accedere alle app.\""</string>
+</xliff:g>Anche le impronte digitali salvate verranno eliminate da questo dispositivo e non potrai più utilizzarle per sbloccare il telefono, autorizzare gli acquisti o accedere alle app."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Le funzioni di protezione del profilo non funzioneranno senza sequenza."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Le funzioni di protezione del profilo non funzioneranno senza sequenza.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Le funzionalità di protezione del profilo non funzioneranno senza sequenza.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Anche le impronte digitali salvate saranno rimosse dal profilo e non le potrai utilizzare per sbloccare il profilo, autorizzare acquisti o accedere ad app."</string>
+</xliff:g>Anche le impronte digitali salvate verranno eliminate da questo profilo e non potrai più utilizzarle per sbloccare il profilo, autorizzare gli acquisti o accedere alle app."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Le funzioni di protezione del profilo non funzioneranno senza PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Le funzioni di protezione del profilo non funzioneranno senza PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Le funzionalità di protezione del profilo non funzioneranno senza PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Anche le impronte digitali salvate saranno rimosse dal profilo e non le potrai utilizzare per sbloccare il profilo, autorizzare acquisti o accedere ad app."</string>
+</xliff:g>Anche le impronte digitali salvate verranno eliminate da questo profilo e non potrai più utilizzarle per sbloccare il profilo, autorizzare gli acquisti o accedere alle app."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Le funzioni di protezione del profilo non funzioneranno senza password."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Le funzioni di protezione del profilo non funzioneranno senza password.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Le funzionalità di protezione del profilo non funzioneranno senza password.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Anche le impronte digitali salvate saranno rimosse dal profilo e non le potrai utilizzare per sbloccare il profilo, autorizzare acquisti o accedere ad app."</string>
+</xliff:g>Anche le impronte digitali salvate verranno eliminate da questo profilo e non potrai più utilizzarle per sbloccare il profilo, autorizzare gli acquisti o accedere alle app."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Le funzioni di protezione del profilo non funzioneranno senza blocco schermo."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Le funzioni di protezione del profilo non funzioneranno senza blocco schermo.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Le funzionalità di protezione del profilo non funzioneranno senza blocco schermo.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Anche le impronte digitali salvate saranno rimosse dal profilo e non le potrai utilizzare per sbloccare il profilo, autorizzare acquisti o accedere ad app."</string>
+</xliff:g>Anche le impronte digitali salvate verranno eliminate da questo profilo e non potrai più utilizzarle per sbloccare il profilo, autorizzare gli acquisti o accedere alle app."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Sì, rimuovi"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Cambia sequenza di sblocco"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambia PIN di sblocco"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Non sono consentite sequenze di cifre in ordine ascendente o discendente oppure ripetute"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Annulla"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Cancella"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Annulla"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Avanti"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Impostazione completata."</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponibile"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponibile)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Inserisci la password di rete"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Rete Wi‑Fi dell\'operatore"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Connettiti tramite <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Per migliorare la precisione della posizione e per altri scopi, <xliff:g id="APP_NAME">%1$s</xliff:g> chiede di attivare la ricerca della rete, anche quando il Wi-Fi è disattivato.\n\nConsetirlo a tutte le app che vogliono eseguire la ricerca?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Per disattivare questa impostazione, vai alla sezione Avanzate nel menu extra."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Consenti"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Connetti"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Impossibile connettersi alla rete"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Elimina"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modifica"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Impossibile eliminare la rete"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Salva"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Impossibile salvare la rete"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi‑Fi avanzate"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Indirizzo MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Indirizzo IP"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Info rete"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet mask"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Indirizzi IPv6"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Annullare l\'invito?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vuoi annullare l\'invito a connettersi con <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Eliminare questo gruppo?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Hotspot Wi‑Fi portatile"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Hotspot Wi‑Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Connessione Internet o contenuti non condivisi con altri dispositivi"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Connessione Internet del tablet condivisa tramite hotspot"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Connessione Internet del telefono condivisa tramite hotspot"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"L\'app sta condividendo contenuti. Per condividere la connessione Internet, disattiva e riattiva l\'hotspot"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nome Wi-Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Nome hotspot"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Attivazione di <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Gli altri dispositivi possono collegarsi a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Password Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Password hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Utilizza un hotspot per creare una rete Wi-Fi per altri dispositivi. Gli hotspot forniscono l\'accesso a Internet utilizzando la connessione dati mobili. Potrebbero essere applicate tariffe aggiuntive per i dati mobili."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Le app possono creare un hotspot per condividere contenuti con i dispositivi vicini."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"L\'indirizzo utilizzato dai servizi di emergenza per fornire la tua posizione se effettui una chiamata di emergenza tramite Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Audio"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumi"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Ricerca"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Gestisci le impostazioni e la cronologia delle ricerche"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nessun risultato"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Cancella cronologia"</string>
     <string name="display_settings" msgid="7965901687241669598">"Display"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotazione automatica"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Colori vivaci"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Ripristino delle impostazioni APN predefinite."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Ripristina impostazioni predefinite"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Ripristino delle impostazioni APN predefinite completato."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Reimposta"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Reimpostazione della rete"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Opzioni di reimpostazione"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"È possibile reimpostare la rete, le app o il dispositivo"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Reimposta Wi-Fi, dati mobili e Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Verranno reimpostate tutte le impostazioni di rete, tra cui:\n\n"<li>"Wi‑Fi"</li>\n<li>"Dati mobili"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Reimposta"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Reimpostare tutte le impostazioni di rete? Questa azione è irreversibile."</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Reimpostare?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"La reimpostazione della rete non è disponibile per questo utente"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Le impostazioni di rete sono state reimpostate"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Ripristino dati di fabbrica"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> account verranno reimpostati</item>
-      <item quantity="one">1 account verrà reimpostato</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"La memoria interna e tutti i dati verranno reimpostati"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Cancella tutti i dati (ripristino dati fabbrica)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Questa operazione cancellerà tutti i dati dalla "<b>"memoria interna"</b>" del tablet, compresi:\n\n"<li>"Il tuo account Google"</li>\n<li>"Dati e impostazioni del sistema e delle app"</li>\n<li>"App scaricate"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Questa operazione cancellerà tutti i dati dalla "<b>"memoria interna"</b>" del telefono, compresi:\n\n"<li>"Il tuo account Google"</li>\n<li>"Dati e impostazioni del sistema e delle app"</li>\n<li>"App scaricate"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Al momento sei collegato ai seguenti account:\n"</string>
@@ -1390,7 +1396,7 @@
     <string name="network_settings_title" msgid="2876509814832830757">"Rete mobile"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Piano dati mobile"</string>
     <string name="sms_application_title" msgid="4903928270533250448">"App SMS"</string>
-    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Cambiare app per gli SMS?"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vuoi cambiare app per gli SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Utilizzare <xliff:g id="NEW_APP">%1$s</xliff:g> anziché <xliff:g id="CURRENT_APP">%2$s</xliff:g> come app per gli SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Utilizzare <xliff:g id="NEW_APP">%s</xliff:g> come app per gli SMS?"</string>
     <string name="network_scorer_picker_title" msgid="6383879578279046456">"Fornitore di servizi di valutazione rete"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informazioni sulla sicurezza"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nessuna connessione dati disponibile. Per visualizzare ora le informazioni, visita il sito %s da qualsiasi computer collegato a Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Caricamento..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Scegli la tua password"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Imposta il blocco schermo"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Per motivi di sicurezza, imposta una password"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Per usare l\'impronta digitale, imposta la password"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Scegli la tua sequenza"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Per usare l\'impronta digitale, imposta la sequenza"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Scegli il tuo PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Per motivi di sicurezza, imposta un PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Per usare l\'impronta digitale, imposta il PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Conferma la tua password"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Inserisci di nuovo la password"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Conferma la tua sequenza"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Conferma il tuo PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Inserisci di nuovo il PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Le password non corrispondono"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"I PIN non corrispondono"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Selezione metodo di sblocco"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Per continuare devi utilizzare la sequenza del tuo profilo di lavoro"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Per continuare devi inserire il PIN del tuo profilo di lavoro"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Per continuare devi inserire la password del tuo profilo di lavoro"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Utilizza la sequenza del dispositivo per continuare. È obbligatoria dopo il riavvio."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Inserisci il PIN del dispositivo per continuare. È obbligatorio dopo il riavvio."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Inserisci la password del dispositivo per continuare. È obbligatoria dopo il riavvio."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Utilizza la sequenza del profilo di lavoro per continuare. È obbligatoria dopo il riavvio."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Inserisci il PIN del profilo di lavoro per continuare. È obbligatorio dopo il riavvio."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Inserisci la password del profilo di lavoro per continuare. È obbligatoria dopo il riavvio."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Per maggiore sicurezza, usa la sequenza del dispositivo"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Per maggiore sicurezza, inserisci il PIN del dispositivo"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Per maggiore sicurezza, inserisci la password del dispositivo"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Per maggiore sicurezza, usa la sequenza del tuo profilo di lavoro"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Per maggiore sicurezza, inserisci il PIN del tuo profilo di lavoro"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Per maggiore sicurezza, inserisci la password del tuo profilo di lavoro"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"I dati fabbrica del dispositivo sono stati ripristinati: puoi sbloccarlo con la sequenza precedente."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"I dati fabbrica del dispositivo sono stati ripristinati: puoi sbloccarlo con il PIN precedente."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"I dati fabbrica del dispositivo sono stati ripristinati: puoi sbloccarlo con la password precedente."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verifica sequenza"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verifica PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verifica password"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN errato"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Password errata"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Sequenza errata"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Creare il widget e consentire l\'accesso?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Dopo che avrai creato il widget, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> potrà accedere a tutti i relativi dati."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Consenti sempre a <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> di creare widget e accedere ai relativi dati"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> g <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> m <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> m <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> g <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> m"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Statistiche di utilizzo"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Statistiche di utilizzo"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Ordina per:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Screen reader, display, controlli di interazione"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Impostazioni vista"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Puoi personalizzare questo dispositivo in base alle tue esigenze. Queste funzioni di accessibilità possono essere modificate in un secondo momento nelle Impostazioni."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Aumenta dimensioni carattere"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Cambia dimensioni carattere"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Screen reader"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio e testo su schermo"</string>
     <string name="display_category_title" msgid="685461049938269166">"Visualizzazione"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Per ingrandire/ridurre"</b>", tocca velocemente lo schermo per tre volte.\n"<ul><li>"Trascina almeno due dita per scorrere."</li>\n<li>"Pizzica con almeno due dita o allontanale per regolare lo zoom."</li></ul>\n\n<b>"Per ingrandire temporaneamente"</b>", tocca velocemente per tre volte e tieni il dito premuto all\'ultimo tocco.\n"<ul><li>"Trascina il dito per spostarti sullo schermo."</li>\n<li>"Solleva il dito per ridurre lo zoom."</li></ul>\n\n"Non puoi aumentare lo zoom sulla tastiera e nella barra di navigazione."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Quando è attivo l\'ingrandimento, utilizza il pulsante Accessibilità nella parte inferiore della schermata per ingrandire velocemente.\n\n"<b>"Per aumentare/ridurre lo zoom"</b>", tocca il pulsante Accessibilità, quindi tocca un punto qualsiasi sullo schermo.\n"<ul><li>"Trascina almeno due dita per scorrere."</li>\n<li>"Pizzica con almeno due dita per regolare lo zoom."</li></ul>\n\n<b>"Per ingrandire temporaneamente"</b>", tocca il pulsante Accessibilità, quindi tocca e tieni premuto un punto qualsiasi dello schermo.\n"<ul><li>"Trascina per spostarti sullo schermo."</li>\n<li>"Solleva il dito per ridurre lo zoom."</li></ul>\n\n"Non puoi aumentare lo zoom sulla tastiera e nella barra di navigazione."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Il pulsante Accessibilità è impostato su <xliff:g id="SERVICE">%1$s</xliff:g>. Per utilizzare l\'ingrandimento, tocca e tieni premuto il pulsante Accessibilità, quindi seleziona l\'ingrandimento."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Scorciatoia Accessibilità"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Scorciatoia per i tasti del volume"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Servizio scorciatoia"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Consenti dalla schermata di blocco"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Quando è attiva la scorciatoia, puoi tenere premuti entrambi i tasti Volume per 3 secondi per avviare una funzione di accessibilità."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Quando la scorciatoia è attiva, puoi tenere premuti entrambi i tasti del volume per tre secondi per avviare una funzione di accessibilità."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Testo alto contrasto"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Aggiorn. autom. ingrandim. schermo"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Aggiorna ingrandimento schermo per transizioni app"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Potrebbe influire sulle prestazioni"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clic quando puntatore si ferma"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Ritardo prima del clic"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ATTIVO"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DISATTIVATO"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Mostra in Impostazioni rapide"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"selezionati <xliff:g id="NUMBER">%1$d</xliff:g> di <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> su <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Seleziona tutti"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Gestisci piani"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Utilizzo dati"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Utilizzo dati dell\'app"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"I dati dell\'operatore potrebbero differire da quelli del dispositivo."</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Reti mobili"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Reti Wi‑Fi a consumo"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Per selezionare le reti a consumo, attiva il Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatica"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"A consumo"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Non a consumo"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"I dati dell\'operatore potrebbero differire da quelli del dispositivo."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Chiamata di emergenza"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Torna a chiamata"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Gestione chiamate"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Trasmissioni di emergenza"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Avvisi di emergenza"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Operatori di rete"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Nomi punti di accesso"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Modalità 4G LTE avanzata"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"SIM preferita per"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Chiedi ogni volta"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Fai una scelta"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Selezione della SIM"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Impostazioni"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">Mostra %d elementi nascosti</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Notifiche app"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoria della notifica"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importanza"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Lascia decidere all\'app"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Attiva audio"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Non mostrare mai notifiche"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Senza suoneria o interruzione visiva"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Senza suoneria"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Con suoneria"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Suoneria e visualizzazione sullo schermo"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Visualizzazione sullo schermo"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Bassa"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Media"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Alta"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgente"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Attiva audio"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Non emettere suoni o vibrazioni e non mostrare queste notifiche nella schermata corrente."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Consenti interruzioni"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Consenti all\'app di emettere suoni o vibrazioni e/o mostrare notifiche sullo schermo"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Importanza scarsa"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Importanza media"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Importanza elevata"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip picture in picture"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Picture in picture"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Consenti Picture in picture"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Consenti a questa app di creare una finestra Picture in picture quando l\'app è aperta o dopo essere uscito (ad esempio, per continuare a guardare un video). Questa finestra viene visualizzata sopra le altre app in uso."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Consenti a questa app di creare una finestra Picture in picture quando l\'app è aperta o dopo essere uscito (ad esempio, per continuare a guardare un video). Questa finestra viene visualizzata sopra le altre app in uso."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Accesso Non disturbare"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nessuna delle app installate ha richiesto l\'accesso Non disturbare"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Caricamento app..."</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Trasferimento di file"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Trasferimento di foto (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Utilizzo del dispositivo in modalità MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Mirroring SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Controllo background"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Accesso completo in background"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Utilizza testo sullo schermo"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Programma Luminosità notturna"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Imposta schermo color ambra per conciliare il sonno"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Luminosità notturna attiva"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Lo schermo è diventato color ambra. Potrebbe conciliare il sonno."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Suggerimenti"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilizza colori del display più freddi"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Per applicare la modifica ai colori, disattiva lo schermo"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Per applicare la modifica a TelephonyMonitor, riavvia il dispositivo"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Fotocamera HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Per applicare la modifica relativa alla Fotocamera HAL HDR+, riavvia il dispositivo"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensore laser della fotocamera"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Aggiornamenti di sistema automatici"</string>
     <string name="usage" msgid="2977875522080448986">"Utilizzo"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Utilizzo dati mobili"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Avviso sui dati"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Imposta limite dati"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limite dati"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> nel periodo <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> utilizzati nell\'intervallo <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configura"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Altre app incluse nell\'utilizzo"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Cancella e converti"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Reimposta il limite di frequenza in ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Il limite di frequenza di ShortcutManager è stato reimpostato"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlla notifiche in schermata blocco"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Gestisci le informazioni nella schermata di 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="8483187649355540109">"Assistenza e suggerimenti"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Nessuna app installata ha richiesto l\'accesso a SMS premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Gli SMS premium potrebbero comportare costi, che verranno aggiunti alle fatture del tuo operatore. Se attivi l\'autorizzazione per un\'app, potrai utilizzarla per inviare SMS premium."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Accesso a SMS premium"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Non visibile agli altri dispositivi"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Disattivato"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connesso a <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connesso a più dispositivi"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Modalità demo dell\'interfaccia utente di sistema"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"App istantanee"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Apri i link nelle app, anche se non sono installate"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"App istantanee"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Account per le app istantanee"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Preferenze per le app istantanee"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"App installate"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Il tuo spazio di archiviazione è ora gestito dalla Gestione memoria"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Account di <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Opzione VPN sempre attiva attivata nel tuo profilo personale"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Opzione VPN sempre attiva attivata nel tuo profilo di lavoro"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy HTTP globale impostato"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Credenziali attendibili"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Credenziali attendibili"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Credenziali attendibili nel profilo personale"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Credenziali attendibili nel profilo di lavoro"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Minimo <xliff:g id="COUNT_1">%d</xliff:g> certificati CA</item>
       <item quantity="one">Minimo <xliff:g id="COUNT_0">%d</xliff:g> certificato CA</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informazioni sul provisioning operatore"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Attiva provisioning operatore"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Quali entusiasmanti novità ti attendono?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Scopri le 5 funzioni principali"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Scopri il tuo nuovo telefono"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Scopri il tuo nuovo tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Scopri il tuo nuovo dispositivo"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Questa funzione non è disponibile su questo dispositivo"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Stato di registrazione IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrato"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Non registrato"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index eae3c7d..7afdfdd 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -168,7 +168,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"‏%1$s רוצה לגשת להודעות שלך. להעניק גישה ל-%2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"‏בקשת גישה אל כרטיס SIM"</string>
     <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="bluetooth_device_name_summary" msgid="4757990010751789977">"גלוי למכשירים אחרים. מופיע בשם \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\'"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"משתמשים אחרים יכולים לראות את המכשיר שלך בתור \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\'"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"המכשירים שלך"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"התאמה של מכשיר חדש"</string>
     <string name="date_and_time" msgid="9062980487860757694">"תאריך ושעה"</string>
@@ -378,6 +378,9 @@
     <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="1961957425135180242">"הבא"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"לא להגדיר טביעת אצבע עכשיו?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"ההגדרה של טביעת האצבע אורכת דקה או שתיים. אם מדלגים עליה, אפשר להוסיף את טביעת האצבע מאוחר יותר בהגדרות."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"לדגל על נעילת המסך?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"תכונות ההגנה על המכשיר לא יופעלו. לא תהיה לך אפשרות למנוע מאנשים אחרים להשתמש בטאבלט אם הוא יאבד, ייגנב או יאופס."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"תכונות ההגנה על המכשיר לא יופעלו. לא תהיה לך אפשרות למנוע מאנשים אחרים להשתמש במכשיר אם הוא יאבד, ייגנב או יאופס."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"תכונות ההגנה על המכשיר לא יופעלו. לא תהיה לך אפשרות למנוע מאנשים אחרים להשתמש בטלפון אם הוא יאבד, ייגנב או יאופס."</string>
@@ -417,6 +420,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"הוספת את המספר המרבי של טביעות אצבע."</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"לא ניתן להוסיף עוד טביעות אצבע"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"האם להסיר את כל טביעות האצבע?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"הסרה של \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"למחוק את טביעת האצבע הזו?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"לא תוכל להשתמש בטביעות האצבע כדי לבטל את נעילת הטלפון, לאשר רכישות או להיכנס אל אפליקציות"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"לא תוכל להשתמש בטביעת האצבע כדי לבטל את נעילת פרופיל העבודה שלך, לאשר רכישות או להיכנס לאפליקציות עבודה"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"כן, הסר"</string>
@@ -461,7 +466,7 @@
     <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="5585650064305600578">"להגברת האבטחה, הגדר נעילת מסך לגיבוי."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"לשיפור האבטחה, מומלץ להגדיר נעילת מסך נוספת לגיבוי."</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>
@@ -503,37 +508,37 @@
     <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_fingerprint" msgid="8212242533942400457">"התכונות להגנת המכשיר לא יפעלו בלי קו ביטול הנעילה.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"התכונות להגנה על המכשיר לא יפעלו בלי קו ביטול הנעילה.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>גם טביעות האצבעות ששמרת יוסרו מהמכשיר הזה ולא תוכל לבטל את נעילת הטלפון, לאשר רכישות או להיכנס לאפליקציות בעזרתן.\""</string>
+</xliff:g>גם טביעות האצבע ששמרת יוסרו מהמכשיר ולא ניתן יהיה לבטל את נעילת הטלפון, לאשר רכישות או להיכנס לאפליקציות בעזרתן."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"התכונות להגנת המכשיר לא יפעלו בלי קוד הגישה."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"התכונות להגנת המכשיר לא יפעלו בלי קוד הגישה.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"התכונות להגנה על המכשיר לא יפעלו בלי קוד הגישה.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>גם טביעות האצבעות ששמרת יוסרו מהמכשיר הזה ולא תוכל לבטל את נעילת הטלפון, לאשר רכישות או להיכנס לאפליקציות בעזרתן.\""</string>
+</xliff:g>גם טביעות האצבע ששמרת יוסרו מהמכשיר ולא ניתן יהיה לבטל את נעילת הטלפון, לאשר רכישות או להיכנס לאפליקציות בעזרתן."</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"התכונות להגנה על המכשיר לא יפעלו בלי הסיסמה.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>גם טביעות האצבעות ששמרת יוסרו מהמכשיר הזה ולא תוכל לבטל את נעילת הטלפון, לאשר רכישות או להיכנס לאפליקציות בעזרתן.\""</string>
+</xliff:g>גם טביעות האצבע ששמרת יוסרו מהמכשיר ולא ניתן יהיה לבטל את נעילת הטלפון, לאשר רכישות או להיכנס לאפליקציות בעזרתן."</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"התכונות להגנה על המכשיר לא יפעלו בלי נעילת המסך.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>גם טביעות האצבעות ששמרת יוסרו מהמכשיר הזה ולא תוכל לבטל את נעילת הטלפון, לאשר רכישות או להיכנס לאפליקציות בעזרתן.\""</string>
+</xliff:g>גם טביעות האצבע ששמרת יוסרו מהמכשיר ולא ניתן יהיה לבטל את נעילת הטלפון, לאשר רכישות או להיכנס לאפליקציות בעזרתן."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"התכונות של הגנת הפרופיל לא יפעלו בלי קו ביטול הנעילה."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"התכונות של הגנת הפרופיל לא יפעלו בלי קו ביטול הנעילה.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"התכונות להגנה על הפרופיל לא יפעלו בלי קו ביטול הנעילה.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>גם טביעות האצבעות השמורות יוסרו מהפרופיל הזה. לא תוכל לבטל את נעילת הפרופיל שלך, לאשר רכישות או להיכנס לאפליקציות בעזרת טביעות האצבעות.\""</string>
+</xliff:g>גם טביעות האצבע ששמרת יוסרו מהפרופיל ולא ניתן יהיה לבטל את נעילת הפרופיל, לאשר רכישות או להיכנס לאפליקציות בעזרתן."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"התכונות של הגנת הפרופיל לא יפעלו בלי קוד הגישה שלך."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"התכונות של הגנת הפרופיל לא יפעלו בלי קוד הגישה שלך.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"התכונות להגנה על הפרופיל לא יפעלו בלי קוד הגישה.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>גם טביעות האצבעות השמורות יוסרו מהפרופיל הזה. לא תוכל לבטל את נעילת הפרופיל שלך, לאשר רכישות או להיכנס לאפליקציות בעזרת טביעות האצבעות.\""</string>
+</xliff:g>גם טביעות האצבע ששמרת יוסרו מהפרופיל ולא ניתן יהיה לבטל את נעילת הפרופיל, לאשר רכישות או להיכנס לאפליקציות בעזרתן."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"התכונות של הגנת הפרופיל לא יפעלו בלי הסיסמה שלך."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"התכונות של הגנת הפרופיל לא יפעלו בלי הסיסמה שלך.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"התכונות להגנה על הפרופיל לא יפעלו בלי הסיסמה.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>גם טביעות האצבעות השמורות יוסרו מהפרופיל הזה. לא תוכל לבטל את נעילת הפרופיל שלך, לאשר רכישות או להיכנס לאפליקציות בעזרת טביעות האצבעות.\""</string>
+</xliff:g>גם טביעות האצבע ששמרת יוסרו מהפרופיל ולא ניתן יהיה לבטל את נעילת הפרופיל, לאשר רכישות או להיכנס לאפליקציות בעזרתן."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"התכונות של הגנת הפרופיל לא יפעלו בלי נעילת המסך."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"התכונות של הגנת הפרופיל לא יפעלו בלי נעילת המסך.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"התכונות להגנה על הפרופיל לא יפעלו בלי נעילת המסך.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>גם טביעות האצבעות השמורות יוסרו מהפרופיל הזה. לא תוכל לבטל את נעילת הפרופיל שלך, לאשר רכישות או להיכנס לאפליקציות בעזרת טביעות האצבעות.\""</string>
+</xliff:g>גם טביעות האצבע ששמרת יוסרו מהפרופיל ולא ניתן יהיה לבטל את נעילת הפרופיל, לאשר רכישות או להיכנס לאפליקציות בעזרתן."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"כן, הסר"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"שנה את קו ביטול הנעילה"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"שנה קוד גישה לביטול נעילה"</string>
@@ -604,6 +609,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"אין להגדיר רצף ספרות עולה, יורד או חוזר"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"אישור"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"ביטול"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"ניקוי"</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>
@@ -838,6 +844,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"‏WPS זמין"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS זמין)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"הזן את סיסמת הרשת שלך"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"‏רשת Wi-Fi של ספק"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"חיבור לרשת של <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"‏לשיפור דיוק המיקום ולמטרות אחרות, <xliff:g id="APP_NAME">%1$s</xliff:g> רוצה להפעיל את סריקת הרשתות, גם כאשר ה-Wi-Fi כבוי.\n\nהאם להתיר זאת עבור כל האפליקציות שרוצות לסרוק?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"כדי לכבות, עבור אל \'מתקדם\' באפשרויות הנוספות."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"כן, זה בסדר"</string>
@@ -855,6 +863,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"התחבר"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"נכשל הניסיון להתחבר לרשת"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"שכח"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"שנה"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"נכשל הניסיון לשכוח את הרשת"</string>
     <string name="wifi_save" msgid="3331121567988522826">"שמירה"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"נכשל הניסיון לשמור את הרשת"</string>
@@ -869,6 +878,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"‏Wi-Fi מתקדם"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"‏כתובת MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"‏כתובת IP"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"פרטי הרשת"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"מסכת רשת משנה"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"‏כתובות IPv6"</string>
@@ -901,16 +911,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"האם לבטל את ההזמנה?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"האם ברצונך לבטל את ההזמנה ליצירת קשר עם <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"לשכוח קבוצה זו?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"‏נקודה ניידת לשיתוף אינטרנט ב-Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"‏נקודת Wi‑Fi לשיתוף אינטרנט"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"לא יתבצע שיתוף של חיבור לאינטרנט או של תכנים עם מכשירים אחרים"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"המערכת משתפת את החיבור לאינטרנט של הטאבלט דרך נקודה לשיתוף אינטרנט"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"המערכת משתפת את החיבור לאינטרנט של הטלפון דרך נקודה לשיתוף אינטרנט"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"מתבצע שיתוף תכנים באחת האפליקציות. כדי לשתף חיבור לאינטרנט, יש להשבית את הנקודה לשיתוף אינטרנט ולהפעיל אותה מחדש"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"‏שם הנקודה לשיתוף Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"שם הנקודה לשיתוף אינטרנט"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"המערכת מפעילה את <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"אפשר לחבר מכשירים נוספים לנקודה <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"‏סיסמה לנקודה לשיתוף Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"הסיסמה לנקודה לשיתוף אינטרנט"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"‏תדר AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"‏יש לך אפשרות להשתמש בנקודה לשיתוף אינטרנט כדי ליצור רשת Wi‑Fi ולחבר אליה את המכשירים האחרים שלך. נקודות לשיתוף אינטרנט מספקות חיבור לאינטרנט דרך חבילת הגלישה שלך. ייתכן שהשימוש יהיה כרוך בתשלום נוסף על חבילת הגלישה."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"אפשר להשתמש באפליקציות כדי ליצור נקודה לשיתוף אינטרנט ולשתף תכנים בין מכשירים שנמצאים בקרבת מקום."</string>
@@ -962,7 +971,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"‏כשהתקשרות Wi-Fi פועלת, הטלפון יכול לנתב שיחות ברשתות Wi-Fi או ברשת של הספק, בהתאם להעדפה שלך ולאות שחזק יותר. לפני הפעלת תכונה זו, בדוק עם הספק פרטים הקשורים לעמלות ופרטים אחרים."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"עדכן כתובת למקרה חירום"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"‏כתובת שתשמש כמיקום שלך לטובת שירותי החירום, אם תתקשר למוקד החירום באמצעות רשת Wi-Fi"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"‏הכתובת ששירותי החירום ישתמשו בה כדי להגיע אליך, אם תתקשר למוקד החירום באמצעות רשת Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"תצוגה"</string>
     <string name="sound_settings" msgid="5534671337768745343">"צלילים"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"עוצמות קול"</string>
@@ -1016,6 +1025,7 @@
     <string name="search_settings" msgid="1910951467596035063">"חיפוש"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"ניהול הגדרות והיסטוריה של חיפוש"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"אין תוצאות"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"נקה את ההיסטוריה"</string>
     <string name="display_settings" msgid="7965901687241669598">"תצוגה"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"סיבוב אוטומטי של המסך"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"צבעים עזים"</string>
@@ -1350,8 +1360,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"‏משחזר את הגדרות ברירת המחדל של APN."</string>
     <string name="menu_restore" msgid="8260067415075573273">"אפס לברירת המחדל"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"‏איפוס הגדרות ברירת המחדל של APN הושלם."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"איפוס המכשיר"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"איפוס של הגדרות הרשת"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"אפשרויות איפוס"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"ניתן לאפס את הרשת, את האפליקציות או את המכשיר"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"‏איפוס ה-Wi-Fi וה-Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"‏פעולה זו תאפס את כל הגדרות הרשת, כולל:\n\n"<li>"Wi‑Fi"</li>\n<li>"חבילת גלישה"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"איפוס הגדרות"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"האם לאפס את כל הגדרות הרשת? לא ניתן לבטל את הפעולה!"</string>
@@ -1359,14 +1370,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"האם לאפס?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"המשתמש הזה לא יכול לאפס את הגדרות הרשת"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"הגדרות הרשת אופסו"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"איפוס נתוני יצרן"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="two"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> חשבונות יאופסו</item>
-      <item quantity="many"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> חשבונות יאופסו</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> חשבונות יאופסו</item>
-      <item quantity="one">חשבון אחד יאופס</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"האחסון הפנימי וכל הנתונים יאופסו"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"מחיקת כל הנתונים (איפוס להגדרות היצרן)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"‏פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטאבלט שלך, כולל:\n\n"<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והאפליקציות שלך"</li>\n<li>"האפליקציות שהורדת"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"‏פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטלפון שלך, כולל:\n\n"<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והאפליקציות שלך"</li>\n<li>"האפליקציות שהורדת"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"החשבונות הבאים שלך פעילים כעת:\n"</string>
@@ -1490,15 +1494,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"מידע על בטיחות"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"‏אין לך חיבור נתונים. כדי להציג מידע זה כעת, עבור אל %s ממחשב כלשהו המחובר לאינטרנט."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"טוען..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"בחר סיסמה"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"הגדרה של נעילת מסך"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"לשיפור האבטחה, מומלץ להגדיר סיסמה"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"כדי להשתמש בטביעת אצבע, הגדר סיסמה"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"הגדרת הקו לביטול נעילה"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"לטביעת האצבע נדרש קו ביטול נעילה"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"בחר את קוד הגישה"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"לשיפור האבטחה, מומלץ להגדיר קוד גישה"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"כאמצעי גיבוי, הגדר קוד גישה"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"אשר את הסיסמה"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"יש להזין את הסיסמה שוב"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"אשר את הקו לביטול נעילה"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"אשר את קוד הגישה"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"יש להזין שוב את קוד הגישה"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"הסיסמאות לא תואמות"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"קודי הגישה אינם תואמים"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"בחירה בשיטת \'ביטול נעילה\'"</string>
@@ -1511,12 +1516,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"השתמש בקו ביטול הנעילה בעבודה כדי להמשיך"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"הזן את קוד הגישה בעבודה כדי להמשיך"</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">"הזן את קוד הגישה של המכשיר כדי להמשיך. פעולה זו נדרשת לאחר הפעלת המכשיר מחדש."</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">"הזן את קוד הגישה בעבודה כדי להמשיך. פעולה זו נדרשת לאחר הפעלת המכשיר מחדש."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"הזן את הסיסמה בעבודה כדי להמשיך. פעולה זו נדרשת לאחר הפעלת המכשיר מחדש."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"מטעמי אבטחה, עליך להזין את קו ביטול הנעילה"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"מטעמי אבטחה, עליך להזין את קוד הגישה"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"מטעמי אבטחה, עליך להזין את הסיסמה למכשיר"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"מטעמי אבטחה, עליך להזין את קו ביטול הנעילה של פרופיל העבודה"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"מטעמי אבטחה, עליך להזין את קוד הגישה לפרופיל העבודה"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"מטעמי אבטחה, עליך להזין את הסיסמה לפרופיל העבודה"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"הטלפון שלך עבר איפוס להגדרות היצרן. כדי להשתמש בטלפון, יש להזין את קו ביטול הנעילה הקודם."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"הטלפון שלך עבר איפוס להגדרות היצרן. כדי להשתמש בטלפון, יש להזין את קוד הגישה הקודם."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"הטלפון שלך עבר איפוס להגדרות היצרן. כדי להשתמש בטלפון, יש להזין את הסיסמה הקודמת."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"אימות של קו ביטול נעילה"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"אימות של קוד הגישה"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"אימות סיסמה"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"קוד גישה שגוי"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"סיסמה שגויה"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"קו ביטול נעילה שגוי"</string>
@@ -1821,13 +1832,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"‏האם ליצור Widget‏ ולאפשר גישה?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"‏לאחר יצירת ה-Widget‏, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> יוכל לגשת לכל הנתונים שהוא מציג."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"‏אפשר תמיד ל-<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ליצור Widgets ולגשת לנתונים שלהם"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> ימים, <xliff:g id="HOURS">%2$d</xliff:g> שעות, <xliff:g id="MINUTES">%3$d</xliff:g> דקות ו-<xliff:g id="SECONDS">%4$d</xliff:g> שניות"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> שעות, <xliff:g id="MINUTES">%2$d</xliff:g> דקות ו-<xliff:g id="SECONDS">%3$d</xliff:g> שניות"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> דקות ו-<xliff:g id="SECONDS">%2$d</xliff:g> שניות"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> שניות"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"סטטיסטיקת שימוש"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"סטטיסטיקת שימוש"</string>
     <string name="display_order_text" msgid="8592776965827565271">"מיין לפי:"</string>
@@ -1839,7 +1843,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"קוראי מסך, פקדי אינטראקציה, תצוגה"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"הגדרות תצוגה"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"ניתן להתאים אישית את המכשיר הזה כדי שיתאים לצרכיך. ניתן לשנות את תכונות הנגישות מאוחר יותר ב\'הגדרות\'."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"הגדלת גודל הגופן"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"שינוי גודל הגופן"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"קוראי מסך"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"הקראת טקסט שמופיע במסך"</string>
     <string name="display_category_title" msgid="685461049938269166">"תצוגה"</string>
@@ -1860,10 +1864,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"כדי לשנות את מרחק התצוגה"</b>", הקש על המסך במהירות שלוש פעמים.\n"<ul><li>"גרור שתי אצבעות או יותר כדי לגלול"</li>\n<li>"עשה תנועת צביטה בעזרת שתי אצבעות או יותר כדי להתאים את מרחק התצוגה"</li></ul>\n\n<b>"כדי לשנות את מרחק התצוגה באופן זמני"</b>", הקש במהירות על המסך שלוש פעמים, ובפעם השלישית החזק את האצבע על המסך.\n"<ul><li>"גרור כדי לנוע על פני המסך"</li>\n<li>"הרם את האצבע כדי להתרחק"</li></ul>\n\n"לא ניתן להתקרב בעזרת המקלדת או סרגל הניווט."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"כשההגדלה מופעלת, ניתן להשתמש בלחצן \'נגישות\' שבתחתית המסך כדי להגדיל במהירות.\n\n"<b>"כדי לשנות את מרחק התצוגה"</b>", הקש על הלחצן \'נגישות\' ולאחר מכן הקש במקום כלשהו במסך.\n"<ul><li>"גרור שתי אצבעות או יותר כדי לגלול"</li>\n<li>"עשה תנועת צביטה בעזרת שתי אצבעות או יותר כדי להתאים את מרחק התצוגה"</li></ul>\n\n<b>"כדי לשנות את מרחק התצוגה באופן זמני"</b>", הקש על הלחצן \'נגישות\' וגע נגיעה ממושכת במקום כלשהו במסך.\n"<ul><li>"גרור כדי לנוע על פני המסך"</li>\n<li>"הרם את האצבע כדי להתרחק"</li></ul>\n\n"לא ניתן להתקרב בעזרת המקלדת או סרגל הניווט."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"הלחצן \'נגישות\' מוגדר לשירות <xliff:g id="SERVICE">%1$s</xliff:g>. כדי להשתמש בהגדלה, גע בלחצן הנגישות והחזק אותו ולאחר מכן בחר בהגדלה."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"קיצור דרך לנגישות"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"מקש עוצמת הקול כמקש קיצור"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"שירות קיצורי דרך"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"ניתן להפעיל ממסך הנעילה"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"כאשר קיצור הדרך מופעל, ניתן ללחוץ על שני לחצני עוצמת הקול למשך שלוש שניות כדי להפעיל את תכונת הנגישות."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"כאשר קיצור הדרך מופעל, ניתן ללחוץ על שני מקשי עוצמת הקול למשך שלוש שניות כדי להפעיל תכונת נגישות."</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">"עדכון אוטומטי של הגדלת מסך"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"עדכון הגדלת מסך במעבר בין אפליקציות"</string>
@@ -1876,7 +1880,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"עשוי להשפיע על הביצועים"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"לחיצה אחרי שהמצביע מפסיק לזוז"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"השהייה לפני לחיצה"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"מופעל"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"כבוי"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"הצג בהגדרות מהירות"</string>
@@ -2402,6 +2405,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"ניהול חבילות גלישה"</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>
@@ -2487,6 +2491,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"רשתות לנייד"</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_metered_auto" msgid="1262028400911918865">"באופן אוטומטי"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"נמדדת"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"לא נמדדת"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"ייתכן שחישוב השימוש בנתונים אצל הספק יהיה שונה מזה שבמכשיר."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"שיחת חירום"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"חזור לשיחה"</string>
@@ -2714,7 +2721,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Call Manager"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"שידורי חירום"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"התרעות חירום"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"ספקי רשתות"</string>
     <string name="access_point_names" msgid="1381602020438634481">"‏שמות של נקודות גישה (APN)"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"‏מצב 4G LTE משופר"</string>
@@ -2783,6 +2790,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"‏SIM מועדף עבור"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"שאל בכל פעם"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"יש לציין בחירה"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"‏בחירת SIM"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"הגדרות"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="two">‏הצג %d פריטים מוסתרים</item>
@@ -2938,18 +2946,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"הודעות אפליקציה"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"קטגוריית הודעות"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"חשיבות"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"תן לאפליקציה להחליט"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"הפעלת צליל"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"לעולם אל תציג הודעות"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ללא צליל וללא הפרעה ויזואלית"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"ללא צליל"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"השמע צליל"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"השמע צליל והצג במסך"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"הצג במסך"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"נמוכה"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"בינונית"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"גבוהה"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"דחופה"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"הפעלת צליל"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"אל תשמיע צליל, תפעיל רטט או תציג במהירות הודעות אלו לתצוגה המפורטת במסך הנוכחי."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"סוגי הפרעות שאפשר להפעיל"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"האפליקציה יכולה להפעיל צלילים ורטט ו/או להציג הודעות קופצות במסך"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"חשיבות נמוכה"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"חשיבות בינונית"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"חשיבות גבוהה"</string>
@@ -2982,7 +2991,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"תמונה בתוך תמונה"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"תמונה בתוך תמונה"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"אפשר תמונה בתוך תמונה"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"אפשר לאפליקציה זו ליצור חלון מסוג תמונה בתוך תמונה בזמן שהאפליקציה פתוחה, או לאחר שאתה יוצא ממנה (למשל, כדי להמשיך לצפות בסרטון). חלון זה מוצג מעל אפליקציות אחרות שאתה משתמש בהן."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"אפליקציה זו תוכל ליצור חלון מסוג תמונה-בתוך-תמונה בזמן שהיא תהיה פתוחה או לאחר היציאה ממנה (למשל, כדי להמשיך לצפות בסרטון). חלון זה מוצג מעל אפליקציות אחרות שנמצאות בשימוש."</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>
@@ -3305,6 +3314,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"העברת קבצים"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"‏העברת תמונות (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"‏שימוש במכשיר כהתקן MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"‏שיקוף SMS"</string>
     <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>
@@ -3451,6 +3461,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="night_display_suggestion_title" msgid="6602129097059325291">"הגדרת לוח זמנים לתאורת לילה"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"שינוי גון המסך לחום צהבהב כדי לעזור לך להירדם"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"\'תאורת לילה\' פועלת"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"המסך בגוון ענבר. זה עשוי לעזור לך להירדם."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"הצעות"</string>
@@ -3473,6 +3485,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"השתמש בצבעי תצוגה קרירים יותר"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"כבה את המסך כדי להחיל שינוי צבע"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"‏כדי להחיל את השינוי ב-Telephony Monitor, הפעל מחדש את המכשיר"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"‏צילום באיכות +HDR עם HAL"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"‏כדי להפעיל צילום באיכות +HDR עם HAL, עליך להפעיל את המכשיר מחדש"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"חיישן הלייזר של המצלמה"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"עדכוני מערכת אוטומטיים"</string>
     <string name="usage" msgid="2977875522080448986">"שימוש"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"שימוש בחבילת הגלישה"</string>
@@ -3500,7 +3515,7 @@
     <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_2">%2$s</xliff:g> נעשה שימוש ב-<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"השתמשת ב-<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">
@@ -3573,7 +3588,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"מחיקה והמרה"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"‏אפס הגבלת דירוג ב-ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"‏אופסה הגבלת דירוג ב-ShortcutManager"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"שליטה בהודעות של מסך הנעילה"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"בחירת הפרטים שמופיעים במסך הנעילה"</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="8483187649355540109">"תמיכה וטיפים"</string>
@@ -3581,7 +3596,7 @@
     <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="2456198532288640046">"לא גלוי למכשירים אחרים"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"כבוי"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"מחובר אל <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"מחובר לכמה התקנים"</string>
     <string name="demo_mode" msgid="2798762752209330277">"מצב הדגמה בממשק המשתמש של המערכת"</string>
@@ -3689,7 +3704,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"אפליקציות אינסטנט"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"פתיחת קישורים באפליקציות, גם אם הן לא מותקנות"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"אפליקציות אינסטנט"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"חשבון אפליקציות אינסטנט"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"העדפות של אפליקציות אינסטנט"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"אפליקציות מותקנות"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"האחסון שלך מנוהל כעת על ידי מנהל האחסון"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"חשבונות עבור <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3740,7 +3755,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"‏האפשרות \'חיבור תמידי ל-VPN\' פועלת בפרופיל האישי שלך"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"‏האפשרות \'חיבור תמידי ל-VPN\' פועלת בפרופיל העבודה שלך"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"‏הוגדר שרת proxy גלובלי של HTTP"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"פרטי כניסה מהימנים"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"פרטי כניסה מהימנים"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"פרטי כניסה מהימנים בפרופיל האישי שלך"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"פרטי כניסה מהימנים בפרופיל העבודה שלך"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="two">‏מינימום <xliff:g id="COUNT_1">%d</xliff:g> אישורי CA</item>
       <item quantity="many">‏מינימום <xliff:g id="COUNT_1">%d</xliff:g> אישורי CA</item>
@@ -3813,7 +3830,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"פרטי ניהול תצורה של ספק סלולרי"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"הפעל ניהול תצורה של ספק סלולרי"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"מה חדש ומעניין?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"אנחנו מזמינים אותך לנסות את חמש התכונות המובילות"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"סיור היכרות עם הטלפון החדש"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"סיור היכרות עם הטאבלט החדש"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"סיור היכרות עם המכשיר החדש"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"התכונה לא זמינה במכשיר הזה"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"‏סטטוס הרשמה ל-IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"רשום"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"לא רשום"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index c600f97..f5d094b 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$sがメッセージにアクセスしようとしています。%2$sにアクセスを許可しますか？"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIMアクセスリクエスト"</string>
     <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="bluetooth_device_name_summary" msgid="4757990010751789977">"他の端末には「<xliff:g id="DEVICE_NAME">^1</xliff:g>」として表示されます"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"他の端末には「<xliff:g id="DEVICE_NAME">^1</xliff:g>」として表示されます"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"端末"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"新しいデバイスとペア設定"</string>
     <string name="date_and_time" msgid="9062980487860757694">"日付と時刻"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"次へ"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"指紋の設定をスキップしますか？"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"指紋の設定にかかる時間は 1～2 分です。スキップした場合は、後で設定から指紋を追加できます。"</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"画面ロックをスキップしますか？"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"端末保護機能は ON になりません。このタブレットの紛失、盗難、リセット時に、他人に使用されるのを阻止することはできません。"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"端末保護機能は ON になりません。この端末の紛失、盗難、リセット時に、他人に使用されるのを阻止することはできません。"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"端末保護機能は ON になりません。このスマートフォンの紛失、盗難、リセット時に、他人に使用されるのを阻止することはできません。"</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"追加された指紋の数が上限に達しました"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"これ以上、指紋を追加できません"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"すべての指紋を削除しますか？"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"「<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>」の削除"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"この指紋を削除しますか？"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"指紋を使用してスマートフォンのロックを解除したり、購入を許可したり、アプリにログインしたりすることはできなくなります"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"指紋を使用して仕事用プロファイルのロックを解除したり、購入を承認したり、仕事用アプリにログインしたりすることはできなくなります"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"削除"</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"セキュリティを強化するには、予備の画面ロック方式を設定してください。"</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"セキュリティを強化するには、予備の画面ロック方式を設定してください。"</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>
@@ -497,37 +502,37 @@
     <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_fingerprint" msgid="8212242533942400457">"パターンがないと、端末保護機能は利用できません。<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"パターンがないと、端末保護機能は利用できません。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>保存してある指紋もこの端末から削除されるため、指紋認証を使用してスマートフォンのロック解除、購入の許可、アプリへのログインを行うことはできなくなります。"</string>
+</xliff:g>保存してある指紋もこの端末から削除されるため、指紋認証を使用してスマートフォンのロック解除、購入の承認、アプリへのログインを行うことはできなくなります。"</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">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"PIN がないと、端末保護機能は利用できません。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>保存してある指紋もこの端末から削除されるため、指紋認証を使用してスマートフォンのロック解除、購入の許可、アプリへのログインを行うことはできなくなります。"</string>
+</xliff:g>保存してある指紋もこの端末から削除されるため、指紋認証を使用してスマートフォンのロック解除、購入の承認、アプリへのログインを行うことはできなくなります。"</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"パスワードがないと、端末保護機能は利用できません。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>保存してある指紋もこの端末から削除されるため、指紋認証を使用してスマートフォンのロック解除、購入の許可、アプリへのログインを行うことはできなくなります。"</string>
+</xliff:g>保存してある指紋もこの端末から削除されるため、指紋認証を使用してスマートフォンのロック解除、購入の承認、アプリへのログインを行うことはできなくなります。"</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"画面ロックがないと、端末保護機能は利用できません。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>保存してある指紋もこの端末から削除されるため、指紋認証を使用してスマートフォンのロック解除、購入の許可、アプリへのログインを行うことはできなくなります。"</string>
+</xliff:g>保存してある指紋もこの端末から削除されるため、指紋認証を使用してスマートフォンのロック解除、購入の承認、アプリへのログインを行うことはできなくなります。"</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"パターンがないと、プロファイル保護機能は利用できません。"</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"パターンがないと、プロファイル保護機能は利用できません。<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"パターンがないと、プロファイル保護機能は利用できません。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>保存してある指紋もこのプロファイルから削除されるため、指紋を使用してプロファイルのロック解除、購入の許可、アプリへのログインを行うことはできなくなります。"</string>
+</xliff:g>保存してある指紋もこのプロファイルから削除されるため、指紋を使用してプロファイルのロック解除、購入の承認、アプリへのログインを行うことはできなくなります。"</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"PIN がないと、プロファイル保護機能は利用できません。"</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"PIN がないと、プロファイル保護機能は利用できません。<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"PIN がないと、プロファイル保護機能は利用できません。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>保存してある指紋もこのプロファイルから削除されるため、指紋を使用してプロファイルのロック解除、購入の許可、アプリへのログインを行うことはできなくなります。"</string>
+</xliff:g>保存してある指紋もこのプロファイルから削除されるため、指紋を使用してプロファイルのロック解除、購入の承認、アプリへのログインを行うことはできなくなります。"</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"パスワードがないと、プロファイル保護機能は利用できません。"</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"パスワードがないと、プロファイル保護機能は利用できません。<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"パスワードがないと、プロファイル保護機能は利用できません。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>保存してある指紋もこのプロファイルから削除されるため、指紋を使用してプロファイルのロック解除、購入の許可、アプリへのログインを行うことはできなくなります。"</string>
+</xliff:g>保存してある指紋もこのプロファイルから削除されるため、指紋を使用してプロファイルのロック解除、購入の承認、アプリへのログインを行うことはできなくなります。"</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"画面ロックがないと、プロファイル保護機能は利用できません。"</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"画面ロックがないと、プロファイル保護機能は利用できません。<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"画面ロックがないと、プロファイル保護機能は利用できません。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>保存してある指紋もこのプロファイルから削除されるため、指紋を使用してプロファイルのロック解除、購入の許可、アプリへのログインを行うことはできなくなります。"</string>
+</xliff:g>保存してある指紋もこのプロファイルから削除されるため、指紋を使用してプロファイルのロック解除、購入の承認、アプリへのログインを行うことはできなくなります。"</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"無効にする"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"ロック解除パターンの変更"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ロック解除PINの変更"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"一連の数字を昇順や降順にしたり、繰り返したりすることはできません"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"キャンセル"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"消去"</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>
@@ -764,7 +770,7 @@
     <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"Wi-Fiネットワークを変更する権限がありません。"</string>
     <string name="wifi_more" msgid="3195296805089107950">"その他"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"自動設定（WPS）"</string>
-    <string name="wifi_show_advanced" msgid="3409422789616520979">"詳細設定項目"</string>
+    <string name="wifi_show_advanced" msgid="3409422789616520979">"詳細設定"</string>
     <string name="wifi_advanced_toggle_description_expanded" msgid="2380600578544493084">"詳細オプションのプルダウン リストです。折りたたむにはダブルタップします。"</string>
     <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"詳細オプションのプルダウン リストです。展開するにはダブルタップします。"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi-Fi保護設定"</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS利用可"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" （WPS利用可）"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ネットワークパスワードを入力してください"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"携帯通信会社の Wi‑Fi ネットワーク"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> 経由で接続"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"現在地情報の精度向上やその他の目的で、<xliff:g id="APP_NAME">%1$s</xliff:g>ではWi-FiがOFFのときでもネットワークスキャンをオンにすることを要求しています。\n\nスキャンを必要とするすべてのアプリでスキャンを許可しますか？"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"この機能をOFFにするには、オーバーフローメニューの[詳細設定]にアクセスします。"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"許可する"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"接続"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ネットワークに接続できませんでした"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"削除"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"変更"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"ネットワークを削除できませんでした"</string>
     <string name="wifi_save" msgid="3331121567988522826">"保存"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"ネットワークを保存できませんでした"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi詳細設定"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MACアドレス"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IPアドレス"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"ネットワーク情報"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"サブネット マスク"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 アドレス"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"招待状のキャンセル"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g>との接続への招待をキャンセルしますか？"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"このグループを削除しますか？"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"ポータブルWi-Fiアクセスポイント"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi アクセス ポイント"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"インターネット接続やコンテンツを他の端末と共有しない"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"このタブレットのインターネット接続をアクセス ポイント経由で共有"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"このスマートフォンのインターネット接続をアクセス ポイント経由で共有"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"アプリがコンテンツを共有しています。インターネット接続を共有するには、アクセス ポイントをオフにしてから再度オンにします"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi 名"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"アクセス ポイント名"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> を ON にしています..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"他の端末が <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> に接続できます"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi パスワード"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"アクセス ポイントのパスワード"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP 帯域幅"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"アクセス ポイントを使って他の端末との Wi‑Fi ネットワークを作成します。アクセス ポイントはモバイルデータ接続によるインターネット接続を提供します。モバイルデータ通信料が追加で発生する可能性があります。"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"アプリを使ってアクセス ポイントを作成し、コンテンツを近くの端末と共有できます。"</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi発信をONにすると、ユーザーの設定と信号の強度に応じて、スマートフォンからWi-Fiネットワークか携帯通信会社ネットワークのいずれかを経由して通話をルーティングできるようになります。この機能をONにする場合は、事前に料金などの条件について携帯通信会社にご確認ください。"</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"緊急対応の住所の更新"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"Wi-Fi を使用して 110 に電話した場合に、緊急サービスが現在地として使用する住所"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"Wi‑Fi を使用して緊急通報を行った場合に、緊急サービスが現在地として使用する住所"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"表示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"音量"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"検索"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"検索設定と履歴の管理"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"一致する結果はありません"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"履歴を削除"</string>
     <string name="display_settings" msgid="7965901687241669598">"ディスプレイ"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"画面の自動回転"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"鮮明な色"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"デフォルトのAPN設定を復元しています。"</string>
     <string name="menu_restore" msgid="8260067415075573273">"初期設定にリセット"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"APN設定をリセットしました。"</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"リセット"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"ネットワーク設定のリセット"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"リセット オプション"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"ネットワーク、アプリ、または端末をリセットできます"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi、モバイル、Bluetooth をリセット"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"以下を含む、すべてのネットワーク設定がリセットされます。\n\n"<li>"Wi‑Fi"</li>\n<li>"モバイルデータ"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"設定をリセット"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"すべてのネットワーク設定をリセットしますか？この操作は元に戻せません。"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"リセットしますか？"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"ネットワークのリセットはこのユーザーには許可されていません"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"ネットワーク設定をリセットしました"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"データの初期化"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> 件のアカウントをリセットします</item>
-      <item quantity="one">1 件のアカウントをリセットします</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"内部ストレージとすべてのデータをリセットします"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"すべてのデータを消去（初期状態にリセット）"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"この操作を行うと、タブレットの以下のデータを含む"<b>"内部ストレージ"</b>"の全データが消去されます。\n\n"<li>"Googleアカウント"</li>\n<li>"システムやアプリのデータと設定"</li>\n<li>"ダウンロードしたアプリ"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"この操作を行うと、モバイル端末の以下のデータを含む"<b>"内部ストレージ"</b>"の全データが消去されます。\n\n"<li>"Googleアカウント"</li>\n<li>"システムやアプリのデータと設定"</li>\n<li>"ダウンロードしたアプリ"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"以下のアカウントにログインしています:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"安全に関する情報"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"データ接続されていません。この情報を表示するにはインターネットに接続されているパソコンから%sにアクセスしてください。"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"読み込み中..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"パスワードを選択"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"画面ロックの設定"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"セキュリティを強化するには、パスワードを設定してください"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"指紋認証にはパスワードが必要です"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"パターンの選択"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"指紋認証にはパターンが必要です"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PINを選択"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"セキュリティを強化するには、PIN を設定してください"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"指紋認証には PIN が必要です"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"パスワードを確認"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"パスワードの再入力"</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_pin_header" msgid="7744513791910572550">"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>
@@ -1483,12 +1490,18 @@
     <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_strong_auth_required_device_pattern" msgid="530802132223800623">"セキュリティ強化のため、端末のパターンを入力してください"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"セキュリティ強化のため、端末の PIN を入力してください"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"セキュリティ強化のため、端末のパスワードを入力してください"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"セキュリティ強化のため、仕事用のパターンを入力してください"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"セキュリティ強化のため、仕事用の PIN を入力してください"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"セキュリティ強化のため、仕事用のパスワードを入力してください"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"スマートフォンは出荷時の設定にリセットされました。使用するには、以前のパターンを入力してください。"</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"スマートフォンは出荷時の設定にリセットされました。使用するには、以前の PIN を入力してください。"</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"スマートフォンは出荷時の設定にリセットされました。使用するには、以前のパスワードを入力してください。"</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"パターンの確認"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"PIN の確認"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"パスワードの確認"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PINが正しくありません"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"パスワードが正しくありません"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"パターンが正しくありません"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"ウィジェットの作成とアクセスの許可"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"ウィジェットを作成すると、<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>は表示されるすべてのデータにアクセスできるようになります。"</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>によるウィジェットの作成とデータへのアクセスを常に許可する"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>日<xliff:g id="HOURS">%2$d</xliff:g>時間<xliff:g id="MINUTES">%3$d</xliff:g>分<xliff:g id="SECONDS">%4$d</xliff:g>秒"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>時間<xliff:g id="MINUTES">%2$d</xliff:g>分<xliff:g id="SECONDS">%3$d</xliff:g>秒"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>分<xliff:g id="SECONDS">%2$d</xliff:g>秒"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>秒"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"使用統計情報"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"使用統計情報"</string>
     <string name="display_order_text" msgid="8592776965827565271">"並べ替え:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"スクリーン リーダー、表示、操作のコントロール"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"視覚補助"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"この端末を必要に応じてカスタマイズできます。このユーザー補助機能は後から [設定] で変更できます。"</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"フォントサイズを拡大"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"フォントサイズの変更"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"スクリーン リーダー"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"音声と画面上のテキスト"</string>
     <string name="display_category_title" msgid="685461049938269166">"表示"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"ズーム"</b>"するには、画面をすばやく 3 回タップします。\n"<ul><li>"2 本以上の指をドラッグしてスクロール"</li>\n<li>"2 本以上の指でピンチ操作してズームを調整"</li></ul>\n\n<b>"一時的にズーム"</b>"するには、画面をすばやく 3 回タップし、3 回目のタップで指を押し続けます。\n"<ul><li>"ドラッグで画面上を移動"</li>\n<li>"指を放してズームアウト"</li></ul>\n\n"キーボードやナビゲーション バーでは拡大できません。"</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"[拡大] を ON にすると、画面下部の [ユーザー補助機能] ボタンを使ってすぐに拡大できます。\n\n"<b>"ズーム"</b>"するには、[ユーザー補助機能] ボタンをタップして画面をタップします。\n"<ul><li>"2 本以上の指をドラッグしてスクロール"</li>\n<li>"2 本以上の指でピンチ操作してズームを調整"</li></ul>\n\n<b>"一時的にズーム"</b>"するには、[ユーザー補助機能] ボタンをタップして画面をタップします。\n"<ul><li>"ドラッグで画面上を移動"</li>\n<li>"指を放してズームアウト"</li></ul>\n\n"キーボードやナビゲーション バーでは拡大できません。"</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"[ユーザー補助機能] ボタンが [<xliff:g id="SERVICE">%1$s</xliff:g>] に設定されています。拡大を使用するには、[ユーザー補助機能] ボタンを押し続けて [拡大] を選択してください。"</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"ユーザー補助のショートカット"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"音量キーのショートカット"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"ショートカット サービス"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"ロック画面から許可"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"ショートカットを ON にすると、音量大ボタンと音量小ボタンの両方を 3 秒間押し続けてユーザー補助機能を開始できます。"</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"ショートカットを ON にすると、音量大キーと音量小キーの両方を 3 秒間押し続けてユーザー補助機能を開始できます。"</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">"画面の拡大を自動更新"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"アプリの遷移時に画面の拡大を更新"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"パフォーマンスに影響することがあります"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"ポインタが停止したらクリック"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"クリックまでの時間"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ON"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"OFF"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"クイック設定に表示"</string>
@@ -2362,6 +2367,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"プランを管理"</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>
@@ -2447,6 +2453,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"モバイルネットワーク"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"従量制の Wi‑Fi ネットワーク"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"従量制のネットワークを選択するには Wi‑Fi を ON にします。"</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"自動"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"従量制"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"定額制"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"端末で記録されるデータ使用量と携帯通信会社のデータ使用量は異なる場合があります。"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"緊急通報"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"通話に戻る"</string>
@@ -2664,7 +2673,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"通話マネージャ"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"緊急速報メール"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"緊急速報メール"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"携帯通信会社"</string>
     <string name="access_point_names" msgid="1381602020438634481">"アクセスポイント名"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"パワーアップした4G LTEモード"</string>
@@ -2733,6 +2742,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"優先SIM:"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"その都度確認"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"選択してください"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"SIM の選択"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"設定"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">%d 件の非表示のアイテムを表示</item>
@@ -2884,18 +2894,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"アプリの通知"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"通知のカテゴリ"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"重要度"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"アプリに判断させる"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"音の許可"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"通知を表示しない"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"音声や画面表示を使用しない"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"音声なし"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"音声で知らせる"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"音声とポップアップで知らせる"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"ポップアップ"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"低"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"中"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"高"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"緊急"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"音の許可"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"音やバイブレーションで知らせず、現在の画面に通知を数秒間表示することもしません。"</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"割り込みの許可"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"音やバイブレーションによる通知、または画面のポップアップ通知をアプリに許可します"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"重要度: 低"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"重要度: 中"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"重要度: 高"</string>
@@ -2926,7 +2937,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip ピクチャー イン"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"ピクチャー イン ピクチャー"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"ピクチャー イン ピクチャーを許可"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"このアプリを開いているとき、またはアプリを離れた後に、動画の再生を続けるなどの目的でピクチャー イン ピクチャー ウィンドウを表示できるようにします。このウィンドウは、使用中の他のアプリの上に重ねて表示されます。"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"このアプリを開いているとき、またはアプリを離れた後に、動画の再生を続けるなどの目的でピクチャー イン ピクチャー ウィンドウを表示できるようにします。このウィンドウは、使用中の他のアプリの上に重ねて表示されます。"</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>
@@ -3229,6 +3240,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"ファイルを転送する"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"写真を転送する（PTP）"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"この端末を MIDI として利用する"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS ミラーリング"</string>
     <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>
@@ -3371,6 +3383,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="night_display_suggestion_title" msgid="6602129097059325291">"読書灯のスケジュールの設定"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"画面が黄味がかった色になります"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"読書灯 ON"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"画面が黄味がかった色になります。寝付きを良くする効果も期待できます。"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"候補"</string>
@@ -3389,6 +3403,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"寒色の表示色を使用します"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"色の変更を適用するには、画面を OFF にしてください"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telephony Monitor の変更を適用するには、端末を再起動してください"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"カメラ HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"カメラ HAL HDR+ の変更を適用するには、端末を再起動してください"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"カメラのレーザー センサー"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"自動システム アップデート"</string>
     <string name="usage" msgid="2977875522080448986">"使用量"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"モバイルデータ使用"</string>
@@ -3414,7 +3431,7 @@
     <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="data_usage_template" msgid="2923744765873163859">"<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">
@@ -3483,7 +3500,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"消去して変換"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager のレート制限をリセット"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager のレート制限をリセットしました"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"ロック画面の通知を管理する"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"ロック画面に表示される情報の管理"</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="8483187649355540109">"サポートとヒント"</string>
@@ -3491,7 +3508,7 @@
     <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="2456198532288640046">"他の端末には非表示"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"OFF"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> に接続しました"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"複数のデバイスに接続しました"</string>
     <string name="demo_mode" msgid="2798762752209330277">"システム UI デモモード"</string>
@@ -3593,7 +3610,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Instant Apps"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"アプリがインストールされていなくても、アプリ内のリンクを開くことができます"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Instant Apps"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Instant Apps アカウント"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Instant Apps の設定"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"インストール済みアプリ"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"お使いのストレージの管理はストレージ マネージャが行うようになりました"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g>のアカウント"</string>
@@ -3640,7 +3657,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"個人プロフィールで常時接続 VPN は ON です"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"仕事用プロファイルで常時接続 VPN は ON です"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"グローバル HTTP プロキシが設定されています"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"信頼できる認証情報"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"信頼できる認証情報"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"個人用プロファイル内の信頼できる認証情報"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"仕事用プロファイル内の信頼できる認証情報"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">CA 証明書: <xliff:g id="COUNT_1">%d</xliff:g> 件以上</item>
       <item quantity="one">CA 証明書: <xliff:g id="COUNT_0">%d</xliff:g> 件以上</item>
@@ -3703,7 +3722,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"携帯通信会社のプロビジョニング情報"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"携帯通信会社のプロビジョニングをトリガー"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"注目の新機能"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"5 つの優れた機能をご覧ください"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"新しいスマートフォンの使い方をご紹介します"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"新しいタブレットの使い方をご紹介します"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"新しい端末の使い方をご紹介します"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"この機能は、お使いの端末ではご利用いただけません"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS 登録ステータス"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"登録済み"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"未登録"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index a1ff68b..ccd0e23 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s-ს უნდა თქვენს შეტყობინებებზე წვდომა. მისცემთ %2$s-ს წვდომას?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM-ზე წვდომის მოთხოვნა"</string>
     <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="bluetooth_device_name_summary" msgid="4757990010751789977">"სხვა მოწყობილობებისთვის ჩანს, როგორც <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"სხვა მოწყობილობებისთვის ჩანს, როგორც „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"თქვენი მოწყობილობები"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ახალი მოწყობილობის დაწყვილება"</string>
     <string name="date_and_time" msgid="9062980487860757694">"თარიღი და დრო"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"შემდეგი"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"გსურთ თითის ანაბეჭდის დაყენების გამოტოვება?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"თითის ანაბეჭდის დაყენებას მხოლოდ რამდენიმე წუთი სჭირდება. თუ ამ ეტაპს გამოტოვებთ, თითის ანაბეჭდის მოგვიანებით დამატებას პარამეტრებში შეძლებთ."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"ეკრანის დაბლოკვის გამოტოვება გსურთ?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"მოწყობილობის დაცვის ფუნქციები არ ჩაირთვება. ამ ტაბლეტის დაკარგვის, მოპარვის ან მისი ქარხნული პარამეტრების დაბრუნების შემთხვევაში, თქვენ ვერ შეძლებთ ხელი შეუშალოთ სხვას მის გამოყენებაში."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"მოწყობილობის დაცვის ფუნქციები არ ჩაირთვება. ამ მოწყობილობის დაკარგვის, მოპარვის ან მისი ქარხნული პარამეტრების დაბრუნების შემთხვევაში, თქვენ ვერ შეძლებთ ხელი შეუშალოთ სხვას მის გამოყენებაში."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"მოწყობილობის დაცვის ფუნქციები არ ჩაირთვება. ამ ტელეფონის დაკარგვის, მოპარვის ან მისი ქარხნული პარამეტრების დაბრუნების შემთხვევაში, თქვენ ვერ შეძლებთ ხელი შეუშალოთ სხვას მის გამოყენებაში."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"თქვენ უკვე დაამატეთ თითის ანაბეჭდების მაქსიმალური რაოდენობა"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"მეტი თითის ანაბეჭდის დამატება ვერ ხერხდება"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"წაიშალოს ყველა თითის ანაბეჭდი?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"„<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“-ის ამოშლა"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"გსურთ თითის ანაბეჭდის წაშლა?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"თქვენ ვეღარ შეძლებთ თითის ანაბეჭდების გამოყენებას ტელეფონის განსაბლოკად, შენაძენების ავტორიზაციისთვისა თუ აპებში შესასვლელად"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"თქვენ ვეღარ შეძლებთ თითის ანაბეჭდების გამოყენებას სამსახურის პროფილის განსაბლოკად, შენაძენების ავტორიზაციისთვისა თუ სამსახურის აპებში შესასვლელად"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"დიახ, წაიშალოს"</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"დამატებითი უსაფრთხოებისთვის, დააყენეთ ეკრანის დაბლოკვის სარეზერვო მეთოდი."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"დამატებითი უსაფრთხოებისთვის, დააყენეთ ეკრანის დაბლოკვის სარეზერვო მეთოდი."</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>
@@ -497,37 +502,37 @@
     <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_fingerprint" msgid="8212242533942400457">"მოწყობილობის დაცვის ფუნქციები თქვენი ნიმუშის გარეშე არ იმუშავებს.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"მოწყობილობის დაცვის ფუნქციები განმბლოკავი ნიმუშის გარეშე არ იმუშავებს.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ამ მოწყობილობიდან წაიშლება ასევე თქვენ მიერ შენახული თითის ანაბეჭდები და თქვენი ტელეფონის განბლოკვას, შესყიდვების ავტორიზაციას ან მათი გამოყენებით აპებში შესვლას ვერ შეძლებთ“."</string>
+</xliff:g>ამ მოწყობილობიდან ამოიშლება ასევე თქვენ მიერ შენახული თითის ანაბეჭდები და თქვენი ტელეფონის განბლოკვას, შესყიდვების ავტორიზაციას ან მათი გამოყენებით აპებში შესვლას ვერ შეძლებთ."</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">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"მოწყობილობის დაცვის ფუნქციები PIN-კოდის გარეშე არ იმუშავებს.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ამ მოწყობილობიდან წაიშლება ასევე თქვენ მიერ შენახული თითის ანაბეჭდები და თქვენი ტელეფონის განბლოკვას, შესყიდვების ავტორიზაციას ან მათი გამოყენებით აპებში შესვლას ვერ შეძლებთ“."</string>
+</xliff:g>ამ მოწყობილობიდან ამოიშლება ასევე თქვენ მიერ შენახული თითის ანაბეჭდები და თქვენი ტელეფონის განბლოკვას, შესყიდვების ავტორიზაციას ან მათი გამოყენებით აპებში შესვლას ვერ შეძლებთ."</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"მოწყობილობის დაცვის ფუნქციები პაროლის გარეშე არ იმუშავებს.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ამ მოწყობილობიდან წაიშლება ასევე თქვენ მიერ შენახული თითის ანაბეჭდები და თქვენი ტელეფონის განბლოკვას, შესყიდვების ავტორიზაციას ან მათი გამოყენებით აპებში შესვლას ვერ შეძლებთ“."</string>
+</xliff:g>ამ მოწყობილობიდან ამოიშლება ასევე თქვენ მიერ შენახული თითის ანაბეჭდები და თქვენი ტელეფონის განბლოკვას, შესყიდვების ავტორიზაციას ან მათი გამოყენებით აპებში შესვლას ვერ შეძლებთ."</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"მოწყობილობის დაცვის ფუნქციები ეკრანის ჩაკეტვის გარეშე არ იმუშავებს.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ამ მოწყობილობიდან წაიშლება ასევე თქვენ მიერ შენახული თითის ანაბეჭდები და თქვენი ტელეფონის განბლოკვას, შესყიდვების ავტორიზაციას ან მათი გამოყენებით აპებში შესვლას ვერ შეძლებთ“."</string>
+</xliff:g>ამ მოწყობილობიდან ამოიშლება ასევე თქვენ მიერ შენახული თითის ანაბეჭდები და თქვენი ტელეფონის განბლოკვას, შესყიდვების ავტორიზაციას ან მათი გამოყენებით აპებში შესვლას ვერ შეძლებთ."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"პროფილის დაცვის ფუნქციები თქვენი ნიმუშის გარეშე არ იმუშავებს."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"პროფილის დაცვის ფუნქციები თქვენი ნიმუშის გარეშე არ იმუშავებს.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"პროფილის დაცვის ფუნქციები განმბლოკავი ნიმუშის გარეშე არ იმუშავებს.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ამ პროფილიდან ასევე წაიშლება თქვენ მიერ შენახული თითის ანაბეჭდები და მათი გამოყენებით აპებში შესვლას, თქვენი პროფილის განბლოკვას, ან შენაძენების ავტორიზაციას ვეღარ შეძლებთ“."</string>
+</xliff:g>ამ მოწყობილობიდან ამოიშლება ასევე თქვენ მიერ შენახული თითის ანაბეჭდები და თქვენი ტელეფონის განბლოკვას, შესყიდვების ავტორიზაციას ან მათი გამოყენებით აპებში შესვლას ვერ შეძლებთ."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"პროფილის დაცვის ფუნქციები თქვენი PIN-კოდის გარეშე არ იმუშავებს."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"პროფილის დაცვის ფუნქციები თქვენი PIN-კოდის გარეშე არ იმუშავებს.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"პროფილის დაცვის ფუნქციები PIN-კოდის გარეშე არ იმუშავებს.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ამ პროფილიდან ასევე წაიშლება თქვენ მიერ შენახული თითის ანაბეჭდები და მათი გამოყენებით აპებში შესვლას, თქვენი პროფილის განბლოკვას, ან შენაძენების ავტორიზაციას ვეღარ შეძლებთ“."</string>
+</xliff:g>ამ პროფილიდან ასევე ამოიშლება თქვენ მიერ შენახული თითის ანაბეჭდები და მათი გამოყენებით აპებში შესვლას, თქვენი პროფილის განბლოკვას, ან შენაძენების ავტორიზაციას ვეღარ შეძლებთ."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"პროფილის დაცვის ფუნქციები თქვენი პაროლის გარეშე არ იმუშავებს."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"პროფილის დაცვის ფუნქციები თქვენი პაროლის გარეშე არ იმუშავებს.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"პროფილის დაცვის ფუნქციები პაროლის გარეშე არ იმუშავებს.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ამ პროფილიდან ასევე წაიშლება თქვენ მიერ შენახული თითის ანაბეჭდები და მათი გამოყენებით აპებში შესვლას, თქვენი პროფილის განბლოკვას, ან შენაძენების ავტორიზაციას ვეღარ შეძლებთ“."</string>
+</xliff:g>ამ მოწყობილობიდან ამოიშლება ასევე თქვენ მიერ შენახული თითის ანაბეჭდები და თქვენი ტელეფონის განბლოკვას, შესყიდვების ავტორიზაციას ან მათი გამოყენებით აპებში შესვლას ვერ შეძლებთ."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"პროფილის დაცვის ფუნქციები თქვენი ეკრანის დაბლოკვის გარეშე არ იმუშავებს."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"პროფილის დაცვის ფუნქციები თქვენი ეკრანის დაბლოკვის გარეშე არ იმუშავებს.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"პროფილის დაცვის ფუნქციები ეკრანის ჩაკეტვის გარეშე არ იმუშავებს.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ამ პროფილიდან ასევე წაიშლება თქვენ მიერ შენახული თითის ანაბეჭდები და მათი გამოყენებით აპებში შესვლას, თქვენი პროფილის განბლოკვას, ან შენაძენების ავტორიზაციას ვეღარ შეძლებთ“."</string>
+</xliff:g>ამ პროფილიდან ასევე ამოიშლება თქვენ მიერ შენახული თითის ანაბეჭდები და მათი გამოყენებით აპებში შესვლას, თქვენი პროფილის განბლოკვას, ან შენაძენების ავტორიზაციას ვეღარ შეძლებთ."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"დიახ, წაიშალოს"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"გასაღების ცვლილება"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"განბლოკვის PIN-ის შეცვლა"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"ციფრების ზრდადი, კლებადი ან გამეორებადი მიმდევრობის გამოყენება ნებადართული არ არის"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"კარგი"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"გაუქმება"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"გასუფთავება"</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>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"ხელმისაწვდომია WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ხელმისაწვდომია)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"შეიყვანეთ თქვენი ქსელის პაროლი"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"ოპერატორის Wi‑Fi ქსელი"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g>-ით დაკავშირება"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"მდებარეობის ზუსტი განსაზღვრის და სხვა ფუნქციების გასაუმჯობესებლად <xliff:g id="APP_NAME">%1$s</xliff:g>-ს სურს, გააქტიურდეს ქსელების მოძიება, მაშინაც კი, როცა გამორთულია Wi-Fi.\n\nმიეცეს ამის უფლება ყველა აპს?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ამის გამოსართავად, მოინახულეთ გაფართოებული სექცია გადავსების მენიუში."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ნებართვა"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"დაკავშირება"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ქსელთან დაკავშირება ვერ ხერხდება"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"წაშლა"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"შეცვლა"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"ქსელის დავიწყება ვერ მოხერხდა"</string>
     <string name="wifi_save" msgid="3331121567988522826">"შენახვა"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"ქსელის შენახვა ვერ მოხერხდა"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"გაუმჯობესებული Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC მისამართი"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP მისამართი"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"ქსელის ინფორმაცია"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"ქვექსელის ნიღაბი"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 მისამართები"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"გსურთ მოწვევის გაუქმება?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"ნამდვილად გსურთ <xliff:g id="PEER_NAME">%1$s</xliff:g>-თან დაკავშირების მიწვევის გაუქმება?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"გსურთ, ამ ჯგუფის დავიწყება?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"პორტატული Wi‑Fi-ს უსადენო ქსელი"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi უსადენო ქსელი"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"არ მოხდეს ინტერნეტის ან კონტენტის სხვა მოწყობილობებთან გაზიარება"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"ამ ტაბლეტის ინტერნეტ-კავშირი უსადენო ქსელით ზიარდება"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"ამ ტელეფონის ინტერნეტ-კავშირი უსადენო ქსელით ზიარდება"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"აპი კონტენტს აზიარებს. ინტერნეტ-კავშირის გასაზიარებლად, ჯერ გამორთეთ, შემდეგ კი ხელახლა ჩართეთ უსადენო ქსელი"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi-ს სახელი"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"უსადენო ქსელის სახელი"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"მიმდინარეობს <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-ის ჩართვა…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"სხვა მოწყობილობებს შეუძლია <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-თან დაკავშირება"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi-ს პაროლი"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"უსადენო ქსელის პაროლი"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP Band"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"გამოიყენეთ უსადენო ქსელი თქვენი სხვა მოწყობილობებისთვის Wi‑Fi ქსელის შესაქმნელად. უსადენო ქსელი ინტერნეტზე წვდომას უზრუნველყოფს თქვენი მობილური ინტერნეტ-კავშირის მეშვეობით. შედეგად, შესაძლოა დაგეკისროთ მობილური ინტერნეტის შესაბამისი გადასახადები."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"აპებს შეუძლიათ უსადენო ქსელის შექმნა, რათა გაუზიარონ კონტენტი ახლომდებარე მოწყობილობებს."</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"როდესაც Wi-Fi ზარი ჩართულია, თქვენს ტელეფონს შეუძლია გადაამისამართოს ზარი Wi-Fi ან თქვენს ოპერატორ ქსელზე, თქვენი პრეფერენციებისა და სიგნალის სიძლიერის მიხედვით. ამ ფუნქციის ჩართვამდე, დააზუსტეთ თქვენს ოპერატორთან შესაძლო თანხები და სხვა დეტალები."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"საგანგებო ვითარებისას საკონტაქტო მისამართის განახლება"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"მისამართი, რომელსაც 911-ზე Wi-Fi-ს მეშვეობით დარეკვისას, საგანგებო სამსახურები თქვენი მდებარეობის დასადგენად გამოიყენებს."</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"მისამართი, რომელსაც გადაუდებელი ზარის Wi-Fi-ს მეშვეობით განხორციელებისას, საგანგებო სამსახურები თქვენი მდებარეობის დასადგენად გამოიყენებს"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ეკრანი"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ხმა"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ხმის კონტროლი"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"ძიება"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"ძიების პარამეტრებისა და ისტორიის მართვა"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"შედეგები არ არის"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"ისტორიის გასუფთავება"</string>
     <string name="display_settings" msgid="7965901687241669598">"ეკრანი"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"ავტოროტაციის ეკრანი"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"მკვეთრი ფერები"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"ნაგულისხმევი APN პარამეტრების აღდგენა."</string>
     <string name="menu_restore" msgid="8260067415075573273">"საწყის პარამეტრებზე ჩამოყრა"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"ნაგულისხმევი APN პარამეტრების  აღდგენა დასრულებულია"</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"გადაყენება"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"ქსელის პარამეტრების ჩამოყრა"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"გადაყენების ვარიანტები"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"შესაძლებელია ქსელის, აპების ან მოწყობილობის გადაყენება"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi-ს, მობილური ინტერნეტის და Bluetooth კავშირის გადაყენება"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"ეს ქმედება ქსელის ყველა პარამეტრს გადააყენებს, მათ შორის, შემდეგს:\n\n"<li>"Wi‑Fi"</li>\n<li>"მობილური ინტერნეტი"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"პარამეტრების ჩამოყრა"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"გსურთ ქსელის ყველა პარამეტრის ჩამოყრა? ამ მოქმედების გაუქმება შეუძლებელია!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"ჩამოვყაროთ პარამეტრები?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"ქსელის გადაყენება ამ მომხმარებლისათვის მიუწვდომელია"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"ქსელის პარამეტრები ჩამოიყარა"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"ქარხნული მონაცემების აღდგენა"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> ანგარიში გადაყენდება</item>
-      <item quantity="one">1 ანგარიში გადაყენდება</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"შიდა მეხსიერება და ყველა მონაცემი გადაყენდება"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"ყველა მონაცემის ამოშლა (ქარხნული პარამეტრების დაბრუნება)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ეს მოქმედება წაშლის ყველა მონაცემებს თქვენი ტაბლეტის "<b>"შიდა მეხსიერებიდან"</b>", მათ შორის:\n\n"<li>"თქვენს Google-ის ანგარიშს"</li>\n<li>"სისტემისა და აპების მონაცემებს და პარამეტრებს"</li>\n<li>"ჩამოტვირთულ აპებს"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ეს მოქმედება წაშლის ყველა მონაცემებს თქვენი ტელეფონის "<b>"შიდა მეხსიერებიდან"</b>", მათ შორის:\n\n"<li>"თქვენს Google-ის ანგარიშს"</li>\n<li>"სისტემისა და აპების მონაცემებს და პარამეტრებს"</li>\n<li>"ჩამოტვირთულ აპებს"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ამჟამად შესული ხართ შემდეგ ანგარიშებში:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"ინფორმაცია უსაფრთხოების შესახებ"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"თქვენ არ გაქვთ ინტერნეტ კავშირი. ამ ინფორმაციის სანახავად ახლავე, გადადით %s-ზე ინტერნეტში ჩართული ნებისმიერი კომპიუტერიდან."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"იტვირთება…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"აირჩიეთ პაროლი"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"ეკრანის დაბლოკვის მეთოდის დაყენება"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"უსაფრთხოებისთვის, დააყენეთ პაროლი"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"თითის ანაბეჭდის გამოსაყენებლად დააყენეთ პაროლი"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"აირჩიეთ გრაფიკული გასაღები"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"თითის ანაბეჭდისთვის დააყენეთ ნიმუში"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"თქვენი PIN-ის არჩევა"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"უსაფრთხოებისთვის, დააყენეთ PIN-კოდი"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"თითის ანაბეჭდის გამოსაყენებლად დააყენეთ PIN-კოდი"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"დაადასტურეთ პაროლი"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"ხელახლა შეიყვანეთ თქვენი პაროლი"</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_pin_header" msgid="7744513791910572550">"ხელახლა შეიყვანეთ თქვენი 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>
@@ -1483,12 +1490,18 @@
     <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_strong_auth_required_device_pattern" msgid="530802132223800623">"დამატებითი უსაფრთხოებისთვის, გამოიყენეთ მოწყობილობის განმბლოკავი ნიმუში"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"დამატებითი უსაფრთხოებისთვის, შეიყვანეთ მოწყობილობის PIN-კოდი"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"დამატებითი უსაფრთხოებისთვის, შეიყვანეთ მოწყობილობის პაროლი"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"დამატებითი უსაფრთხოებისთვის, გამოიყენეთ სამსახურის განმბლოკავი ნიმუში"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"დამატებითი უსაფრთხოებისთვის, შეიყვანეთ სამსახურის PIN-კოდი"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"დამატებითი უსაფრთხოებისთვის, შეიყვანეთ სამსახურის პაროლი"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"თქვენი ტელეფონი ქარხნულ პარამეტრებზე დაბრუნდა. ამ ტელეფონის გამოსაყენებლად, შეიყვანეთ თქვენი წინა განმბლოკავი ნიმუში."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"თქვენი ტელეფონი ქარხნულ პარამეტრებზე დაბრუნდა. ამ ტელეფონის გამოსაყენებლად, შეიყვანეთ თქვენი წინა PIN-კოდი."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"თქვენი ტელეფონი ქარხნულ პარამეტრებზე დაბრუნდა. ამ ტელეფონის გამოსაყენებლად, შეიყვანეთ თქვენი წინა პაროლი."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"განმბლოკავი ნიმუშის დადასტურება"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"PIN-კოდის დადასტურება"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"პაროლის დადასტურება"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"არასწორი PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"არასწორი პაროლი"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"არასწორი ნიმუში"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"შეიქმნას ვიჯეტი და მიეცეს წვდომის უფლება?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"ვიჯეტის შექმნის შემდეგ, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>-ს ექნება წვდომა ყველა იმ მონაცემთან, რომელიც ეკრანზე გამოაქვს."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>-ს ყოველთვის მიეცეს ვიჯეტების შექმნისა და მათ მონაცემებზე წვდომის უფლება"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>დღე <xliff:g id="HOURS">%2$d</xliff:g>სთ <xliff:g id="MINUTES">%3$d</xliff:g>წთ <xliff:g id="SECONDS">%4$d</xliff:g>წმ"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>სთ <xliff:g id="MINUTES">%2$d</xliff:g>წთ <xliff:g id="SECONDS">%3$d</xliff:g>წმ"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>წთ. <xliff:g id="SECONDS">%2$d</xliff:g>წმ."</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> წმ"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"გამოყენების სტატისტიკა"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"გამოყენების სტატისტიკა"</string>
     <string name="display_order_text" msgid="8592776965827565271">"სორტირება:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"ეკრანის წამკითხველები, ჩვენება, ინტერაქციის მართვის საშუალებები"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"მხედველობის პარამეტრები"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"ამ მოწყობილობის მორგება თქვენი საჭიროებების შესაბამისად შეგიძლიათ. მარტივი წვდომის ამ პარამეტრების მოგვიანებით შეცვლა პარამეტრებიდან არის შესაძლებელი."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"შრიფტის ზომის გაზრდა"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"შრიფტის ზომის შეცვლა"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"ეკრანის წამკითხველები"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"აუდიო და ეკრანზე გამოტანილი ტექსტი"</string>
     <string name="display_category_title" msgid="685461049938269166">"ეკრანი"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"მასშტაბის გასადიდებლად"</b>" სწრაფად შეეხეთ ეკრანს სამჯერ ზედიზედ.\n"<ul><li>"გადასაადგილებლად გადაატარეთ ეკრანს ორი ან მეტი თითი"</li>\n<li>"მასშტაბის დონის დასარეგულირებლად ეკრანზევე შეაერთეთ ორი ან მეტი თითი"</li></ul>\n\n<b>"მასშტაბის დროებით გასადიდებლად"</b>" სწრაფად შეეხეთ ეკრანს სამჯერ ზედიზედ და შეაყოვნეთ თითი მესამე შეხებისას.\n"<ul><li>"გადაატარეთ თითი ეკრანს მისი სხვადასხვა ნაწილის დასათვალიერებლად"</li>\n<li>"მასშტაბის შესამცირებლად აუშვით თითი"</li></ul>\n\n"კლავიატურისა და ნავიგაციის ზოლის მასშტაბის გაზრდა ვერ მოხერხდება."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"გადიდების ჩართვის შემდეგ ამ ფუნქციით სწრაფად სარგებლობა შეგიძლიათ მარტივი წვდომის ღილაკის მეშვეობით, რომელიც ეკრანის ქვედა ნაწილში მდებარეობს.\n\n"<b>"მასშტაბის გასადიდებლად"</b>" შეეხეთ მარტივი წვდომის ღილაკს, ხოლო შემდეგ — ეკრანის ნებისმიერ ნაწილს.\n"<ul><li>"გადასაადგილებლად გადაატარეთ ეკრანს ორი ან მეტი თითი"</li>\n<li>"მასშტაბის დონის დასარეგულირებლად ეკრანზევე შეაერთეთ ორი ან მეტი თითი"</li></ul>\n\n<b>"მასშტაბის დროებით გასადიდებლად"</b>" შეეხეთ მარტივი წვდომის ღილაკს, ხოლო შემდეგ ხანგრძლივად შეეხეთ ეკრანის ნებისმიერ ნაწილს.\n"<ul><li>"გადაატარეთ თითი ეკრანს მისი სხვადასხვა ნაწილის დასათვალიერებლად"</li>\n<li>"მასშტაბის შესამცირებლად აუშვით თითი"</li></ul>\n\n"კლავიატურისა და ნავიგაციის ზოლის მასშტაბის გაზრდა ვერ მოხერხდება."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"მარტივი წვდომის ღილაკად დაყენებულია <xliff:g id="SERVICE">%1$s</xliff:g>. გადიდების გამოსაყენებლად ხანგრძლივად შეეხეთ მარტივი წვდომის ღილაკს, ხოლო შემდეგ აირჩიეთ გადიდება."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"მარტივი წვდომის მალსახმობი"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"ხმის ღილაკის მალსახმობი"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"მალსახმობი სერვისი"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"ჩაკეტილ ეკრანზე გამოყენების დაშვება"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"მალსახმობის ჩართვის შემდეგ მარტივი წვდომის ფუნქციის გაშვება ხმის ორივე ღილაკზე 3 წამის განმავლობაში დაჭერით შეგეძლებათ."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"მალსახმობის ჩართვის შემდეგ, მარტივი წვდომის ფუნქციის გაშვება ხმის ორივე ღილაკზე 3 წამის განმავლობაში დაჭერით შეგეძლებათ."</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">"ეკრანის მასშტაბის ავტომატური განახლება"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"ეკრანის მასშტაბის განახლება ერთი აპიდან მეორეზე გადასვლისას"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"შეიძლება გავლენა იქონიოს მუშაობაზე"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"დაწკაპუნება მაჩვენებ.შეჩერებისას"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"დაყოვნება დაწკაპუნებამდე"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ჩართული"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"გამორთული"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"სწრაფ პარამეტრებში ჩვენება"</string>
@@ -2358,6 +2363,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"პაკეტების მართვა"</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>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"მობილური ქსელები"</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_metered_auto" msgid="1262028400911918865">"ავტომატური"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"ლიმიტირებული"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"ულიმიტო"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"ოპერატორის მიერ მონაცემთა აღრიცხვა შესაძლოა თქვენი მოწყობილობის აღრიცხვისგან განსხვავდებოდეს."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"გადაუდებელი ზარი"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"ზარზე დაბრუნება"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"ზარების მენეჯერი"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"გადაუდებელი განცხადებები"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"საგანგებო გაფრთხილებები"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"ქსელის ოპერატორები"</string>
     <string name="access_point_names" msgid="1381602020438634481">"წვდომის წერტილის სახელი (APN)"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"გაღრმავებული 4G LTE რეჟიმი"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"რჩეული SIM შემდეგისთვის:"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"შეკითხვა ყოველ ჯერზე"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"აუცილებელი არჩევანი"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"SIM-ბარათის არჩევანი"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"პარამეტრები"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">%d დამალული ერთეულის ჩვენება</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"აპის შეტყობინებები"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"შეტყობინების კატეგორია"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"მნიშვნელობის დონე"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"არჩევანის აპისთვის მინდობა"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"ხმის გამოყენების დაშვება"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"შეტყობინებების ჩვენების აღკვეთა"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ხმოვანი ან ვიზუალური შეფერხების გარეშე"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"ხმის გარეშე"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"ხმის გამოცემა"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"ხმის გამოცემა და ეკრანზე გამოჩენა"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"ეკრანზე გამოჩენა"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"დაბალი"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"საშუალო"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"მაღალი"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"სასწრაფო"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"ხმის გამოყენების დაშვება"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"შეტყობინებებისთვის ხმისა თუ ვიბრაციის გათიშვა და მიმდინარე ეკრანზე ანთების აკრძალვა."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"შეწყვეტის დაშვება"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"აპისთვის ხმოვანი სიგნალების გამოყენების, ვიბრაციის ჩართვის ან/და შეტყობინებათა ეკრანზე გამოტანის ნებართვის მინიჭება"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"დაბალი პრიორიტეტი"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"საშუალო პრიორიტეტი"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"მაღალი პრიორიტეტი"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip გამოსახულება გამოსახულებაში"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"ეკრანი ეკრანში"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"„ეკრანი ეკრანში“ რეჟიმის დაშვება"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"საშუალებას მისცემს ამ აპს, შექმნას „ეკრანი ეკრანში“ ტიპის ფანჯარა, როცა ის გახსნილია, ან აპიდან გასვლისას (მაგალითად, ვიდეოს ყურების გასაგრძელებლად). ეს ფანჯარა თქვენ მიერ გამოყენებული აპების ზემოდან გამოჩნდება."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"საშუალებას მისცემს ამ აპს, შექმნას „ეკრანი ეკრანში“ ტიპის ფანჯარა, როცა ის გახსნილია, ან აპიდან გასვლისას (მაგალითად, ვიდეოს ნახვის გასაგრძელებლად). ეს ფანჯარა თქვენ მიერ გამოყენებული აპების ზემოდან გამოჩნდება."</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>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"ფაილების გადატანა"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"ფოტოების გადატანა (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"მოწყობილობის MIDI-ს სახით გამოყენება"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS-ების სინქრონიზაცია"</string>
     <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>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"ღამის განათების განრიგის დაყენება"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"ეკრანის ქარვისფრად შეფერვა, რაც დაძინებაში დაგეხმარებათ"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"ღამის განათება ჩართულია"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"ეკრანს ახლა ქარვისფერი ელფერი აქვს. ეს დაძინებაში დაგეხმარებათ."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"შემოთავაზებები"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"ეკრანზე ცივი ფერების გამოყენება"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"ფერთა ცვლილების მისასადაგებლად, გამორთეთ ეკრანი"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"ტელეფონიის კონტროლიორთან დაკავშირებული ცვლილებების მისასადაგებლად, გადატვირთეთ მოწყობილობა"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"კამერის HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"კამერის HAL HDR+ ცვლილების მისასადაგებლად გადატვირთეთ მოწყობილობა"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"კამერის ლაზერული სენსორი"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"სისტემის ავტომატური განახლება"</string>
     <string name="usage" msgid="2977875522080448986">"მოხმარება"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"მობილური ინტერნეტის მოხმარება"</string>
@@ -3410,7 +3427,7 @@
     <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="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g>-ის განმავლობაში გამოყენებულია <xliff:g id="ID_1">%1$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">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"ამოშლა და გარდაქმნა"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager-ის სიხშირის შეზღუდვის გადაყენება"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager-ის სიხშირის შეზღუდვა გადაყენებულია"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"მართეთ შეტყობინებები ჩაკეტილ ეკრანზე"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"გააკონტროლეთ ჩაკეტილ ეკრანზე ნაჩვენები ინფორმაცია"</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="8483187649355540109">"მხარდაჭერა და მინიშნებები"</string>
@@ -3487,7 +3504,7 @@
     <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="2456198532288640046">"უხილავია სხვა მოწყობილობებისთვის"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"გამორთული"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"დაკავშირებულია <xliff:g id="ID_1">%1$s</xliff:g>-თან"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"დაკავშირებულია რამდენიმე მოწყობილობასთან"</string>
     <string name="demo_mode" msgid="2798762752209330277">"სისტემის UI-ს დემო-რეჟიმი"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"მყისიერი აპები"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"ბმულების აპებში გახსნა, მაშინაც კი, თუ ისინი დაინსტალირებული არ არის"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"მყისიერი აპები"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"მყისიერი აპების ანგარიში"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"მყისიერი აპების პარამეტრები"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"დაინსტალირებული აპები"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"თქვენს მეხსიერებას ახლა მეხსიერების მენეჯერი მართავს"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g>-ის ანგარიშები"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"მუდმივად ჩართული VPN ჩაირთო თქვენს პირად პროფილში"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"მუდმივად ჩართული VPN ჩაირთო თქვენს სამსახურის პროფილში"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"გლობალური HTTP-პროქსი დაყენებულია"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"სანდო სერტიფიკატები"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"სანდო სერტიფიკატები"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"სანდო სერტიფიკატები თქვენს პირად პროფილში"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"სანდო სერტიფიკატები თქვენს სამსახურის პროფილში"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">მინიმუმ <xliff:g id="COUNT_1">%d</xliff:g> CA სერტიფიკატი</item>
       <item quantity="one">მინიმუმ <xliff:g id="COUNT_0">%d</xliff:g> CA სერტიფიკატი</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"ოპერატორის უზრუნველყოფის ინფორმაცია"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ოპერატორის უზრუნველყოფის გაშვება"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"რა არის ახალი და გამორჩეული?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"გაეცანით ყველაზე პოპულარულ 5 ფუნქციას"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"ისარგებლეთ თქვენი ახალი ტელეფონის გაცნობითი ტურით"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ისარგებლეთ თქვენი ახალი ტაბლეტის გაცნობითი ტურით"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"ისარგებლეთ თქვენი ახალი მოწყობილობის გაცნობითი ტურით"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"ამ მოწყობილობაზე ეს ფუნქცია მიუწვდომელია"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS რეგისტრაციის სტატუსი"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"რეგისტრირებული"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"არარეგისტრირებული"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index faa67f5..5ef3880 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s хабарларыңызға кіруді қалайды. %2$s кірсін бе?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM картасына кіру сұрауы"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> сіздің SIM картаңызға кіруге рұқсат сұрайды. Ондай рұқсатты берсеңіз, байланыс барысында дерек тасымалы өшіріледі. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> құрылғысына рұқсат беру"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Басқа құрылғыларға <xliff:g id="DEVICE_NAME">^1</xliff:g> болып көрінеді"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Басқа құрылғыларға «<xliff:g id="DEVICE_NAME">^1</xliff:g>» ретінде көрінеді"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Құрылғыларыңыз"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Жаңа құрылғымен жұптастыру"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Күн және уақыт"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"Келесі"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Саусақ ізі өткізіп жіберілсін бе?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Саусақ ізін реттеу бір не екі минутты ғана алады. Егер мұны өткізіп жіберсеңіз, саусақ ізін параметрлерде кейінірек реттеуіңізге болады."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Экран құлпы өткізіп жіберілсін бе?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Құрылғыны қорғау функциялары қосылмайды. Планшет жоғалса, ұрланса не бастапқы күйіне қайтарылса, оны басқалардың пайдалануына тыйым сала алмайсыз."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Құрылғыны қорғау функциялары қосылмайды. Құрылғы жоғалса, ұрланса не бастапқы күйіне қайтарылса, оны басқалардың пайдалануына тыйым сала алмайсыз."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Құрылғыны қорғау функциялары қосылмайды. Телефон жоғалса, ұрланса не бастапқы күйіне қайтарылса, оны басқалардың пайдалануына тыйым сала алмайсыз."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Саусақ іздерінің максималды саны енгізілді"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Қосымша саусақ іздері енгізілмейді"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Барлық саусақ іздерін жою керек пе?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"\"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" жою"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Саусақ ізі жойылсын ба?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Телефон құлпын ашу, сатып алуларды авторизациялау немесе олармен қолданбаларға кіру үшін саусақ іздерін пайдалана алмайсыз"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Жұмыс профилінің құлпын ашу, сатып алуды авторизациялау немесе жұмыс қолданбаларына кіру үшін саусақ ізін пайдалану мүмкін болмайды"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Иә, жою"</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"Қауіпсіздік деңгейін арттыру үшін экранды құлыптаудың қосымша жолын орнатыңыз."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Қауіпсіздік деңгейін арттыру үшін экранды құлыптаудың қосымша жолын орнатыңыз."</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>
@@ -497,37 +502,37 @@
     <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_fingerprint" msgid="8212242533942400457">"Құрылғыны қорғау мүмкіндіктері өрнексіз жұмыс істемейді.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Құрылғыны қорғау мүмкіндіктері өрнексіз жұмыс істемейді.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сақталған саусақ іздері де осы құрылғыдан жойылады және олармен телефон құлпын ашу, сатып алуларды авторизациялау немесе қолданбаларға кіру мүмкін болмайды.\""</string>
+</xliff:g>Сақталған саусақ іздері де осы құрылғыдан жойылады және олармен телефон құлпын ашу, сатып алуларды авторизациялау немесе қолданбаларға кіру мүмкін болмайды."</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">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Құрылғыны қорғау мүмкіндіктері PIN кодынсыз жұмыс істемейді.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сақталған саусақ іздері де осы құрылғыдан жойылады және олармен телефон құлпын ашу, сатып алуларды авторизациялау немесе қолданбаларға кіру мүмкін болмайды.\""</string>
+</xliff:g>Сақталған саусақ іздері де осы құрылғыдан жойылады және олармен құрылғы құлпын ашу, сатып алуларды авторизациялау немесе қолданбаларға кіру мүмкін болмайды."</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Құрылғыны қорғау мүмкіндіктері құпия сөзсіз жұмыс істемейді.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сақталған саусақ іздері де осы құрылғыдан жойылады және олармен телефон құлпын ашу, сатып алуларды авторизациялау немесе қолданбаларға кіру мүмкін болмайды.\""</string>
+</xliff:g>Сақталған саусақ іздері де осы құрылғыдан жойылады және олармен телефон құлпын ашу, сатып алуларды авторизациялау немесе қолданбаларға кіру мүмкін болмайды."</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Құрылғыны қорғау мүмкіндіктері экран құлпынсыз жұмыс істемейді.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сақталған саусақ іздері де осы құрылғыдан жойылады және олармен телефон құлпын ашу, сатып алуларды авторизациялау немесе қолданбаларға кіру мүмкін болмайды.\""</string>
+</xliff:g>Сақталған саусақ іздері де осы құрылғыдан жойылады және олармен телефон құлпын ашу, сатып алуларды авторизациялау немесе қолданбаларға кіру мүмкін болмайды."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Профильді қорғау мүмкіндіктері өрнексіз жұмыс істемейді."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Профильді қорғау мүмкіндіктері өрнексіз жұмыс істемейді.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Профильді қорғау мүмкіндіктері өрнексіз жұмыс істемейді.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сақталған саусақ іздері де осы профильден жойылады және олармен профиль құлпын ашу, сатып алуларды авторизациялау немесе қолданбаларға кіру мүмкін болмайды.\""</string>
+</xliff:g>Сақталған саусақ іздері де осы профильден жойылады және олармен профиль құлпын ашу, сатып алуларды авторизациялау немесе қолданбаларға кіру мүмкін болмайды."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Профильді қорғау мүмкіндіктері PIN кодынсыз жұмыс істемейді."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Профильді қорғау мүмкіндіктері PIN кодынсыз жұмыс істемейді.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Профильді қорғау мүмкіндіктері PIN кодынсыз жұмыс істемейді.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сақталған саусақ іздері де осы профильден жойылады және олармен профиль құлпын ашу, сатып алуларды авторизациялау немесе қолданбаларға кіру мүмкін болмайды.\""</string>
+</xliff:g>Сақталған саусақ іздері де осы профильден жойылады және олармен профиль құлпын ашу, сатып алуларды авторизациялау немесе қолданбаларға кіру мүмкін болмайды."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Профильді қорғау мүмкіндіктері кілтсөзсіз жұмыс істемейді."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Профильді қорғау мүмкіндіктері кілтсөзсіз жұмыс істемейді.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Профильді қорғау мүмкіндіктері құпия сөзсіз жұмыс істемейді.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сақталған саусақ іздері де осы профильден жойылады және олармен профиль құлпын ашу, сатып алуларды авторизациялау немесе қолданбаларға кіру мүмкін болмайды.\""</string>
+</xliff:g>Сақталған саусақ іздері де осы профильден жойылады және олармен профиль құлпын ашу, сатып алуларды авторизациялау немесе қолданбаларға кіру мүмкін болмайды."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Профильді қорғау мүмкіндіктері экран құлпынсыз жұмыс істемейді."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Профильді қорғау мүмкіндіктері экран құлпынсыз жұмыс істемейді.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Профильді қорғау мүмкіндіктері экран құлпынсыз жұмыс істемейді.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сақталған саусақ іздері де осы профильден жойылады және олармен профиль құлпын ашу, сатып алуларды авторизациялау немесе қолданбаларға кіру мүмкін болмайды.\""</string>
+</xliff:g>Сақталған саусақ іздері де осы профильден жойылады және олармен профиль құлпын ашу, сатып алуларды авторизациялау немесе қолданбаларға кіру мүмкін болмайды."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Иә, алып тастау"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Бекітпе ашу кескінін өзгерту"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Бекітпесін ашу PIN кодын өзгерту"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Сандардың артатын, кемитін немесе қайталанатын ретіне рұқсат берілмейді"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Жарайды"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Бас тарту"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Тазалау"</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>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS қол жетімді"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS қол жетімді)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Желі құпия сөзін енгізіңіз"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Оператордың Wi‑Fi желісі"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> арқылы қосу"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Аймақ нақтылығын жақсарту және басқа мақсаттар үшін, <xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасы желі тексеруді қосуды қалайды, Wi-Fi өшіріліп тұрса да.\n\nЖелі тексергісі келетеін барлық қолданбаларға рұқсат берілсін бе?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Мұны өшіру үшін артылған мазмұндар мәзірінде «Кеңейтілген» тармағына өтіңіз."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Рұқсат беру"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Жалғау"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Желіге қосылу орындалмады"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Ұмыту"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Өзгерту"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Желіні жою орындалмады"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Сақтау"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Желіні сақтау орындалмады"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Жетілдірілген Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC мекенжайы"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP мекенжайы"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Желі ақпараты"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Қосалқы желі маскасы"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 мекенжайлары"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Шақыру өшірілсін бе?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g> қосылу шақыруынан бас тартуды қалайсыз ба?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Бұл топ ұмытылсын ба?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Жиналмалы Wi‑Fi хотспот"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi хотспоты"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Басқа құрылғылармен интернет не мазмұн бөлісіліп жатқан жоқ"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Планшеттің интернет байланысы хотспот арқылы бөлісілуде"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Телефонның интернет байланысы хотспот арқылы бөлісілуде"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Қолданба мазмұнды бөлісуде. Интернет байланысын бөлісу үшін хотспотты өшіріп, қайта қосыңыз"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi хотспотының атауы"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Хоспот атауы"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> қосылуда…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Басқа құрылғылар <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> хотспотына қосыла алады"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi құпия сөзі"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Хотспот құпия сөзі"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP диапазоны"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Басқа құрылғыларға Wi‑Fi желісін жасау үшін хотспотты пайдаланыңыз. Хотспот мобильдік деректер байланысы арқылы интернетпен қамтамасыз етеді. Қосымша мобильдік деректер ақысы алынуы мүмкін."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Қолданбалар мазмұнды маңайдағы құрылғылармен бөлісу үшін хоспот жасай алады."</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi қоңырау шалу қосулы кезде қалауыңызға және қайсы сигнал күштілігіне байланысты телефоныңыз қоңырауларды Wi-Fi желілері не жабдықтаушы желісі арқылы бағыттауы мүмкін. Бұл мүмкіндікті қосудан бұрын жабдықтаушыңыздың қатысты алымдары мен басқа мәліметтерді тексеріңіз."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Төтенше жағдайда пайдаланылатын мекенжайды жаңарту"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"WiFi көмегімен 911 нөміріне қоңырау шалсаңыз, төтенше жағдай қызметтері орныңыз ретінде пайдаланатын мекенжай"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"Wi-Fi көмегімен жедел қызметке қоңырау шалсаңыз, төтенше жағдай қызметтері орналасқан орныңыз ретінде пайдаланатын мекенжай"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Дыбыс"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Дыбыс қаттылығы"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Іздеу"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Іздеу параметрлері және тарих"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Нәтижелер жоқ"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Тарихты өшіру"</string>
     <string name="display_settings" msgid="7965901687241669598">"Дисплей"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Экранды автоматты бұру"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Жанды түстер"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Бастапқы APN параметрлерін қалпына келтіру."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Бастапқы параметрлеріне қайтару"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Бастапқы қол жетімділік нүктесі атауының параметрлерін қайта орнату аяқталды."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Бастапқы күйге қайтару"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Желі параметрлерін қалпына келтіру"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Опцияларды бастапқы күйіне қайтару"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Желіні, қолданбаны не құрылғыны бастапқы күйіне қайтаруға болады"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi, мобильдік деректер және Bluetooth параметрлерін бастапқы күйіне қайтару"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Мұның нәтижесінде барлық желі параметрлері бастапқы күйіне қайтарылады, соның ішінде:\n\n"<li>"Wi‑Fi"</li>\n<li>"мобильдік деректер"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Параметрлерді қалпына келтіру"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Барлық желі параметрлері қалпына келтірілсін бе? Бұл әрекетті кері қайтару мүмкін емес!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Қалпына келтіру қажет пе?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Бұл пайдаланушы желіні қалпына келтіре алмайды"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Желі параметрлері қалпына келтірілген"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Зауыттық деректерді қалпына келтіру"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> есептік жазба бастапқы күйге қайтарылады</item>
-      <item quantity="one">1 есептік жазба бастапқы күйге қайтарылады</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Ішкі жад және барлық деректер бастапқы күйге қайтарылады"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Барлық деректерді өшіру (зауыттық параметрлерді қайтару)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Бұл сіздің планшетіңіздің "<b>"ішкі жадынан"</b>" барлық дерекқорды өшіреді, келесі деректерді қоса:\n\n"<li>"Google есептік жазбаңыз"</li>\n<li>"Жүйе және қолданба дерекқоры және параметрлері"</li>\n<li>"Жүктелген қолданбалар"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Бұл телефонның "<b>"ішкі жадынан"</b>" барлық деректерді өшіреді:\n\n"<li>" Google есептік жазбаңызды"</li>\n<li>"Жүйе және қолданба дерекқоры мен параметрлерін"</li>\n<li>"Жүктелген қолданбаларды"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Сіз келесі есептік жазбаларға кірдіңіз:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Қауіпсіздік ақпараты"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Сіздің дерекқор байланысыңыз жоқ. Бұл ақпаратты қазір көру үшін, интернетке қосылған кез келген компьютерден %s тармағына кіріңіз."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Жүктелуде..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Құпия сөзді таңдау"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Экранды құлыптауды орнатыңыз"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Қауіпсіздік үшін құпия сөз орнатыңыз"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Саусақ ізін пайдалану үшін құпия сөз орнатыңыз"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Өрнек салу"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Саусақ ізін пайдалану үшін өрнекті орнатыңыз"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PIN таңдау"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Қауіпсіздік үшін PIN кодын орнатыңыз"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Саусақ ізін пайдалану үшін PIN кодын пайдаланыңыз"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Құпия сөзді растаңыз"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Құпия сөзді қайта енгізіңіз"</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_pin_header" msgid="7744513791910572550">"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>
@@ -1483,12 +1490,18 @@
     <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_strong_auth_required_device_pattern" msgid="530802132223800623">"Қосымша қауіпсіздік үшін құрылғыңыздың өрнегін пайдаланыңыз"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Қосымша қауіпсіздік үшін құрылғыңыздың PIN кодын енгізіңіз"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Қосымша қауіпсіздік үшін құрылғыңыздың құпия сөзін енгізіңіз"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Қосымша қауіпсіздік үшін жұмыс профилінің өрнегін пайдаланыңыз"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Қосымша қауіпсіздік үшін жұмыс профилінің PIN кодын енгізіңіз"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Қосымша қауіпсіздік үшін жұмыс профилінің құпия сөзін енгізіңіз"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Телефоныңыз зауыттық параметрлерге қайтарылды. Бұл телефонды пайдалану үшін алдыңғы өрнекті пайдалыныңыз."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Телефоныңыз зауыттық параметрлерге қайтарылды. Бұл телефонды пайдалану үшін алдыңғы PIN кодын пайдалыныңыз."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Телефоныңыз зауыттық параметрлерге қайтарылды. Бұл телефонды пайдалану үшін алдыңғы құпия сөзді пайдалыныңыз."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Өрнекті растау"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"PIN кодын растау"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Құпия сөзді растау"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Қате PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Қате құпия сөз"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Қате өрнек"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Виджетті жасақтап, кіруге рұқсат берілсін бе?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Виджетті жасақтаған соң, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> көрсетілген барлық дерекқорға кіру мүмкіндігіне ие болады."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> қолданбасына виджетті жасақтаған соң олардың дерекқорына кіруге әрқашан рұқсат беру"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>к <xliff:g id="HOURS">%2$d</xliff:g>с <xliff:g id="MINUTES">%3$d</xliff:g>м <xliff:g id="SECONDS">%4$d</xliff:g>с"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>с <xliff:g id="MINUTES">%2$d</xliff:g>м <xliff:g id="SECONDS">%3$d</xliff:g>с"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>м <xliff:g id="SECONDS">%2$d</xliff:g>с"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>с"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"Қолдану статистикасы"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Қолданыс статистикасы"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Келесі бойынша сұрыптау:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Экранды оқу құралдары, дисплей, интерактивті пайдалануды басқару элементтері"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Көру параметрлері"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Бұл құрылғыны қажеттіліктерге сай реттей аласыз. Бұл арнайы мүмкіндіктерді кейінірек \"Параметрлер\" тармағында өзгертуге болады."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Қаріп өлшемін үлкейту"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Қаріп өлшемін өзгерту"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Экранды оқу құралдары"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Аудиомазмұн және экранға шығатын мәтін"</string>
     <string name="display_category_title" msgid="685461049938269166">"Дисплей"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Масштабтау үшін"</b>" экранды 3 рет жылдам түртіңіз.\n"<ul><li>"Айналдыру үшін бірнеше саусақты пайдаланыңыз"</li>\n<li>"Масштабты реттеу үшін бірнеше саусақты бір-біріне жақындатыңыз"</li></ul>\n\n<b>"Уақытша масштабтау үшін"</b>" экранды 3 рет жылдам түртіңіз, сосын үшінші түрткен кезде саусақты ұстап тұрыңыз.\n"<ul><li>"Экранда саусақты жылжытыңыз"</li>\n<li>"Кішірейту үшін саусақты көтеріңіз"</li></ul>\n\n"Пернетақтада және шарлау тақтасында ұлғайту мүмкін емес."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Үлкейту мүмкіндігі қосулы кезде, жылдам үлкейту үшін экранның төменгі жағындағы \"Арнайы мүмкіндіктер\" түймесін пайдаланыңыз.\n\n"<b>"Масштабтау үшін"</b>" \"Арнайы мүмкіндіктер\" түймесін, кейін экранның кез келген жерін түртіңіз. \n"<ul><li>"Айналдыру үшін бірнеше саусағыңызбен сүйреңіз"</li>\n<li>"Масштабты реттеу үшін бірнеше саусағыңызды жақындатыңыз"</li></ul>\n\n<b>"Уақытша масштабтау үшін"</b>" \"Арнайы мүмкіндіктер\" түймесін түртіп, кейін экранның кез келген жерін басып тұрыңыз.\n"<ul><li>"Экранда саусақты жылжытыңыз"</li>\n<li>"Кішірейту үшін саусағыңызды көтеріңіз"</li></ul>\n\n"Пернетақтада және шарлау тақтасында ұлғайту мүмкін емес."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"\"Арнайы мүмкіндіктер\" <xliff:g id="SERVICE">%1$s</xliff:g> қызметіне орнатылды. Үлкейту функциясын пайдалану үшін \"Арнайы мүмкіндіктер\" түймесін басып тұрып, үлкейтуді таңдаңыз."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Арнайы мүмкіндіктерге жылдам өту"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Дыбыс деңгейі пернесінің төте жолы"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Таңбашамен байланыстырылған қызмет"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Құлып экранынан рұқсат ету"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Арнайы мүмкіндіктер функциясын пайдалану үшін төте жол қосулы кезде, дыбыс деңгейін реттейтін екі түймені де 3 секунд басып тұрыңыз."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Арнайы мүмкіндіктер функциясын пайдалану үшін төте жол қосулы кезде, дыбыс деңгейін реттейтін екі түймені де 3 секунд басып тұрыңыз."</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">"Экранды ұлғайтуды авто жаңарту"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Қолданба ауысуларындағы экран ұлғайту функциясын жаңарту"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Жұмыс өнімділігіне әсерін тигізуі мүмкін"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Меңзер тоқтағаннан кейін басу"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Басу алдындағы кешігу"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ҚОСУЛЫ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ӨШІРУЛІ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Жылдам параметрлер арқылы көрсету"</string>
@@ -2358,6 +2363,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Жоспарларды басқару"</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>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Ұялы желілер"</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_metered_auto" msgid="1262028400911918865">"Aвтоматты"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Өлшенетін"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Өлшенбейтін"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Оператордың деректер есебі құрылғыңыздан басқаша болуы мүмкін."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Төтенше қоңырау"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Қоңырауға оралу"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Қоңыраулар реттегіші"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Жедел таратылымдар"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Төтенше дабылдар"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Желі операторлары"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Кіру нүктесі атаулары"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Жақсартылған 4G LTE режимі"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Келесі үшін таңдаулы SIM"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Әр қоңырау үшін сұрау"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Таңдау қажет"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"SIM картасын таңдау"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Параметрлер"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">%d жасырын элементті көрсету</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Қолданба хабар-лары"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Хабарландыру санаты"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Маңыздылық"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Қолданба өзі шешеді"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Дыбысқа рұқсат ету"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Хабарландыруларды ешқашан көрсетпеу"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Дыбыссыз және визуалдық кедергісіз"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Дыбыссыз"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Дыбыстық сигнал беру"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Дыбыстық сигнал беру және экранға шығару"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Қалқымалы терезе"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Төмен"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Орташа"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Жоғары"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Шұғыл"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Дыбысқа рұқсат ету"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Дыбыс шығармау, дірілдетпеу немесе осы хабарландыруларды ағымдағы экрандағы көріністе көрсетпеу."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Хабарландыруларға рұқсат ету"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Қолданбаның дыбыс шығаруына, дірілдеуіне және/немесе экранда хабарландырулардың шығуына рұқсат беру"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Төмен маңыздылық"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Орташа маңыздылық"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Жоғары маңыздылық"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"сурет ішіндегі сурет"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Суреттегі сурет"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"\"Сурет ішіндегі сурет\" режиміне рұқсат беру"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Қолданба ашық болғанда не одан шыққанда (мысалы, бейнені көре беру үшін), бұл қолданбаға сурет ішіндегі сурет терезесін ашуға мүмкіндік береді. Бұл терезе пайдаланылып жатқан басқа қолданбалардың үстінен шығады."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Қолданба ашық болғанда не одан шыққанда (мысалы, бейнені көре беру үшін), бұл қолданбаға суреттегі сурет терезесін ашуға мүмкіндік береді. Бұл терезе пайдаланылып жатқан басқа қолданбалардың үстінен шығады."</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>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Файлдарды тасымалдау"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Суреттерді тасымалдау (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Құрылғыны MIDI ретінде пайдалану"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS көшірмесін көрсету"</string>
     <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>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"\"Түнгі жарық\" кестесін орнату"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Жылдам ұйықтап кету үшін экранға ашық сары реңк беріңіз"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Түнгі жарық режимі қосулы"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Экранға ашық сары реңк берілді. Бұл жылдам ұйықтап кетуіңізге көмектеседі."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Ұсыныстар"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Суығырақ дисплей түстерін пайдалану"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Түс өзгерісін қолдану үшін экранды өшіріңіз"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telephony Monitor функциясындағы өзгеріс күшіне енуі үшін, құрылғыны қайта жүктеңіз"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HAL HDR+ камера режимі"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"HAL HDR+ камера режимінің өзгерісі күшіне енуі үшін құрылғыны қайта жүктеңіз"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Камераның лазер сенсоры"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматты жүйе жаңартулары"</string>
     <string name="usage" msgid="2977875522080448986">"Трафик"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Мобильдік деректер трафигі"</string>
@@ -3410,7 +3427,7 @@
     <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="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g> <xliff:g id="ID_1">%1$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">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Өшіру және түрлендіру"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager жылдамдық шектеуін бастапқы күйіне қайтару"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager жылдамдық шектеуі бастапқы күйіне қайтарылды"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Құлыпталған экран хабарландыруларын бақылау"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Құлып экранында ақпаратты басқарыңыз"</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="8483187649355540109">"Қолдау және кеңестер"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Орнатылған қолданбалардың ешбірі Premium SMS мүмкіндігін пайдалануға рұқсат сұрамады."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium SMS мүмкіндігі үшін оператор тарифтеріне сәйкес ақы алынуы мүмкін. Егер қолданбаға рұқсат берсеңіз, сол қолданба арқылы премиум SMS жібере аласыз.Premium SMS мүмкіндігі үшін ақша алынуы мүмкін және операторыңыз арқылы жасалған төлем бойынша қосылады. Егер қолданбаға рұқсат берсеңіз, сол қолданба арқылы премиум SMS жібере аласыз."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Premium SMS пайдалану"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Басқа құрылғыларға көрінбейді"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Өшірулі"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> құрылғысына қосылған"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Түрлі құрылғыларға қосылған"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Жүйе интерфейсінің демо режимі"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Instant apps"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Сілтемелерді қолданбалардан (олар орнатылмаған болса да) ашу"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Instant apps"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Instant apps есептік жазбасы"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Instant Apps параметрлері"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Орнатылған қолданбалар"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Құрылғы жадын енді жад менеджері басқарады"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> есептік жазбалары"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Әрқашан қосулы VPN жеке профильде қосылды"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Әрқашан қосулы VPN жұмыс профилінде қосылды"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Ғаламдық HTTP прокси-серверлер жиыны"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Сенімді растау деректері"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Сенімді тіркелу деректері"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Жеке профильдегі сенімді тіркелу деректері"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Жұмыс профиліндегі сенімді тіркелу деректері"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Ең кемі <xliff:g id="COUNT_1">%d</xliff:g> CA сертификаты</item>
       <item quantity="one">Ең кемі <xliff:g id="COUNT_0">%d</xliff:g> CA сертификаты</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Операторды инициализациялау туралы ақпарат"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Операторды инциализациялауды іске қосу"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Қандай қызық жаңа мүмкіндік бар?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Үздік 5 функцияны қараңыз"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Жаңа телефонның ішін аралаңыз"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Жаңа планшеттің ішін аралаңыз"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Жаңа құрылғының ішін аралаңыз"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Бұл мүмкіндік құрылғыда жоқ"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS тіркеу күйі"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Тіркелген"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Тіркелмеген"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 6ee511d..0e08684 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ចង់​ចូល​ដំណើរការ​សារ​របស់​អ្នក។ សូម​ផ្ដល់​ការ​ចូល​ដំណើរការ​ទៅ​កាន់​%2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"សំណើចូលដំណើរការស៊ីម"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ចង់ចូលដំណើរការស៊ីមកាតរបស់អ្នក។ ការផ្តល់ការអនុញ្ញាតចូលដំណើរការស៊ីមកាតនឹងបិទដំណើរការតភ្ជាប់ទិន្នន័យនៅលើឧបករណ៍របស់អ្នកក្នុងអំឡុងពេលធ្វើការតភ្ជាប់។ អនុញ្ញាតឲ្យចូលដំណើរការ <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"អាច​មើល​ឃើញ​ជា <xliff:g id="DEVICE_NAME">^1</xliff:g> ចំពោះ​ឧបករណ៍ផ្សេង"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"អាច​មើលឃើញជា <xliff:g id="DEVICE_NAME">^1</xliff:g> ចំពោះ​ឧបករណ៍ផ្សេងទៀត"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ឧបករណ៍របស់អ្នក"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ផ្គូផ្គង​ឧបករណ៍ថ្មី"</string>
     <string name="date_and_time" msgid="9062980487860757694">"កាលបរិច្ឆេទ និង ម៉ោង"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"បន្ទាប់"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"រំលង​ស្នាមមេដៃឬ?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"ការរៀបចំស្នាមម្រាមដៃ​ចំណាយពេលត្រឹមតែមួយទៅពីរនាទីប៉ុណ្ណោះ។ ប្រសិនបើ​អ្នករំលងវា អ្នកអាច​បញ្ចូលស្នាមម្រាមដៃ​របស់អ្នក​ក្នុងការកំណត់​នៅពេលក្រោយបាន។"</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"រំលង​ការចាក់សោអេក្រង់ឬ?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"មុខងារការពារឧបករណ៍នឹងមិនត្រូវបានបើកទេ។ អ្នកនឹងមិនអាច​រារាំង​អ្នកផ្សេង​មិនឲ្យប្រើប្រាស់ថេប្លេតនេះបានទេ ប្រសិនបើវាបាត់ ត្រូវបានគេលួច ឬកំណត់ឡើងវិញ។"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"មុខងារការពារឧបករណ៍នឹងមិនត្រូវបានបើកទេ។ អ្នកនឹងមិនអាច​រារាំង​អ្នកផ្សេង​មិនឲ្យប្រើប្រាស់ឧបករណ៍នេះបានទេ ប្រសិនបើវាបាត់ ត្រូវបានគេលួច ឬកំណត់ឡើងវិញ។"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"មុខងារការពារឧបករណ៍នឹងមិនត្រូវបានបើកទេ។ អ្នកនឹងមិនអាច​រារាំង​អ្នកផ្សេង​មិនឲ្យប្រើប្រាស់ទូរសព្ទនេះបានទេ ប្រសិនបើវាបាត់ ត្រូវបានគេលួច ឬកំណត់ឡើងវិញ។"</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"អ្នក​បាន​បញ្ចូល​ស្នាម​ម្រាមដៃ​ដល់​ចំនួន​អតិបរមា​ហើយ"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"មិន​អាច​បញ្ចូល​ស្នាម​ម្រាមដៃ​បាន​ទៀត​ទេ"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"យកស្នាមម្រាមដៃទាំងអស់ចេញ?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"លុប \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"តើ​អ្នកចង់លុប​ស្នាមម្រាមដៃ​នេះ​ដែរឬទេ?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"អ្នក​នឹង​មិនអាច​ប្រើ​ស្នាមម្រាម​ដៃ​របស់អ្នក ដើម្បី​ដោះសោ​ទូរសព្ទ​របស់អ្នក ផ្តល់សិទ្ធិ​ក្នុង​ការ​ទិញ ឬ​ចូល​កម្មវិធី​ដោយ​ប្រើ​ពួក​វា​បាន​ទេ"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"អ្នក​នឹង​មិនអាច​ប្រើ​ស្នាមម្រាម​ដៃ​របស់អ្នក​ ដើម្បី​ដោះសោ​កម្រងព័ត៌មាន​ការងារ​របស់អ្នក ផ្តល់សិទ្ធិ​ក្នុង​ការ​ទិញ ឬ​ចូល​កម្មវិធីការងារបានទេ"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"បាទ/ចាស យកចេញ"</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"ដើម្បីទទួលបានសុវត្ថិភាពបន្ថែម សូមរៀបចំការចាក់សោអេក្រង់បម្រុង។"</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"ដើម្បី​ទទួលបាន​សុវត្ថិភាព​បន្ថែម សូម​រៀបចំ​ការចាក់​សោអេក្រង់​បម្រុងទុក។"</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>
@@ -497,37 +502,37 @@
     <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_fingerprint" msgid="8212242533942400457">"លក្ខណៈពិសេសការពារឧបករណ៍នឹងមិនដំណើរការទេបើគ្មានលំនាំរបស់អ្នក។<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"មុខងារ​ការពារ​ឧបករណ៍​នឹងមិនដំណើរការ​ដោយគ្មាន​លំនាំ​របស់អ្នក​ទេ។<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ស្នាមម្រាមដៃដែលបានរក្សាទុករបស់អ្នកក៏នឹងត្រូវយកចេញពីឧបករណ៍នេះដែរ ហើយអ្នកនឹងមិនអាចដោះសោទូរស័ព្ទរបស់អ្នក ផ្តល់សិទ្ធិក្នុងការទិញ ឬចូលកម្មវិធីដោយប្រើស្នាមម្រាមដៃទាំងនេះទេ។\""</string>
+</xliff:g>ស្នាមម្រាមដៃ​របស់អ្នក​ដែលបាន​រក្សាទុក​ក៏នឹង​ត្រូវលុបចេញ​ពី​ឧបករណ៍​នេះដែរ ហើយ​អ្នកនឹង​មិនអាច​ដោះសោ​ទូរសព្ទ​របស់អ្នក ផ្តល់សិទ្ធិ​សម្រាប់​ការទិញ ឬ​ចូលកម្មវិធី​ដោយប្រើ​ស្នាមម្រាមដៃ​ទាំងនេះ​បានទេ។"</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">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"មុខងារ​ការពារ​ឧបករណ៍​នឹងមិន​ដំណើរការ​ដោយគ្មាន​កូដ PIN របស់អ្នក​ទេ។<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ស្នាមម្រាមដៃដែលបានរក្សាទុករបស់អ្នកក៏នឹងត្រូវយកចេញពីឧបករណ៍នេះដែរ ហើយអ្នកនឹងមិនអាចដោះសោទូរស័ព្ទរបស់អ្នក ផ្តល់សិទ្ធិក្នុងការទិញ ឬចូលកម្មវិធីដោយប្រើស្នាមម្រាមដៃទាំងនេះទេ។\""</string>
+</xliff:g>ស្នាមម្រាមដៃ​របស់អ្នក​ដែលបាន​រក្សាទុក​ក៏នឹង​ត្រូវលុបចេញ​ពីឧបករណ៍​នេះដែរ ហើយអ្នក​នឹងមិន​អាចដោះសោ​ទូរសព្ទ​របស់អ្នក ផ្តល់សិទ្ធិ​សម្រាប់ការ​ទិញ ឬចូល​កម្មវិធី​ដោយប្រើ​ស្នាមម្រាមដៃ​ទាំងនេះ​បានទេ។"</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"មុខងារ​ការពារ​ឧបករណ៍​នឹងមិន​ដំណើរការ​ដោយគ្មាន​ពាក្យសម្ងាត់​របស់អ្នកទេ។<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ស្នាមម្រាមដៃដែលបានរក្សាទុករបស់អ្នកក៏នឹងត្រូវយកចេញពីឧបករណ៍នេះដែរ ហើយអ្នកនឹងមិនអាចដោះសោទូរស័ព្ទរបស់អ្នក ផ្តល់សិទ្ធិក្នុងការទិញ ឬចូលកម្មវិធីដោយប្រើស្នាមម្រាមដៃទាំងនេះទេ។\""</string>
+</xliff:g>ស្នាមម្រាមដៃ​របស់អ្នក​ដែលបាន​រក្សាទុកក៏​នឹងត្រូវ​លុបចេញ​ពីឧបករណ៍​នេះដែរ ហើយអ្នក​នឹងមិន​អាចដោះសោ​ទូរសព្ទ​របស់អ្នក ផ្តល់សិទ្ធិ​សម្រាប់ការ​ទិញ ឬ​ចូលកម្មវិធី​ដោយ​ប្រើស្នាម​ម្រាមដៃ​ទាំងនេះ​បានទេ។"</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"មុខងារ​ការពារ​ឧបករណ៍​នឹងមិន​ដំណើរការ​ដោយគ្មាន​ការចាក់សោ​អេក្រង់របស់​អ្នកទេ។<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ស្នាមម្រាមដៃដែលបានរក្សាទុករបស់អ្នកក៏នឹងត្រូវយកចេញពីឧបករណ៍នេះដែរ ហើយអ្នកនឹងមិនអាចដោះសោទូរស័ព្ទរបស់អ្នក ផ្តល់សិទ្ធិក្នុងការទិញ ឬចូលកម្មវិធីដោយប្រើស្នាមម្រាមដៃទាំងនេះទេ។\""</string>
+</xliff:g>ស្នាមម្រាមដៃ​របស់អ្នក​ដែលបាន​រក្សាទុក​ក៏នឹង​ត្រូវលុប​ចេញពី​ឧបករណ៍​នេះដែរ ហើយអ្នក​នឹងមិនអាច​ដោះសោ​ទូរសព្ទ​របស់អ្នក ផ្តល់សិទ្ធិ​សម្រាប់​ការទិញ ឬចូល​កម្មវិធី​ដោយប្រើ​ស្នាមម្រាមដៃ​ទាំងនេះ​បានទេ។"</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"លក្ខណៈពិសេសការពារប្រវត្តិរូបនឹងមិនដំណើរការទេបើគ្មានលំនាំរបស់អ្នក។"</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"លក្ខណៈពិសេសការពារប្រវត្តិរូបនឹងមិនដំណើរការទេបើគ្មានលំនាំរបស់អ្នក។<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"មុខងារ​ការពារ​កម្រងព័ត៌មាន​នឹងមិន​ដំណើរការ​ដោយគ្មាន​លំនាំ​របស់អ្នកទេ។<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ស្នាមម្រាមដៃដែលបានរក្សាទុករបស់អ្នកក៏នឹងត្រូវយកចេញពីប្រវត្តិរូបនេះដែរ ហើយអ្នកនឹងមិនអាចដោះសោប្រវត្តិរូបរបស់អ្នក ផ្តល់សិទ្ធិក្នុងការទិញ ឬចូលកម្មវិធីដោយប្រើស្នាមម្រាមដៃទាំងនេះបានទេ។\""</string>
+</xliff:g>ស្នាមម្រាមដៃ​របស់អ្នក​ដែលបាន​រក្សាទុក​ក៏នឹង​ត្រូវលុបចេញ​ពីកម្រងព័ត៌មាន​នេះដែរ ហើយអ្នក​នឹង​មិនអាច​ដោះសោ​កម្រងព័ត៌មាន​របស់អ្នក ផ្តល់សិទ្ធិ​សម្រាប់​ការ​ទិញ ឬចូល​កម្មវិធី​ដោយប្រើ​ស្នាមម្រាមដៃ​ទាំងនេះ​បានទេ។"</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"លក្ខណៈពិសេសការពារប្រវត្តិរូបនឹងមិនដំណើរការទេបើគ្មានកូដ PIN របស់អ្នក។"</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"លក្ខណៈពិសេសការពារប្រវត្តិរូបនឹងមិនដំណើរការទេបើគ្មានកូដ PIN របស់អ្នក។<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"មុខងារ​ការពារ​កម្រងព័ត៌មាន​នឹងមិន​ដំណើរការ​ដោយគ្មាន​កូដ PIN របស់អ្នកទេ។<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ស្នាមម្រាមដៃដែលបានរក្សាទុករបស់អ្នកក៏នឹងត្រូវយកចេញពីប្រវត្តិរូបនេះដែរ ហើយអ្នកនឹងមិនអាចដោះសោប្រវត្តិរូបរបស់អ្នក ផ្តល់សិទ្ធិក្នុងការទិញ ឬចូលកម្មវិធីដោយប្រើស្នាមម្រាមដៃទាំងនេះបានទេ។\""</string>
+</xliff:g>ស្នាមម្រាមដៃ​របស់អ្នក​ដែលបាន​រក្សាទុក​ក៏នឹងត្រូវ​លុបចេញ​ពីកម្រង​ព័ត៌មាន​នេះដែរ ហើយអ្នក​នឹងមិនអាច​ដោះសោ​កម្រងព័ត៌មាន​របស់អ្នក ផ្តល់សិទ្ធិ​សម្រាប់ការ​ទិញ ឬចូល​កម្មវិធី​ដោយប្រើ​ស្នាមម្រាមដៃ​ទាំងនេះ​បានទេ។"</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"លក្ខណៈពិសេសការពារប្រវត្តិរូបនឹងមិនដំណើរការទេបើគ្មានពាក្យសម្ងាត់របស់អ្នក។"</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"លក្ខណៈពិសេសការពារប្រវត្តិរូបនឹងមិនដំណើរការទេបើគ្មានពាក្យសម្ងាត់របស់អ្នក។<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"មុខងារ​ការពារ​កម្រងព័ត៌មាន​នឹងមិន​ដំណើរការ​ដោយគ្មាន​ពាក្យសម្ងាត់​របស់អ្នក​ទេ។<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ស្នាមម្រាមដៃដែលបានរក្សាទុករបស់អ្នកក៏នឹងត្រូវយកចេញពីប្រវត្តិរូបនេះដែរ ហើយអ្នកនឹងមិនអាចដោះសោប្រវត្តិរូបរបស់អ្នក ផ្តល់សិទ្ធិក្នុងការទិញ ឬចូលកម្មវិធីដោយប្រើស្នាមម្រាមដៃទាំងនេះបានទេ។\""</string>
+</xliff:g>ស្នាមម្រាមដៃ​របស់អ្នក​ដែលបាន​រក្សាទុក​ក៏នឹង​ត្រូវលុបចេញពី​កម្រងព័ត៌មាន​នេះដែរ ហើយអ្នក​នឹងមិន​អាចដោះសោ​កម្រងព័ត៌មានរបស់អ្នក ផ្តល់សិទ្ធិ​សម្រាប់ការ​ទិញ ឬ​ចូលកម្មវិធី​ដោយប្រើ​ស្នាមម្រាមដៃ​ទាំងនេះ​បានទេ។"</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"លក្ខណៈពិសេសការពារប្រវត្តិរូបនឹងមិនដំណើរការទេបើគ្មានការចាក់សោអេក្រង់របស់អ្នក។"</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"លក្ខណៈពិសេសការពារប្រវត្តិរូបនឹងមិនដំណើរការទេបើគ្មានការចាក់សោអេក្រង់របស់អ្នក។<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"មុខងារ​ការពារ​កម្រងព័ត៌មាន​នឹងមិន​ដំណើរការ​ដោយគ្មាន​ការចាក់​សោអេក្រង់​របស់អ្នក​ទេ។<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ស្នាមម្រាមដៃដែលបានរក្សាទុករបស់អ្នកក៏នឹងត្រូវយកចេញពីប្រវត្តិរូបនេះដែរ ហើយអ្នកនឹងមិនអាចដោះសោប្រវត្តិរូបរបស់អ្នក ផ្តល់សិទ្ធិក្នុងការទិញ ឬចូលកម្មវិធីដោយប្រើស្នាមម្រាមដៃទាំងនេះបានទេ។\""</string>
+</xliff:g>ស្នាមម្រាមដៃ​របស់អ្នក​ដែលបាន​រក្សាទុក​ក៏នឹង​ត្រូវលុប​ចេញពី​កម្រង​ព័ត៌មាន​នេះដែរ ហើយអ្នក​នឹងមិន​អាចដោះសោ​កម្រងព័ត៌មានរបស់អ្នក ផ្តល់សិទ្ធិ​សម្រាប់ការ​ទិញ ឬចូល​កម្មវិធី​ដោយប្រើ​ស្នាមម្រាមដៃ​ទាំងនេះ​បានទេ។"</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"បាទ/ចាស យកចេញ"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"ប្ដូរ​លំនាំ​ដោះ​សោ"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ប្ដូរ​កូដ​ PIN ដោះ​សោ"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"មិន​អនុញ្ញាត​ឲ្យ​មានលំដាប់ឡើង ចុះ ឬច្រំដែលទេ"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"យល់​ព្រម​"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"បោះ​បង់​"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"លុប"</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>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS អាច​ប្រើ​បាន"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (មាន WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"បញ្ចូល​ពាក្យ​សម្ងាត់​បណ្ដាញ​របស់​អ្នក"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"បណ្ដាញ Wi‑Fi នៃក្រុមហ៊ុន​បម្រើសេវាទូរសព្ទ"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"ភ្ជាប់តាមរយៈ <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ដើម្បី​បង្កើន​ភាព​ត្រឹមត្រូវ​ទីតាំង និង​សម្រាប់​គោល​បំណង​ផ្សេងៗ <xliff:g id="APP_NAME">%1$s</xliff:g> ចង់​បើក​ការ​វិភាគ រក​បណ្ដាញ ទោះ​បី​ជា​បិទ វ៉ាយហ្វាយ ក៏​ដោយ។\n\nអនុញ្ញាត​សម្រាប់​កម្មវិធី​ទាំងអស់​ដែល​អ្នក​ចង់​វិភាគ​រក?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ដើម្បី​បិទ, ចូល​ទៅ​កាន់​កម្រិត​ខ្ពស់​នៅ​ក្នុង​ម៉ឺនុយ​លើស​ចំណុះ។"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"អនុញ្ញាត"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"តភ្ជាប់"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"បាន​បរាជ័យ​ក្នុង​ការ​តភ្ជាប់​បណ្ដាញ"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"បំភ្លេច"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"កែសម្រួល"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"បាន​បរាជ័យ​ក្នុង​បំភ្លេច​បណ្ដាញ"</string>
     <string name="wifi_save" msgid="3331121567988522826">"រក្សាទុក"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"បាន​បរាជ័យ​ក្នុង​ការ​រក្សាទុក​បណ្ដាញ"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"វ៉ាយហ្វាយ​កម្រិត​ខ្ពស់"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"អាសយដ្ឋាន MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"អាសយដ្ឋាន IP"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"ព័ត៌មាន​អំពី​បណ្ដាញ"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"របាំងបណ្តាញរង"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"អាសយដ្ឋាន IPv6"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"បោះបង់​ការ​អញ្ជើញ?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"តើ​អ្នក​ចង់​បោះបង់​ការ​អញ្ជើញ​ឲ្យ​តភ្ជាប់​ជា​មួយ <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"បំភ្លេច​ក្រុម​នេះ?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Wi-Fi ហតស្ប៉ត​ចល័ត"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"ហតស្ប៉ត Wi-Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"មិនកំពុងចែករំលែកអ៊ីនធឺណិត ឬមាតិកាជាមួយឧបករណ៍ផ្សេងទៀតទេ"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"កំពុងចែករំលែកការតភ្ជាប់អ៊ីនធឺណិតរបស់ថេប្លេតនេះតាមរយៈហតស្ប៉ត"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"កំពុងចែករំលែកការតភ្ជាប់អ៊ីនធឺណិតរបស់ទូរសព្ទនេះតាមរយៈហតស្ប៉ត"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"កម្មវិធីកំពុងចែករំលែកមាតិកា។ ដើម្បីចែករំលែកការតភ្ជាប់អ៊ីនធឺណិត សូមបិទហតស្ប៉ត បន្ទាប់មកបើកវាវិញ"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"ឈ្មោះ Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"ឈ្មោះ​ហតស្ប៉ត"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"កំពុងបើក <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"ឧបករណ៍​ផ្សេងទៀត​អាចភ្ជាប់​ជាមួយ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"ពាក្យសម្ងាត់ Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"ពាក្យសម្ងាត់​ហតស្ប៉ត"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP Band"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"ប្រើហតស្ប៉តដើម្បីបង្កើតបណ្តាញ Wi‑Fi សម្រាប់ឧបករណ៍ផ្សេងទៀតរបស់អ្នក។ ហតស្ប៉តផ្តល់ជូនអ៊ីនធឺណិតដោយប្រើការ​តភ្ជាប់​ទិន្នន័យ​ចល័តរបស់អ្នក។ អាចនឹងគិតប្រាក់លើទិន្នន័យទូរសព្ទចល័តបន្ថែម។"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"កម្មវិធីអាចបង្កើតហតស្ប៉ត ដើម្បីចែករំលែកមាតិកាជាមួយឧបករណ៍ដែលនៅជិត។"</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"នៅពេលការហៅតាម Wi-Fi បានបើក ទូរស័ព្ទរបស់អ្នកអាចធ្វើការហៅចេញតាមរយៈបណ្តាញ Wi-Fi ឬបណ្តាញរបស់ក្រុមហ៊ុនរបស់អ្នក ដោយផ្អែកលើចំណូលចិត្តរបស់អ្នក និងថាតើ signal ណាមួយខ្លាំងជាង។ មុនពេលបើកលក្ខណៈពិសេសនេះ សូមត្រួតពិនិត្យជាមួយក្រុមហ៊ុនរបស់អ្នកពាក់ព័ន្ធនឹងតម្លៃ និងព័ត៌មានលម្អិតផ្សេងទៀត។"</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"អាប់ដេតអាសយដ្ឋានសង្គ្រោះបន្ទាន់"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"ប្រសិនបើអ្នកធ្វើការហៅទៅ 911 ដោយប្រើ WiFi នោះអាសយដ្ឋានដែលប្រើដោយសេវាកម្មសង្គ្រោះបន្ទាន់នឹងយកធ្វើជាទីតាំងរបស់អ្នក"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"ប្រសិនបើអ្នកហៅទូរសព្ទ​សង្គ្រោះបន្ទាន់ដោយប្រើ Wi‑Fi នោះអាសយដ្ឋានដែលប្រើដោយសេវាកម្មសង្រោ្គះបន្ទាន់​គឺជាទីតាំងរបស់អ្នក"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"បង្ហាញ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"សំឡេង"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"កម្រិត​សំឡេង"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"ស្វែងរក"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"គ្រប់គ្រង​ប្រវត្តិ និង​ការ​កំណត់​ស្វែងរក"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"មិនមានលទ្ធផលទេ"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"សម្អាត​ប្រវត្តិ"</string>
     <string name="display_settings" msgid="7965901687241669598">"បង្ហាញ"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"បង្វិល​អេក្រង់​ស្វ័យប្រវត្តិ"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"ពណ៌ស្រស់"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"ស្ដារ​ការ​កំណត់ APN លំនាំដើម​ឡើងវិញ។"</string>
     <string name="menu_restore" msgid="8260067415075573273">"កំណត់​ទៅ​លំនាំដើម​ឡើងវិញ"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"បាន​បញ្ចប់​ការ​កំណត់​នៃ​ការកំណត់​ APN លំនាំដើម។"</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"កំណត់​ឡើងវិញ"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"បានកំណត់ការកំណត់បណ្តាញឡើងវិញ"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"ជម្រើសដែលបានកំណត់ឡើងវិញ"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"បណ្ដាញ កម្មវិធី ឬ​ឧបករណ៍ដែលអាច​កំណត់​ឡើងវិញបាន"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"កំណត់ Wi-Fi ឧបករណ៍ចល័ត និងប៊្លូធូសឡើងវិញ"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"វា​នឹង​កំណត់​ការកំណត់​បណ្តាញ​ទាំងអស់​ឡើងវិញ រួម​មាន៖\n\n"<li>"Wi‑Fi"</li>\n<li>"ទិន្នន័យ​ចល័ត"</li>\n<li>"ប៊្លូធូស"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"កំណត់ការកំណត់ឡើងវិញ"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"កំណត់ការកំណត់បណ្តាញទាំងអស់ឡើងវិញ? អ្នកមិនអាចធ្វើសកម្មភាពនេះវិញបានទេ!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"កំណត់ឡើងវិញ?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"ការកំណត់បណ្តាញឡើងវិញមិនមានសម្រាប់អ្នកប្រើនេះទេ"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"បានកំណត់ការកំណត់បណ្តាញឡើងវិញ"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"កំណត់​ទិន្នន័យ​ដូច​ចេញពី​រោងចក្រ"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other">គណនី <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> នឹងត្រូវបានកំណត់ឡើងវិញ</item>
-      <item quantity="one">គណនី 1 នឹងត្រូវបានកំណត់ឡើងវិញ</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"ទំហំផ្ទុកផ្នែកខាងក្នុង និងទិន្នន័យទាំងអស់នឹងត្រូវបានកំណត់ឡើងវិញ"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"លុបទិន្នន័យទាំងអស់ (កំណត់ឡើងវិញដូចថ្មី)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"វា​នឹង​លុប​ទិន្នន័យ​ពី​ "<b>"ឧបករណ៍​ផ្ទុក​ខាង​ក្នុង"</b>"នៃ​កុំព្យូទ័រ​បន្ទះ​របស់​អ្នក រួម​មាន៖\n\n"<li>"គណនី Google របស់​អ្នក"</li>\n<li>"ការកំណត់ និង​ទិន្នន័យ​កម្មវិធី និង​ប្រព័ន្ធ"</li>\n<li>"កម្មវិធី​បាន​ទាញ​យក"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"វា​នឹង​លុប​ទិន្នន័យ​ទាំងអស់​ពី​ "<b>"ទំហំផ្ទុក​ខាង​ក្នុង"</b>"នៃ​ទូរសព្ទ​របស់​អ្នក​ រួមមាន៖\n\n"<li>"គណនី Google របស់​អ្នក"</li>\n<li>"ការ​កំណត់​ និង​ទិន្នន័យ​ប្រព័ន្ធ ព្រម​ទាំង​កម្មវិធី"</li>\n<li>"កម្មវិធី​បាន​ទាញ​យក"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"បច្ចុប្បន្ន​ អ្នក​បាន​ចូល​គណនី​ដូច​ខាង​ក្រោម៖ \n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"ព័ត៌មាន​សុវត្ថិភាព"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"អ្នក​មិន​មាន​ការ​តភ្ជាប់​ទិន្នន័យ។ ដើម្បី​មើល​ព័ត៌មាន​នេះ​ឥឡូវ ចូល​ទៅ %s ពី​កុំព្យូទ័រ​ដែល​បាន​ភ្ជាប់​អ៊ីនធឺណិត​ណា​មួយ។"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"កំពុង​ផ្ទុក..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"ជ្រើសរើស​ពាក្យ​សម្ងាត់​របស់​អ្នក"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"កំណត់​ការចាក់​សោអេក្រង់"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"ដើម្បី​ទទួលបាន​សុវត្ថិភាព សូម​កំណត់​ពាក្យសម្ងាត់"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"ដើម្បី​ប្រើប្រាស់​ស្នាម​ម្រាមដៃ សូម​កំណត់​ពាក្យសម្ងាត់"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"ជ្រើស​លំនាំ​របស់​អ្នក"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ដើម្បី​ប្រើស្នាម​ម្រាមដៃ សូម​កំណត់​លំនាំ"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"ជ្រើសរើស​​​កូដ PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"ដើម្បី​ទទួលបាន​សុវត្ថិភាព សូម​កំណត់​កូដ PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"ដើម្បី​ប្រើប្រាស់​ស្នាម​ម្រាមដៃ សូម​កំណត់​កូដ PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"បញ្ជក់​ពាក្យ​សម្ងាត់​របស់​អ្នក"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"បញ្ចូល​ពាក្យ​សម្ងាត់​របស់​អ្នក​ម្តងទៀត"</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_pin_header" msgid="7744513791910572550">"បញ្ចូល​កូដ PIN របស់អ្នក​ម្តងទៀត"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"ពាក្យសម្ងាត់​មិន​ដូចគ្នា"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"កូដ PINs មិន​ដូច​គ្នា"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"ជម្រើស​ដោះ​សោ"</string>
@@ -1483,12 +1490,18 @@
     <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_strong_auth_required_device_pattern" msgid="530802132223800623">"ដើម្បី​ទទួលបាន​សុវត្ថិភាព​បន្ថែម សូម​ប្រើប្រាស់​លំនាំ​ឧបករណ៍​របស់អ្នក"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"ដើម្បី​ទទួលបាន​សុវត្ថិភាព​បន្ថែម សូម​បញ្ចូល​កូដ PIN ឧបករណ៍​របស់អ្នក"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"ដើម្បី​ទទួលបាន​សុវត្ថិភាព​បន្ថែម សូម​បញ្ចូល​ពាក្យសម្ងាត់​ឧបករណ៍​របស់អ្នក"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"ដើម្បី​ទទួលបាន​សុវត្ថិភាព​បន្ថែម សូម​ប្រើប្រាស់​លំនាំកម្រង​ព័ត៌មាន​ការងារ​របស់អ្នក"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"ដើម្បី​ទទួលបាន​សុវត្ថិភាព​បន្ថែម សូម​បញ្ចូលកូដ PIN កម្រង​ព័ត៌មាន​ការងារ​របស់អ្នក"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"ដើម្បី​ទទួលបាន​សុវត្ថិភាព​បន្ថែម សូមបញ្ចូល​ពាក្យសម្ងាត់​កម្រង​ព័ត៌មានការងារ​របស់អ្នក"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"ទូរសព្ទរបស់អ្នក​ត្រូវបានកំណត់ឡើងវិញ​ដូចចេញពីរោងចក្រ។ ដើម្បីប្រើ​ទូរសព្ទនេះ សូមបញ្ចូលលំនាំមុន​របស់អ្នក។"</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"ទូរសព្ទរបស់អ្នក​ត្រូវបានកំណត់ឡើងវិញ​ដូចចេញ​ពីរោងចក្រ។ ដើម្បី​ប្រើទូរសព្ទនេះ សូមបញ្ចូលកូដ PIN មុនរបស់អ្នក។"</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"ទូរសព្ទរបស់អ្នក​ត្រូវបានកំណត់ឡើងវិញ​ដូចចេញពីរោងចក្រ។ ដើម្បីប្រើទូរសព្ទនេះ សូមបញ្ចូល​ពាក្យសម្ងាត់មុន​របស់អ្នក។"</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"ផ្ទៀងផ្ទាត់​លំនាំ"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"ផ្ទៀងផ្ទាត់កូដ​PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"ផ្ទៀងផ្ទាត់​ពាក្យសម្ងាត់"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"កូដ PIN មិនត្រឹមត្រូវ"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"ពាក្យសម្ងាត់មិនត្រឹមត្រូវ"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"លំនាំមិនត្រឹមត្រូវ"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"បង្កើត​ធាតុ​ក្រាហ្វិក និង​ឲ្យ​ចូល​ដំណើរការ?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"បន្ទាប់ពី​អ្នក​បង្កើត​ធាតុ​ក្រាហ្វិក <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> អាច​ចូល​ទិន្នន័យ​ទាំងអស់​ដែល​វា​បង្ហាញ។"</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"ឲ្យ <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> បង្កើត​ធាតុ​ក្រាហ្វិក និង​ចូល​ដំណើរ​ការ​ទិន្នន័យ​របស់​វា​ជា​និច្ច"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>ម៉ោង <xliff:g id="MINUTES">%2$d</xliff:g>នាទី <xliff:g id="SECONDS">%3$d</xliff:g>វិនាទី"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>នាទី <xliff:g id="SECONDS">%2$d</xliff:g>វិនាទី"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> វិនាទី"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"ស្ថិតិ​ប្រើ"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"ស្ថិតិ​ប្រើប្រាស់"</string>
     <string name="display_order_text" msgid="8592776965827565271">"តម្រៀប​តាម៖"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"កម្មវិធីអានអេក្រង់ ការបង្ហាញ ការគ្រប់គ្រងអន្តរកម្ម"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"ការកំណត់គំហើញ"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"អ្នកអាចកែសម្រួលឧបករណ៍នេះឲ្យសមតាម​តម្រូវការរបស់អ្នក។ មុខងារនៃភាព​ងាយស្រួលទាំងនេះអាចផ្លាស់​ប្តូរពេលក្រោយបាននៅក្នុងការកំណត់។"</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"បង្កើន​ទំហំ​ពុម្ព​អក្សរ"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"ប្ដូរ​ទំហំពុម្ពអក្សរ"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"កម្មវិធី​អានអេក្រង់"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"សំឡេង និងអក្សរ​នៅលើអេក្រង់"</string>
     <string name="display_category_title" msgid="685461049938269166">"បង្ហាញ"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><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_screen_magnification_navbar_summary" msgid="1996584694050087161">"នៅពេល​ដែល​ការពង្រីក​បើក សូម​ប្រើ​ប៊ូតុង​ភាពងាយស្រួល​នៅផ្នែកខាង​ក្រោម​នៃអេក្រង់ ដើម្បីធ្វើការពង្រីកឲ្យបានរហ័ស។\n\n"<b>"ដើម្បីពង្រីក ឬបង្រួម"</b>" សូមចុចប៊ូតុងភាពងាយស្រួល បន្ទាប់មកចុចកន្លែងណាមួយនៅលើអេក្រង។\n"<ul><li>"អូសដោយប្រើម្រាមដៃ 2 ឬច្រើនដើម្បី ដើម្បីរំកិល"</li>\n<li>"ច្បិចដោយប្រើម្រាមដៃ 2 ឬច្រើន ដើម្បីកែសម្រួល​ការពង្រីក ឬបង្រួម"</li></ul>\n\n<b>"ដើម្បី​ពង្រីក ឬបង្រួម​ជាបណ្តោះអាសន្ន"</b>" សូមចុចប៊ូតុងភាពងាយស្រួល បន្ទាប់មកចុចឲ្យជាប់នៅកន្លែងណាមួយនៅលើអេក្រង់។\n"<ul><li>"អូសដើម្បីផ្លាស់ទីនៅលើអេក្រង់"</li>\n<li>"លើកម្រាមដៃឡើងដើម្បីបង្រួម"</li></ul>\n\n"អ្នកមិនអាចពង្រីកនៅលើក្តារចុច ឬរបាររុករកបានទេ។"</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"ប៊ូតុងភាពងាយស្រួលត្រូវបានកំណត់ទៅ <xliff:g id="SERVICE">%1$s</xliff:g>។ ដើម្បីប្រើការពង្រីក សូមចុចប៊ូតុងភាពងាយស្រួលឲ្យជាប់ បន្ទាប់មកជ្រើសរើសការពង្រីក។"</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"ផ្លូវកាត់​ភាពងាយស្រួល"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"ផ្លូវកាត់គ្រាប់ចុច​កម្រិតសំឡេង"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"សេវាកម្មផ្លូវកាត់"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"អនុញ្ញាតចាប់ពីអេក្រង់ជាប់សោ"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"នៅពេលដែលផ្លូវកាត់នេះបើក អ្នកអាច​ចុច​ប៊ូតុង​កម្រិត​សំឡេង​ទាំង​ពីរ​ឲ្យបាន 3 វិនាទី ដើម្បី​ចាប់ផ្តើម​មុខងារ​ភាពងាយស្រួល។"</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"នៅពេលដែលផ្លូវកាត់នេះបើក អ្នកអាច​ចុច​គ្រាប់ចុច​កម្រិត​សំឡេង​ទាំង​ពីរ​ឲ្យបាន 3 វិនាទី ដើម្បី​ចាប់ផ្តើម​មុខងារ​ភាពងាយស្រួល។"</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">"ធ្វើ​បច្ចុប្បន្នភាព​ការ​ពង្រីក​អេក្រង់​ស្វ័យប្រវត្តិ"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"ធ្វើ​បច្ចុប្បន្ន​ភាព​ការ​ពង្រីក​អេក្រង់​ពេល​មាន​ដំណើរ​ផ្លាស់​ប្ដូរ​កម្មវិធី"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"អាចប៉ះពាល់ដល់ប្រតិបត្តិការ"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"ចុចបន្ទាប់ពីទ្រនិចឈប់ផ្លាស់ទី"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"ពន្យារពេលមុនពេលចុច"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"បើក"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"បិទ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"បង្ហាញ​នៅ​ក្នុង​ការ​កំណត់​​រហ័ស"</string>
@@ -2358,6 +2363,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"គ្រប់គ្រង​គម្រោង"</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>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"បណ្ដាញ​ចល័ត"</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_metered_auto" msgid="1262028400911918865">"ស្វ័យប្រវត្តិ"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"ថ្លៃ"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"ធូរថ្លៃ"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"ការ​គណនា​​ទិន្នន័យ​របស់​ក្រុមហ៊ុន​ផ្ដល់សេវាទូរស័ព្ទ​អាច​ខុស​គ្នា​ពី​ឧបករណ៍​របស់​អ្នក។"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"ការ​ហៅ​​ពេល​អាសន្ន"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"ត្រឡប់​​ទៅ​ការ​ហៅ"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"កម្មវិធី​គ្រប់គ្រង​ការ​ហៅ"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"ការ​ផ្សាយ​ពេល​មាន​អាសន្ន"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"ការ​ជូន​ដំណឹង​ពេល​អាសន្ន"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"ប្រតិបត្តិ​ករ​​​បណ្ដាញ"</string>
     <string name="access_point_names" msgid="1381602020438634481">"ឈ្មោះ​ចំណុច​ចូល​ដំណើរការ"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"បាន​ធ្វើ​ឲ្យ​របៀប 4G LTE ល្អ​ប្រសើរ​"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"ស៊ីម​ពេញ​ចិត្ត​សម្រាប់"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"សួរគ្រប់ពេល"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"ជម្រើស​ដែលទាមទារ"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"ការជ្រើសរើសស៊ីម"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"ការកំណត់"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">បង្ហាញធាតុ %d ដែលបានលាក់</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"ការ​ជូន​ដំណឹង​កម្មវិធី"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"ប្រភេទ​នៃ​ការជូនដំណឹង"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"សារៈសំខាន់"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"ទុក​ឲ្យ​កម្មវិធី​នេះ​សម្រេច"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"អនុញ្ញាត​ឱ្យមាន​សំឡេង"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"កុំ​បង្ហាញ​ការ​ជូនដំណឹង"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"គ្មាន​សំឡេង ឬ​ការ​រំខាន​ដល់​ការ​មើល​ឡើយ"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"គ្មានសំឡេង"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"បន្លឺ​សំឡេង"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"បន្លឺ​សំឡេង និង​លេច​ឡើង​នៅលើ​អេក្រង់"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"លោតបង្ហាញ​នៅលើអេក្រង់"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"ទាប"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"មធ្យម"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"ខ្ពស់"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"បន្ទាន់"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"អនុញ្ញាត​សំឡេង"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"កុំបន្លឺសំឡេង ញ័រ ឬលោតបង្ហាញការជូនដំណឹងទាំងនេះទៅក្នុងការបង្ហាញនៃអេក្រង់បច្ចុប្បន្ន។"</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"អនុញ្ញាត​ការរំខាន"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"អនុញ្ញាតឲ្យកម្មវិធីបន្លឺសំឡេង ញ័រ និង/ឬលោតបង្ហាញការ​ជូន​ដំណឹងនៅលើអេក្រង់"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"មិនសូវសំខាន់"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"សំខាន់កម្រិតមធ្យម"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"សំខាន់ខ្លាំង"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip រូប​ក្នុង"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"រូបក្នុងរូប"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"អនុញ្ញាតសម្រាប់មុខងាររូបក្នុងរូប"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"អនុញ្ញាតឲ្យកម្មវិធីនេះបង្កើតវិនដូរូបក្នុងរូប ខណៈពេលដែលកម្មវិធីកំពុងបើក ឬបន្ទាប់ពីអ្នកចាកចេញពីវា (ឧទាហរណ៍ ដើម្បីបន្តមើលវីដេអូ)។ វិនដូនេះបង្ហាញនៅលើកម្មវិធីផ្សេងទៀតដែលអ្នកកំពុង​ប្រើប្រាស់។"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"អនុញ្ញាតឲ្យ​កម្មវិធីនេះ​បង្កើតវិនដូ​រូបក្នុងរូប ខណៈពេល​ដែល​កម្មវិធី​នេះកំពុងបើក ឬ​បន្ទាប់ពី​អ្នកចាកចេញ​ពីវា (ឧទាហរណ៍៖ ដើម្បី​បន្តមើល​វីដេអូ)។ វិនដូនេះ​បង្ហាញ​នៅផ្នែក​ខាងលើ​កម្មវិធី​ផ្សេងទៀត​ដែលអ្នក​កំពុង​ប្រើប្រាស់។"</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>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"ផ្ទេរឯកសារ"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"ផ្ទេររូបថត (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"ប្រើ​ឧបករណ៍​ជា​លក្ខណៈ MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"ការបញ្ចាំងសារ SMS"</string>
     <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>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"កំណត់កាលវិភាគពន្លឺពេលរាត្រី"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"អេក្រង់ពណ៌លឿងព្រឿងៗជួយឲ្យអ្នកឆាប់គេងលក់"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"បានបើកពន្លឺពេលយប់"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"អេក្រង់មានពណ៌លឿងទុំព្រឿងៗ វាអាចជួយឲ្យអ្នកឆាប់គេងលក់។"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"ការណែនាំ"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"ប្រើពណ៌បង្ហាញត្រជាក់ជាងមុន"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"ដើម្បីប្តូរពណ៌ សូមបិទអេក្រង់"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"ដើម្បី​អនុវត្ត​ការ​ផ្លាស់ប្តូរ telephony monitor សូម​ចាប់ផ្តើម​ឧបករណ៍​ឡើងវិញ"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"កាមេរ៉ា HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"ដើម្បី​អនុវត្ត​ការ​ផ្លាស់ប្តូរ​លើកាមេរ៉ា HAL HDR+ សូមចាប់ផ្តើម​ឧបករណ៍​ឡើងវិញ"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"ឧបករណ៍ចាប់សញ្ញារបស់កាមេរ៉ាដែលការពារពន្លឺឡាស៊ែរ"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ការអាប់ដេតប្រព័ន្ធដោយស្វ័យប្រវត្តិ"</string>
     <string name="usage" msgid="2977875522080448986">"ការប្រើប្រាស់"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"ការប្រើប្រាស់​ទិន្នន័យ​ទូរសព្ទចល័ត"</string>
@@ -3410,7 +3427,7 @@
     <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="data_usage_template" msgid="2923744765873163859">"បានប្រើអស់ <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">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"លុប និងបម្លែង"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"កំណត់ការកម្រិតការវាយតម្លៃលើ ShortcutManager ឡើងវិញ"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ការកម្រិតការវាយតម្លៃ ShortcutManager ត្រូវបានកំណត់ឡើងវិញ"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"គ្រប់គ្រងការជូនដំណឹងអេក្រង់ចាក់សោ"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"គ្រប់គ្រង​ព័ត៌មាន​លើអេក្រង់ចាក់សោ"</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="8483187649355540109">"ជំនួយ និងគន្លឹះ"</string>
@@ -3487,7 +3504,7 @@
     <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="2456198532288640046">"មិនអាចឲ្យឧបករណ៍ផ្សេងមើលឃើញទេ"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"បិទ"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"បាន​ភ្ជាប់ទៅ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"បានភ្ជាប់​ទៅ​ឧបករណ៍​ច្រើន"</string>
     <string name="demo_mode" msgid="2798762752209330277">"មុខងារ​សាកល្បង​ UI ​ប្រព័ន្ធ"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"កម្មវិធី​ប្រើ​ភ្លាមៗ"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"បើកតំណ​នៅក្នុង​កម្មវិធី​បើទោះ​បីជា​ពួកវា​មិនត្រូវ​បាន​ដំឡើង​ក៏ដោយ"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"កម្មវិធី​ប្រើ​ភ្លាមៗ"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"គណនី​កម្មវិធី​ប្រើភ្លាមៗ"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"ចំណូលចិត្ត​កម្មវិធី​ប្រើភ្លាមៗ"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"កម្មវិធី​បាន​ដំឡើង"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"នៅពេលនេះទំហំផ្ទុករបស់អ្នកត្រូវបានគ្រប់គ្រងដោយកម្មវិធីគ្រប់គ្រងទំហំផ្ទុក"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"គណនី​សម្រាប់ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"VPN ដែល​បើក​ជានិច្ច ត្រូវបាន​បើកក្នុង​កម្រងព័ត៌មាន​ផ្ទាល់ខ្លួន​របស់អ្នក"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"VPN ដែល​បើក​ជានិច្ច ត្រូវបាន​បើកក្នុង​កម្រងព័ត៌មានការងារ​របស់អ្នក"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"បាន​កំណត់​ប្រូកស៊ី HTTP សកល"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"ព័ត៌មាន​សម្គាល់ខ្លួន​ដែល​ទុក​ចិត្ត"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"ព័ត៌មាន​ផ្ទៀងផ្ទាត់​ដែល​ទុកចិត្ត"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"ព័ត៌មាន​ផ្ទៀងផ្ទាត់​ដែល​ទុកចិត្ត​នៅក្នុងកម្រងព័ត៌មាន​ផ្ទាល់ខ្លួន​របស់អ្នក"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"ព័ត៌មាន​ផ្ទៀងផ្ទាត់​ដែល​ទុកចិត្ត​នៅក្នុងកម្រងព័ត៌មាន​ការងារ​របស់អ្នក"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">មានវិញ្ញាបនបត្រ CA ចំនួនអប្បរមា <xliff:g id="COUNT_1">%d</xliff:g></item>
       <item quantity="one">មានវិញ្ញាបនបត្រ CA ចំនួនអប្បរមា <xliff:g id="COUNT_0">%d</xliff:g></item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"ព័ត៌មាន​អំពី​ការ​ផ្តល់​ទិន្នន័យ​របស់​ក្រុមហ៊ុន​បម្រើ​សេវា​ទូរសព្ទ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ជំរុញ​ការ​ផ្តល់​ទិន្នន័យ​របស់​ក្រុមហ៊ុន​បម្រើ​សេវា​ទូរសព្ទ"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"តើមានអ្វីដែលថ្មី និងគួរឲ្យចាប់អារម្មណ៍ដែរទេ?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"សូមពិនិត្យមើលមុខងារពេញនិយមទាំង 5"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"មើលការណែនាំ​ទូរសព្ទថ្មី​របស់អ្នក"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"មើលការណែនាំ​ថេប្លេតថ្មីរបស់អ្នក"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"មើលការណែនាំ​ឧបករណ៍ថ្មី​របស់អ្នក"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"មុខងារនេះ​មិនមាន​នៅលើ​ឧបករណ៍​នេះទេ"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"ស្ថានភាព​នៃការ​ចុះឈ្មោះ IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"បាន​ចុះឈ្មោះ"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"មិនបាន​ចុះឈ្មោះ"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 8e317d1..25ef781 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ನಿಮ್ಮ ಸಂದೇಶಗಳನ್ನು ಪ್ರವೇಶಿಸಲು ಬಯಸುತ್ತದೆ. %2$s ಗೆ ಪ್ರವೇಶವನ್ನು ನೀಡುವುದೇ?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"ಸಿಮ್ ಪ್ರವೇಶ ವಿನಂತಿ"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ನಿಮ್ಮ ಸಿಮ್ ಕಾರ್ಡ್ ಪ್ರವೇಶಿಸಲು ಬಯಸುತ್ತದೆ. ಸಿಮ್ ಕಾರ್ಡ್‌ಗೆ ಪ್ರವೇಶವನ್ನು ನೀಡಿದರೆ, ಸಂಪರ್ಕಪಡಿಸುವ ಸಂದರ್ಭದಲ್ಲಿ ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಡೇಟಾ ಸಂಪರ್ಕಪಡಿಸುವಿಕೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> ಗೆ ಪ್ರವೇಶ ನೀಡಿ"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"ಇತರ ಸಾಧನಗಳಿಗೆ \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' ಎಂದು ಗೋಚರಿಸುತ್ತದೆ"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"ಇತರ ಸಾಧನಗಳಿಗೆ “<xliff:g id="DEVICE_NAME">^1</xliff:g>” ಎಂದು ಗೋಚರಿಸುತ್ತದೆ"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ನಿಮ್ಮ ಸಾಧನಗಳು"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ಹೊಸ ಸಾಧನವನ್ನು ಜೋಡಿಸಿ"</string>
     <string name="date_and_time" msgid="9062980487860757694">"ದಿನಾಂಕ &amp; ಸಮಯ"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"ಮುಂದೆ"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ ಸ್ಕಿಪ್ ಮಾಡುವುದೇ?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ ಸೆಟಪ್‌ ಮಾಡಲು ಒಂದು ಅಥವಾ ಎರಡು ನಿಮಿಷ ತೆಗೆದುಕೊಳ್ಳುತ್ತದೆ. ನೀವು ಇದನ್ನು ಸ್ಕಿಪ್‌ ಮಾಡಿದರೆ, ನೀವು ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ನಂತರ ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ ಸೇರಿಸಬಹುದು."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"ಪರದೆಯ ಲಾಕ್ ಸ್ಕಿಪ್ ಮಾಡುವುದೇ?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಆನ್‌ ಮಾಡಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಈ ಸಾಧನವು ಕಳೆದು ಹೋದರೆ ಅಥವಾ ಕಳವಾದರೆ ಇತರರು ಇದನ್ನು ಬಳಸುವುದನ್ನು ನಿಮಗೆ ತಡೆಯಲು ಸಾಧ್ಯವಾಗದೆ ಇರಬಹುದು."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಆನ್‌ ಮಾಡಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಈ ಸಾಧನವು ಕಳೆದು ಹೋದರೆ ಅಥವಾ ಕಳವಾದರೆ ಇತರರು ಇದನ್ನು ಬಳಸುವುದನ್ನು ನಿಮಗೆ ತಡೆಯಲು ಸಾಧ್ಯವಾಗದೆ ಇರಬಹುದು."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಆನ್‌ ಮಾಡಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಈ ಫೋನ್‌ ಕಳೆದು ಹೋದರೆ ಅಥವಾ ಕಳವಾದರೆ ಇತರರು ಇದನ್ನು ಬಳಸುವುದನ್ನು ನಿಮಗೆ ತಡೆಯಲು ಸಾಧ್ಯವಾಗದೆ ಇರಬಹುದು."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"ನೀವು ಗರಿಷ್ಠ ಸಂಖ್ಯೆಯ ಫಿಂಗರ್ ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸೇರಿಸಿರುವಿರಿ"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"ಹೆಚ್ಚಿನ ಫಿಂಗರ್ ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸೇರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"ಎಲ್ಲಾ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳನ್ನು ತೆಗೆದುಹಾಕುವುದೇ?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' ಅನ್ನು ಅಳಿಸಿ"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"ನೀವು ಈ ಫಿಂಗರ್‌ ಫ್ರಿಂಟ್ ಅಳಿಸಲು ಬಯಸುವಿರಾ?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮ್ಮ ಫಿಂಗರ್‌ ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಬಳಸಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಕೆಲಸದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮ್ಮ ಫಿಂಗರ್‌ ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಬಳಸಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"ಹೌದು, ತೆಗೆದುಹಾಕು"</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"ಹೆಚ್ಚಿನ ಸುರಕ್ಷತೆಗಾಗಿ, ಬ್ಯಾಕಪ್‌ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಿ."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"ಹೆಚ್ಚಿನ ಸುರಕ್ಷತೆಗಾಗಿ, ಬ್ಯಾಕಪ್‌ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಿ."</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>
@@ -497,37 +502,37 @@
     <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_fingerprint" msgid="8212242533942400457">"ನಿಮ್ಮ ಪ್ಯಾಟರ್ನ್ ಇಲ್ಲದೆಯೇ ಸಾಧನ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"ನಿಮ್ಮ ಪ್ಯಾಟರ್ನ್ ಇಲ್ಲದೆಯೇ ಸಾಧನ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ಈ ಸಾಧನದಿಂದ ನಿಮ್ಮ ಉಳಿಸಲಾದ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸಹ ತೆಗೆದುಹಾಕಲಾಗುವುದು ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅವುಗಳ ಮೂಲಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\""</string>
+</xliff:g>ಈ ಸಾಧನದಿಂದ ನಿಮ್ಮ ಉಳಿಸಲಾದ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸಹ ತೆಗೆದುಹಾಕಲಾಗುವುದು ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅವುಗಳ ಮೂಲಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"ನಿಮ್ಮ ಪಿನ್ ಇಲ್ಲದೆಯೇ ಸಾಧನ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"ನಿಮ್ಮ ಪಿನ್ ಇಲ್ಲದೆಯೇ ಸಾಧನ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"ನಿಮ್ಮ ಪಿನ್ ಇಲ್ಲದೆಯೇ ಸಾಧನ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ಈ ಸಾಧನದಿಂದ ನಿಮ್ಮ ಉಳಿಸಲಾದ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸಹ ತೆಗೆದುಹಾಕಲಾಗುವುದು ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅವುಗಳ ಮೂಲಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\""</string>
+</xliff:g>ಈ ಸಾಧನದಿಂದ ನಿಮ್ಮ ಉಳಿಸಲಾದ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸಹ ತೆಗೆದುಹಾಕಲಾಗುವುದು ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅವುಗಳ ಮೂಲಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ಇಲ್ಲದೆ ಸಾಧನ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ಈ ಸಾಧನದಿಂದ ನಿಮ್ಮ ಉಳಿಸಲಾದ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸಹ ತೆಗೆದುಹಾಕಲಾಗುವುದು ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅವುಗಳ ಮೂಲಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\""</string>
+</xliff:g>ಈ ಸಾಧನದಿಂದ ನಿಮ್ಮ ಉಳಿಸಲಾದ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸಹ ತೆಗೆದುಹಾಕಲಾಗುವುದು ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅವುಗಳ ಮೂಲಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಇಲ್ಲದೆ ಸಾಧನ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ಈ ಸಾಧನದಿಂದ ನಿಮ್ಮ ಉಳಿಸಲಾದ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸಹ ತೆಗೆದುಹಾಕಲಾಗುವುದು ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅವುಗಳ ಮೂಲಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\""</string>
+</xliff:g>ಈ ಸಾಧನದಿಂದ ನಿಮ್ಮ ಉಳಿಸಲಾದ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸಹ ತೆಗೆದುಹಾಕಲಾಗುವುದು ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅವುಗಳ ಮೂಲಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"ನಿಮ್ಮ ಪ್ಯಾಟರ್ನ್ ಇಲ್ಲದೆ ಸಾಧನ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"ನಿಮ್ಮ ಪ್ಯಾಟರ್ನ್ ಇಲ್ಲದೆ ಪ್ರೊಫೈಲ್ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"ನಿಮ್ಮ ಪ್ಯಾಟರ್ನ್ ಇಲ್ಲದೆ ಪ್ರೊಫೈಲ್ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ಈ ಪ್ರೊಫೈಲ್‌ನಿಂದ ನಿಮ್ಮ ಉಳಿಸಲಾದ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸಹ ತೆಗೆದುಹಾಕಲಾಗುವುದು ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅವುಗಳ ಮೂಲಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\""</string>
+</xliff:g>ಈ ಪ್ರೊಫೈಲ್‌ನಿಂದ ನಿಮ್ಮ ಉಳಿಸಲಾದ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸಹ ತೆಗೆದುಹಾಕಲಾಗುವುದು ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅವುಗಳ ಮೂಲಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"ನಿಮ್ಮ ಪಿನ್ ಇಲ್ಲದೆ ಪ್ರೊಫೈಲ್ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"ನಿಮ್ಮ ಪಿನ್ ಇಲ್ಲದೆ ಪ್ರೊಫೈಲ್ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"ನಿಮ್ಮ ಪಿನ್ ಇಲ್ಲದೆ ಪ್ರೊಫೈಲ್ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ಈ ಪ್ರೊಫೈಲ್‌ನಿಂದ ನಿಮ್ಮ ಉಳಿಸಲಾದ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸಹ ತೆಗೆದುಹಾಕಲಾಗುವುದು ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅವುಗಳ ಮೂಲಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\""</string>
+</xliff:g>ಈ ಪ್ರೊಫೈಲ್‌ನಿಂದ ನಿಮ್ಮ ಉಳಿಸಲಾದ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸಹ ತೆಗೆದುಹಾಕಲಾಗುವುದು ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅವುಗಳ ಮೂಲಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ಇಲ್ಲದೆ ಪ್ರೊಫೈಲ್ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ಇಲ್ಲದೆ ಪ್ರೊಫೈಲ್ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ಇಲ್ಲದೆ ಪ್ರೊಫೈಲ್ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ಈ ಪ್ರೊಫೈಲ್‌ನಿಂದ ನಿಮ್ಮ ಉಳಿಸಲಾದ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸಹ ತೆಗೆದುಹಾಕಲಾಗುವುದು ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅವುಗಳ ಮೂಲಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\""</string>
+</xliff:g>ಈ ಪ್ರೊಫೈಲ್‌ನಿಂದ ನಿಮ್ಮ ಉಳಿಸಲಾದ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸಹ ತೆಗೆದುಹಾಕಲಾಗುವುದು ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅವುಗಳ ಮೂಲಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಇಲ್ಲದೆ ಪ್ರೊಫೈಲ್ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಇಲ್ಲದೆ ಪ್ರೊಫೈಲ್ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಇಲ್ಲದೆ ಪ್ರೊಫೈಲ್ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ಈ ಪ್ರೊಫೈಲ್‌ನಿಂದ ನಿಮ್ಮ ಉಳಿಸಲಾದ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸಹ ತೆಗೆದುಹಾಕಲಾಗುವುದು ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅವುಗಳ ಮೂಲಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\""</string>
+</xliff:g>ಈ ಪ್ರೊಫೈಲ್‌ನಿಂದ ನಿಮ್ಮ ಉಳಿಸಲಾದ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸಹ ತೆಗೆದುಹಾಕಲಾಗುವುದು ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅವುಗಳ ಮೂಲಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"ಹೌದು, ತೆಗೆದುಹಾಕು"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"ಅನ್‌ಲಾಕ್ ನಮೂನೆಯನ್ನು ಬದಲಾಯಿಸಿ"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ಅನ್‌ಲಾಕ್ ಪಿನ್‌ ಬದಲಾಯಿಸಿ"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"ಅಂಕಿಗಳ ಆರೋಹಣ, ಅವರೋಹಣ ಅಥವಾ ಪುನರಾವರ್ತಿತ ಅನುಕ್ರಮವನ್ನು ನಿಷೇಧಿಸಲಾಗಿದೆ"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ಸರಿ"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"ರದ್ದುಮಾಡಿ"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"ತೆರವುಗೊಳಿಸಿ"</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>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ಲಭ್ಯವಿದೆ"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ಲಭ್ಯವಿದೆ)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ನಿಮ್ಮ ನೆಟ್‌ವರ್ಕ್‌ ಪಾಸ್‌ವರ್ಡ್‌ ನಮೂದಿಸಿ"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ ವಾಹಕ"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> ಮೂಲಕ ಸಂಪರ್ಕಿಸಿ"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ಸ್ಥಳ ನಿಖರತೆಯನ್ನು ಸುಧಾರಿಸಲು ಮತ್ತು ಇತರ ಉದ್ದೇಶಗಳಿಗಾಗಿ, ವೈ-ಫೈ ಆಫ್‌ ಇದ್ದಾಗಲೂ ಸಹ <xliff:g id="APP_NAME">%1$s</xliff:g> ನೆಟ್‌ವರ್ಕ್‌ ಸ್ಕ್ಯಾನಿಂಗ್‌ ಆನ್‌ ಮಾಡಲು ಬಯಸುತ್ತದೆ.\n\nಸ್ಕ್ಯಾನ್ ಮಾಡಲು ಬಯಸುವ ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಇದಕ್ಕೆ ಅನುಮತಿಸುವುದೇ?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ಇದನ್ನು ಆಫ್ ಮಾಡಲು, ಓವರ್‌ಫ್ಲೋ ಮೆನುವಿನಲ್ಲಿನ ಸುಧಾರಿತ ಗೆ ಹೋಗಿ."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ಅನುಮತಿಸಿ"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"ಸಂಪರ್ಕಪಡಿಸು"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ನೆಟ್‌ವರ್ಕ್‌ ಸಂಪರ್ಕಿಸಲು ವಿಫಲವಾಗಿದೆ"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"ಮರೆತುಬಿಡು"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"ಮಾರ್ಪಡಿಸಿ"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"ನೆಟ್‌ವರ್ಕ್‌ ಮರೆಯಲು ವಿಫಲವಾಗಿದೆ"</string>
     <string name="wifi_save" msgid="3331121567988522826">"ಉಳಿಸು"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"ನೆಟ್‌ವರ್ಕ್‌ ಉಳಿಸಲು ವಿಫಲವಾಗಿದೆ"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"ಸುಧಾರಿತ Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC ವಿಳಾಸ"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP ವಿಳಾಸ"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"ನೆಟ್‌ವರ್ಕ್‌ ಮಾಹಿತಿ"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"ಸಬ್‌ನೆಟ್‌ ಮಾಸ್ಕ್‌"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 ವಿಳಾಸಗಳು"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ಆಹ್ವಾನವನ್ನು ರದ್ದುಪಡಿಸುವುದೇ?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g> ಜೊತೆಗೆ ಸಂಪರ್ಕಪಡಿಸಲು ಆಹ್ವಾನವನ್ನು ರದ್ದುಪಡಿಸಲು ನೀವು ಬಯಸುತ್ತೀರಾ?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ಈ ಗುಂಪನ್ನು ಮರೆಯುವುದೇ?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"ಪೋರ್ಟಬಲ್ ವೈ-ಫೈ ಹಾಟ್‌ಸ್ಪಾಟ್"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"ವೈ-ಫೈ ಹಾಟ್‌ಸ್ಪಾಟ್"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"ಇತರ ಸಾಧನಗಳೊಂದಿಗೆ ಇಂಟರ್ನೆಟ್ ಅಥವಾ ವಿಷಯವನ್ನು ಹಂಚಿಕೊಳ್ಳುತ್ತಿಲ್ಲ"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"ಈ ಟ್ಯಾಬ್ಲೆಟ್‌ನ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಹಾಟ್‌ಸ್ಪಾಟ್ ಮೂಲಕ ಹಂಚಿಕೊಳ್ಳಲಾಗುತ್ತಿದೆ"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"ಈ ಫೋನ್‌ನ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಹಾಟ್‌ಸ್ಪಾಟ್ ಮೂಲಕ ಹಂಚಿಕೊಳ್ಳಲಾಗುತ್ತಿದೆ"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"ಅಪ್ಲಿಕೇಶನ್‌ ವಿಷಯವನ್ನು ಹಂಚಿಕೊಳ್ಳುತ್ತಿದೆ. ಇಂಟರ್ನೆಟ್‌ ಸಂಪರ್ಕವನ್ನು ಹಂಚಿಕೊಳ್ಳಲು, ಹಾಟ್‌ಸ್ಪಾಟ್‌ ಆಫ್‌ ಮಾಡಿ ನಂತರ ಆನ್‌ ಮಾಡಿ"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"ವೈ-ಫೈ ಹೆಸರು"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"ಹಾಟ್‌ಸ್ಪಾಟ್ ಹೆಸರು"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ಅನ್ನು ಆನ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"ಇತರೆ ಸಾಧನಗಳು <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕವನ್ನು ಪಡೆದುಕೊಳ್ಳಬಹುದು"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"ವೈ-ಫೈ ಪಾಸ್‌ವರ್ಡ್‌"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"ಹಾಟ್‌ಸ್ಪಾಟ್ ಪಾಸ್‌ವರ್ಡ್"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP ಬ್ಯಾಂಡ್"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"ನಿಮ್ಮ ಇತರ ಸಾಧನಗಳಿಗೆ ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ ರಚಿಸಲು ಹಾಟ್‌ಸ್ಪಾಟ್‌ ಬಳಸಿ. ನಿಮ್ಮ ಮೊಬೈಲ್‌ ಡೇಟಾ ಸಂಪರ್ಕವನ್ನು ಬಳಸಿಕೊಂಡು ಹಾಟ್‌ಸ್ಪಾಟ್‌ ಇಂಟರ್ನೆಟ್‌ ಅನ್ನು ಒದಗಿಸುತ್ತದೆ. ಹೆಚ್ಚುವರಿ ಮೊಬೈಲ್‌ ಡೇಟಾ ಶುಲ್ಕಗಳು ಅನ್ವಯವಾಗಬಹುದು."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ಹತ್ತಿರದ ಸಾಧನಗಳೊಂದಿಗೆ ವಿಷಯವನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಹಾಟ್‌ಸ್ಪಾಟ್ ಅನ್ನು ಸಹ ರಚಿಸಬಹುದು."</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"ವೈ-ಫೈ ಕರೆ ಮಾಡುವಿಕೆ ಆನ್‌ ಆದಾಗ, ನಿಮ್ಮ ಫೋನ್‌ ನಿಮ್ಮ ಆದ್ಯತೆ ಮತ್ತು ಯಾವ ಸಿಗ್ನಲ್ ಬಲವಾಗಿದೆ ಎಂಬುದರ ಅನುಗುಣವಾಗಿ, ಕರೆಗಳನ್ನು ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ಗಳು ಅಥವಾ ನಿಮ್ಮ ವಾಹಕದ ನೆಟ್‌ವರ್ಕ್ ಮೂಲಕ ರವಾನಿಸುತ್ತದೆ. ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಆನ್‌ ಮಾಡವ ಮೊದಲು, ಶುಲ್ಕಗಳು  ಮತ್ತು ಇತರ ವಿವರಗಳಿಗೆ ಸಂಬಂಧಿಸಿದಂತೆ ನಿಮ್ಮ ವಾಹಕವನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"ತುರ್ತು ವಿಳಾಸವನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಿ"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"ವೈ-ಫೈ ಬಳಸಿಕೊಂಡು ನೀವು 911 ಕರೆ ಮಾಡಿದಾಗ ನಿಮ್ಮ ಸ್ಥಳದ ವಿಳಾಸವನ್ನು ತುರ್ತು ಸೇವೆಗಳಿಗೆ ಬಳಸಲಾಗುತ್ತದೆ"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"ವೈ-ಫೈ ಬಳಸಿಕೊಂಡು ನೀವು ತುರ್ತು ಕರೆ ಮಾಡಿದಾಗ ನಿಮ್ಮ ಸ್ಥಳದ ವಿಳಾಸವನ್ನು ತುರ್ತು ಸೇವೆಗಳಿಗೆ ಬಳಸಲಾಗುತ್ತದೆ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ಪ್ರದರ್ಶನ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ಧ್ವನಿ"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ವಾಲ್ಯುಮ್‌ಗಳು"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"ಹುಡುಕಿ"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"ಹುಟುಕಾಟ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಮತ್ತು ಇತಿಹಾಸವನ್ನು ನಿರ್ವಹಿಸಿ"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"ಯಾವುದೇ ಫಲಿತಾಂಶಗಳಿಲ್ಲ"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"ಇತಿಹಾಸ ತೆರವುಗೊಳಿಸಿ"</string>
     <string name="display_settings" msgid="7965901687241669598">"ಪ್ರದರ್ಶನ"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"ಪರದೆಯನ್ನು ಸ್ವಯಂ-ತಿರುಗಿಸು"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"ಹೊಳೆಯುವ ಬಣ್ಣಗಳು"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"ಡಿಫಾಲ್ಟ್ APN ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮರುಸ್ಥಾಪಿಸಲಾಗುತ್ತಿದೆ."</string>
     <string name="menu_restore" msgid="8260067415075573273">"ಡೀಫಾಲ್ಟ್‌ಗೆ  ಮರುಹೊಂದಿಸು"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"ಡಿಫಾಲ್ಟ್ APN ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಮರುಹೊಂದಿಕೆಯು ಪೂರ್ಣಗೊಂಡಿದೆ."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"ಮರುಹೊಂದಿಸಿ"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"ನೆಟ್‌ವರ್ಕ್‌ ಸೆಟ್ಟಿಂಗ್‌ ಮರುಹೊಂದಿಕೆ"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"ಮರುಹೊಂದಿಸುವ ಆಯ್ಕೆಗಳು"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"ನೆಟ್‌ವರ್ಕ್, ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅಥವಾ ಸಾಧನವನ್ನು ಮರುಹೊಂದಿಸಬಹುದಾಗಿದೆ"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"ವೈ-ಫೈ, ಮೊಬೈಲ್ ಮತ್ತು ಬ್ಲೂಟೂತ್ ಮರುಹೊಂದಿಸಿ"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"ಕೆಳಗಿನವುಗಳನ್ನು ಒಳಗೊಂಡಂತೆ ಇದು ಎಲ್ಲಾ ನೆಟ್‌ವರ್ಕ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸುತ್ತದೆ:\n\n"<li>"ವೈ-ಫೈ"</li>\n<li>"ಮೊಬೈಲ್ ಡೇಟಾ"</li>\n<li>"ಬ್ಲೂಟೂತ್‌"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸು"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"ಎಲ್ಲಾ ನೆಟ್‌ವರ್ಕ್‌ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸುವುದೇ? ನಿಮಗೆ ಈ ಕ್ರಮವನ್ನು ರದ್ದುಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"ಮರುಹೊಂದಿಸುವುದೇ?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"ಈ ಬಳಕೆದಾರರಿಗೆ ನೆಟ್‌ವರ್ಕ್ ಮರುಹೊಂದಿಕೆ ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"ನೆಟ್‌ವರ್ಕ್‌ ಸೆಟ್ಟಿಂಗ್‌ ಮರುಹೊಂದಿಸಲಾಗಿದೆ"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"ಫ್ಯಾಕ್ಟರಿಡೇಟಾ ರಿಸೆಟ್‌"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> ಖಾತೆಗಳನ್ನು ಮರುಹೊಂದಿಸಲಾಗುವುದು</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> ಖಾತೆಗಳನ್ನು ಮರುಹೊಂದಿಸಲಾಗುವುದು</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆ ಹಾಗೂ ಎಲ್ಲ ಡೇಟಾವನ್ನು ಮರುಹೊಂದಿಸಲಾಗುವುದು"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"ಎಲ್ಲಾ ಡೇಟಾ ಅಳಿಸಿ (ಫ್ಯಾಕ್ಟರಿ ಮರುಹೊಂದಿಸಿ)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ಇದು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ನ "<b>"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯ"</b>" ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸುತ್ತದೆ, ಅವುಗಳೆಂದರೆ:\n\n"<li>"ನಿಮ್ಮ Google ಖಾತೆ"</li>\n<li>"ಸಿಸ್ಟಂ ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾ ಹಾಗೂ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</li>\n<li>"ಡೌನ್‌ಲೋಡ್ ಮಾಡಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ಇದು ನಿಮ್ಮ ಫೋನ್‌ನ "<b>"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯಲ್ಲಿರುವ"</b>"ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸಿ ಹಾಕುತ್ತದೆ. ಡೇಟಾ ಇವುಗಳನ್ನೂ ಒಳಗೊಂಡಿರಬಹುದು:\n\n"<li>"ನಿಮ್ಮ Google ಖಾತೆ"</li>\n<li>"ಸಿಸ್ಟಂ ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾ ಹಾಗೂ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</li>\n<li>"ಡೌನ್‌ಲೋಡ್ ಮಾಡಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ನೀವು ಪ್ರಸ್ತುತ ಕೆಳಗಿನ ಖಾತೆಗಳಿಗೆ ಸೈನ್ ಇನ್ ಆಗಿರುವಿರಿ:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"ಸುರಕ್ಷತೆ ಮಾಹಿತಿ"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"ನೀವು ಡೇಟಾ ಸಂಪರ್ಕವನ್ನು ಹೊಂದಿಲ್ಲ. ಇದೀಗ ಈ ಮಾಹಿತಿಯನ್ನು ವೀಕ್ಷಿಸಲು, ಇಂಟರ್ನೆಟ್‌ಗೆ ಸಂಪರ್ಕಪಡಿಸಿದ ಯಾವುದೇ ಕಂಪ್ಯೂಟರ್‌ನಿಂದ %s ಗೆ ಹೋಗಿ."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ಲೋಡ್ ಆಗುತ್ತಿದೆ..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್‌ ಆರಿಸಿಕೊಳ್ಳಿ"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"ಪರದೆ ಲಾಕ್ ಹೊಂದಿಸಿ"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"ಸುರಕ್ಷತೆಗಾಗಿ, ಪಾಸ್‌ವರ್ಡ್‌ ಹೊಂದಿಸಿ"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಬಳಸಲು, ಪಾಸ್‌ವರ್ಡ್‌ ಹೊಂದಿಸಿ"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"ಪ್ಯಾಟರ್ನ್ ಆಯ್ಕೆ ಮಾಡಿ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ಬೆರಳಚ್ಚು ಬಳಸಲು, ಪ್ಯಾಟರ್ನ್ ಹೊಂದಿಸಿ"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"ನಿಮ್ಮ ಪಿನ್‌ ಅನ್ನು ಆರಿಸಿ"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"ಸುರಕ್ಷತೆಗಾಗಿ, ಪಿನ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"ಬೆರಳಚ್ಚು ಬಳಸಲು, ಪಿನ್ ಹೊಂದಿಸಿ"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್‌ ದೃಢೀಕರಿಸಿ"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ಮರು ನಮೂದಿಸಿ"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"ಪ್ಯಾಟರ್ನ್ ಅನ್ನು ದೃಢೀಕರಿಸಿ"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"ನಿಮ್ಮ ಪಿನ್‌ ಅನ್ನು ದೃಢೀಕರಿಸಿ"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"ನಿಮ್ಮ ಪಿನ್‌ ಅನ್ನು ಮರು ನಮೂದಿಸಿ"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"ಪಾಸ್‌ವರ್ಡ್‌ ಹೊಂದಿಕೆಯಾಗುತ್ತಿಲ್ಲ"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"ಪಿನ್‌ಗಳು ಹೊಂದಾಣಿಕೆಯಾಗುತ್ತಿಲ್ಲ"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"ಅನ್‌ಲಾಕ್ ಆಯ್ಕೆ"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"ಮುಂದುವರಿಸಲು ನಿಮ್ಮ ಕೆಲಸದ ಪ್ಯಾಟರ್ನ್ ಬಳಸಿ"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"ಮುಂದುವರಿಸಲು ನಿಮ್ಮ ಕೆಲಸದ ಪಿನ್ ನಮೂದಿಸಿ"</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">"ಮುಂದುವರಿಸಲು ನಿಮ್ಮ ಸಾಧನದ ಪಿನ್ ನಮೂದಿಸಿ. ಸಾಧನ ಮರುಪ್ರಾರಂಭಗೊಂಡ ನಂತರ ಅಗತ್ಯವಿರುತ್ತದೆ."</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">"ಮುಂದುವರಿಸಲು ನಿಮ್ಮ ಕೆಲಸದ ಪಿನ್ ನಮೂದಿಸಿ. ಸಾಧನ ಮರುಪ್ರಾರಂಭಗೊಂಡ ನಂತರ ಅಗತ್ಯವಿರುತ್ತದೆ."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"ಮುಂದುವರಿಸಲು ನಿಮ್ಮ ಕೆಲಸದ ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸಿ. ಸಾಧನ ಮರುಪ್ರಾರಂಭಗೊಂಡ ನಂತರ ಅಗತ್ಯವಿರುತ್ತದೆ."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"ಹೆಚ್ಚಿನ ಸುರಕ್ಷತೆಗಾಗಿ, ನಿಮ್ಮ ಸಾಧನದ ಪ್ಯಾಟರ್ನ್‌ ಬಳಸಿ"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"ಹೆಚ್ಚಿನ ಸುರಕ್ಷತೆಗಾಗಿ, ನಿಮ್ಮ ಸಾಧನದ ಪಿನ್‌ ನಮೂದಿಸಿ"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"ಹೆಚ್ಚಿನ ಸುರಕ್ಷತೆಗಾಗಿ, ನಿಮ್ಮ ಸಾಧನದ ಪಾಸ್‌ವರ್ಡ್‌ ನಮೂದಿಸಿ"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"ಹೆಚ್ಚಿನ ಸುರಕ್ಷತೆಗಾಗಿ, ನಿಮ್ಮ ಕೆಲಸದ ಪಾಸ್‌ವರ್ಡ್‌ ಬಳಸಿ"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"ಹೆಚ್ಚಿನ ಸುರಕ್ಷತೆಗಾಗಿ, ನಿಮ್ಮ ಕೆಲಸದ ಪಿನ್‌ ನಮೂದಿಸಿ"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"ಹೆಚ್ಚಿನ ಸುರಕ್ಷತೆಗಾಗಿ, ನಿಮ್ಮ ಕೆಲಸದ ಪಾಸ್‌ವರ್ಡ್‌ ನಮೂದಿಸಿ"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ಫ್ಯಾಕ್ಟರಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಮರುಹೊಂದಿಸಲಾಗಿದೆ. ಈ ಫೋನ್‌ ಬಳಸಲು, ನಿಮ್ಮ ಹಿಂದಿನ ಪ್ಯಾಟರ್ನ್‌ ನಮೂದಿಸಿ."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ಫ್ಯಾಕ್ಟರಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಮರುಹೊಂದಿಸಲಾಗಿದೆ. ಈ ಫೋನ್‌ ಬಳಸಲು, ನಿಮ್ಮ ಹಿಂದಿನ ಪಿನ್‌ ನಮೂದಿಸಿ."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ಫ್ಯಾಕ್ಟರಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಮರುಹೊಂದಿಸಲಾಗಿದೆ. ಈ ಫೋನ್‌ ಬಳಸಲು, ನಿಮ್ಮ ಹಿಂದಿನ ಪಾಸ್‌ವರ್ಡ್‌ ನಮೂದಿಸಿ."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"ಪ್ಯಾಟರ್ನ್‌ ಪರಿಶೀಲಿಸಿ"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"ಪಿನ್‌ ಪರಿಶೀಲಿಸಿ"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"ಪಾಸ್‌ವರ್ಡ್‌ ಪರಿಶೀಲಿಸಿ"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"ತಪ್ಪಾದ ಪಿನ್‌"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"ತಪ್ಪು ಪಾಸ್‌ವರ್ಡ್‌"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"ತಪ್ಪು ಪ್ಯಾಟರ್ನ್"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"ವಿಜೆಟ್ ರಚಿಸಿ ಮತ್ತು ಪ್ರವೇಶ ಅನುಮಿತಿಸಬಹುದೇ?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"ನೀವು ವಿಜೆಟ್ ರಚಿಸಿದ ನಂತರ, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ಪ್ರದರ್ಶಿಸುವ ಎಲ್ಲ ಡೇಟಾವನ್ನು ಪ್ರವೇಶಿಸಬಹುದು."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"ವಿಜೆಟ್‌ಗಳನ್ನು ರಚಿಸಲು ಮತ್ತು ಅವುಗಳ ಡೇಟಾವನ್ನು ಪ್ರವೇಶಿಸಲು <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ಅನ್ನು ಯಾವಾಗಲೂ ಅನುಮತಿಸಿ"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>ದಿ <xliff:g id="HOURS">%2$d</xliff:g>ಗಂ <xliff:g id="MINUTES">%3$d</xliff:g>ನಿ <xliff:g id="SECONDS">%4$d</xliff:g>ಸೆ"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>ಗಂ <xliff:g id="MINUTES">%2$d</xliff:g>ನಿ <xliff:g id="SECONDS">%3$d</xliff:g>ಸೆ"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>ನಿ <xliff:g id="SECONDS">%2$d</xliff:g>ಸೆ"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>ಗಳು"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"ಬಳಕೆಯ ಅಂಕಿಅಂಶಗಳು"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"ಬಳಕೆಯ ಅಂಕಿಅಂಶಗಳು"</string>
     <string name="display_order_text" msgid="8592776965827565271">"ಈ ಪ್ರಕಾರ ವಿಂಗಡಿಸು:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"ಪರದೆ ರೀಡರ್‌ಗಳು, ಡಿಸ್‌ಪ್ಲೇ, ಸಂವಾದ ನಿಯಂತ್ರಕಗಳು"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"ವಿಷನ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"ನಿಮ್ಮ ಅಗತ್ಯಗಳಿಗೆ ಸರಿಹೊಂದುವಂತೆ ಈ ಸಾಧನವನ್ನು ನೀವು ಕಸ್ಟಮೈಸ್ ಮಾಡಬಹುದು. ಈ ಪ್ರವೇಶಿಸುವಿಕೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ನಂತರ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಬದಲಾಯಿಸಬಹುದು."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"ಫಾಂಟ್ ಗಾತ್ರವನ್ನು ಹೆಚ್ಚಿಸಿ"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"ಫಾಂಟ್ ಗಾತ್ರ ಬದಲಿಸಿ"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"ಪರದೆ ರೀಡರ್‌ಗಳು"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ಆಡಿಯೋ ಮತ್ತು ಪರದೆಯ ಮೇಲಿನ ಪಠ್ಯ"</string>
     <string name="display_category_title" msgid="685461049938269166">"ಪ್ರದರ್ಶನ"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><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_screen_magnification_navbar_summary" msgid="1996584694050087161">"ಹಿಗ್ಗಿಸುವಿಕೆ ಆನ್ ಆಗಿದ್ದಾಗ, ತ್ವರಿತವಾಗಿ ಹಿಗ್ಗಿಸಲು, ಪರದೆಯ ಕೆಳಭಾಗದಲ್ಲಿರುವ ಪ್ರವೇಶಿಸುವಿಕೆ ಬಟನ್ ಬಳಸಿ.\n\n"<b>"ಝೂಮ್ ಮಾಡಲು"</b>", ಪ್ರವೇಶಿಸುವಿಕೆ ಬಟನ್ ಟ್ಯಾಪ್ ಮಾಡಿ, ನಂತರ ಪರದೆಯ ಮೇಲೆ ಎಲ್ಲಾದರೂ ಟ್ಯಾಪ್ ಮಾಡಿ.\n"<ul><li>"ಸ್ಕ್ರಾಲ್ ಮಾಡಲು 2 ಅಥವಾ ಹೆಚ್ಚು ಬೆರಳುಗಳನ್ನು ಡ್ರ್ಯಾಗ್ ಮಾಡಿ"</li>\n<li>"ಝೂಮ್ ಹೊಂದಿಸಲು, 2 ಅಥವಾ ಹೆಚ್ಚು ಬೆರಳುಗಳ ಜೊತೆ ಚಿವುಟಿ"</li></ul>\n\n<b>"ತಾತ್ಕಾಲಿಕವಾಗಿ ಝೂಮ್ ಮಾಡಲು"</b>", ಪ್ರವೇಶಿಸುವಿಕೆ ಬಟನ್ ಟ್ಯಾಪ್ ಮಾಡಿ, ನಂತರ ಪರದೆಯ ಮೇಲೆ ಎಲ್ಲಾದರೂ ಸ್ಪರ್ಶಿಸಿ, ಒತ್ತಿಹಿಡಿಯಿರಿ.\n"<ul><li>"ಪರದೆಯಲ್ಲಿ ಅತ್ತಿತ್ತ ಸರಿಸಲು, ಡ್ರ್ಯಾಗ್ ಮಾಡಿ"</li>\n<li>"ಝೂಮ್ ಔಟ್ ಮಾಡಲು ಬೆರಳನ್ನು ಎತ್ತಿ"</li></ul>\n\n"ನೀವು ಕೀಬೋರ್ಡ್ ಅಥವಾ ನ್ಯಾವಿಗೇಶನ್ ಬಾರ್‌ನಲ್ಲಿ ಝೂಮ್ ಇನ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"ಪ್ರವೇಶಿಸುವಿಕೆ ಬಟನ್ ಅನ್ನು <xliff:g id="SERVICE">%1$s</xliff:g> ಗೆ ಹೊಂದಿಸಲಾಗಿದೆ. ಹಿಗ್ಗಿಸುವಿಕೆ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಬಳಸಲು, ಪ್ರವೇಶಿಸುವಿಕೆ ಬಟನ್ ಅನ್ನು ಸ್ಪರ್ಶಿಸಿ, ಒತ್ತಿಹಿಡಿಯಿರಿ; ನಂತರ, ಹಿಗ್ಗಿಸುವಿಕೆಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"ಪ್ರವೇಶ ಶಾರ್ಟ್‌ಕಟ್‌"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"ವಾಲ್ಯೂಮ್ ಕೀ ಶಾರ್ಟ್‌ಕಟ್‌"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"ಶಾರ್ಟ್‌ಕಟ್ ಸೇವೆ"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"ಲಾಕ್ ಪರದೆಯಿಂದ ಅನುಮತಿಸಿ"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"ಶಾರ್ಟ್‌ಕಟ್ ಆನ್ ಆಗಿರುವಾಗ ಪ್ರವೇಶಿಸುವಿಕೆ ವೈಶಿಷ್ಟ್ಯ ಆನ್ ಮಾಡಲು, ಎರಡೂ ವಾಲ್ಯೂಮ್ ಬಟನ್‌ಗಳನ್ನು ನೀವು 3 ಸೆಕೆಂಡುಗಳ ಕಾಲ ಒತ್ತಬೇಕು."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"ಶಾರ್ಟ್‌ಕಟ್ ಆನ್ ಆಗಿರುವಾಗ ಪ್ರವೇಶಿಸುವಿಕೆ ವೈಶಿಷ್ಟ್ಯ ಆನ್ ಮಾಡಲು, ಎರಡೂ ವಾಲ್ಯೂಮ್ ಕೀಗಳನ್ನು ನೀವು 3 ಸೆಕೆಂಡುಗಳ ಕಾಲ ಒತ್ತಬೇಕು."</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">"ಸ್ವಯಂಚಾಲಿತ ನವೀಕರಣದ ಸ್ಕ್ರೀನ್‌ ವರ್ಧನೆ"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"ಅಪ್ಲಿಕೇಶನ್‌ ಪರಿವರ್ತನೆಗಳಲ್ಲಿ ಸ್ಕ್ರೀನ್‌ ವರ್ಧಕವನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಿ"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"ಕಾರ್ಯಕ್ಷಮತೆಯ ಮೇಲೆ ಪರಿಣಾಮ ಬೀರಬಹುದು"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"ಪಾಯಿಂಟರ್ ನಿಂತ ಬಳಿಕ ಕ್ಲಿಕ್"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"ಕ್ಲಿಕ್ ಮಾಡುವ ಮೊದಲು ವಿಳಂಬ"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ಆನ್"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ಆಫ್"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"ತ್ವರಿತ ಸೆಟ್ಟಿಂಗ್‌‌ಗಳಲ್ಲಿ ತೋರಿಸು"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g> ರಲ್ಲಿ <xliff:g id="NUMBER">%1$d</xliff:g> ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g> ರಲ್ಲಿ <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"ಎಲ್ಲವನ್ನೂ ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"ಯೋಜನೆಗಳನ್ನು ನಿರ್ವಹಿಸಿ"</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>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"ಮೊಬೈಲ್‌ ನೆಟ್‌ವರ್ಕ್‌ಗಳು"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"ಮಾಪನಯುಕ್ತ ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ಗಳು"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"ಮಾಪನಯುಕ್ತ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ಆಯ್ಕೆ ಮಾಡಲು, ವೈ-ಫೈ ಆನ್ ಮಾಡಿ."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"ಸ್ವಯಂಚಾಲಿತ"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"ಮೀಟರ್ ಮಾಡಲಾಗಿದೆ"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"ಮೀಟರ್ ಮಾಡಲಾಗಿಲ್ಲ"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"ವಾಹಕ ಡೇಟಾ ಲೆಕ್ಕಾಚಾರವು ನಿಮ್ಮ ಸಾಧನಕ್ಕಿಂತ ಭಿನ್ನವಾಗಿರಬಹುದು."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"ತುರ್ತು ಕರೆಗಳು"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"ಕರೆಗೆ ಹಿಂತಿರುಗು"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"ಕರೆ ನಿರ್ವಾಹಕ"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"ತುರ್ತು ಪ್ರಸಾರಗಳು"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"ತುರ್ತು ಎಚ್ಚರಿಕೆಗಳು"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"ನೆಟ್‌ವರ್ಕ್‌ ಆಪರೇಟರ್‌ಗಳು"</string>
     <string name="access_point_names" msgid="1381602020438634481">"ಪ್ರವೇಶ ಕೇಂದ್ರದ ಹೆಸರುಗಳು"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"ವರ್ಧಿಸಲಾದ 4G LTE ಮೋಡ್"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"ಇದಕ್ಕಾಗಿ ಪ್ರಾಶಸ್ತ್ಯದ ಸಿಮ್"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"ಪ್ರತಿ ಬಾರಿ ಕೇಳು"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"ಆಯ್ಕೆ ಅಗತ್ಯವಿದೆ"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"ಸಿಮ್ ಆಯ್ಕೆ"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="one">%d ಮರೆಮಾಡಲಾದ ಐಟಂಗಳನ್ನು ತೋರಿಸಿ</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"ಅಪ್ಲಿಕೇಶನ್‌ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"ಅಧಿಸೂಚನೆ ವರ್ಗ"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"ಪ್ರಾಮುಖ್ಯತೆ"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"ಅಪ್ಲಿಕೇಶನ್‌ ನಿರ್ಧರಿಸಲು ಬಿಡಿ"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"ಧ್ವನಿಗೆ ಅನುಮತಿ ನೀಡಿ"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"ಎಂದಿಗೂ ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸಬೇಡಿ"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ಯಾವುದೇ ಧ್ವನಿ ಅಥವಾ ದೃಶ್ಯ ಅಡಚಣೆಗಳಿಲ್ಲ"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"ಧ್ವನಿ ಇಲ್ಲ"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"ಧ್ವನಿ ಮಾಡಿ"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"ಪರದೆಯ ಮೇಲೆ ಧ್ವನಿಮಾಡಿ ಮತ್ತು ಪಾಪ್ ಮಾಡಿ"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"ಪರದೆಯಲ್ಲಿ ಪಾಪ್ ಮಾಡಿ"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"ಕಡಿಮೆ"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"ಮಧ್ಯಮ"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"ಅಧಿಕ"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"ತುರ್ತು"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"ಧ್ವನಿಗೆ ಅನುಮತಿ ನೀಡಿ"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"ಪ್ರಸ್ತುತ ಪರದೆಯಲ್ಲಿ ಈ ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸಲು ಧ್ವನಿ, ವೈಬ್ರೇಷನ್ ಅಥವಾ ಇಣುಕು ನೋಟ ಮಾಡಬೇಡ."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"ತಡೆಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"ಅಪ್ಲಿಕೇಶನ್‌ ಧ್ವನಿ, ವೈಬ್ರೇಷನ್ ಮಾಡಲು ಮತ್ತು /ಅಥವಾ ಪರದೆ ಮೇಲೆ ಇಣುಕು ನೋಟದ ಅಧಿಸೂಚನೆಗಳು ಕಾಣಿಸಲು ಅವಕಾಶ ಮಾಡಿಕೊಡಿ."</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"ಕಡಿಮೆ ಪ್ರಾಮುಖ್ಯತೆ"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"ಮಧ್ಯಮ ಪ್ರಾಮುಖ್ಯತೆ"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"ಉನ್ನತ ಪ್ರಾಮುಖ್ಯತೆ"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"ಚಿತ್ರದಲ್ಲಿ ಚಿತ್ರ"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"ಚಿತ್ರದಲ್ಲಿ ಚಿತ್ರ"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"ಚಿತ್ರದಲ್ಲಿ ಚಿತ್ರಕ್ಕೆ ಅನುಮತಿಸಿ"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"ನೀವು ಈ ಅಪ್ಲಿಕೇಶನ್ ತೊರೆದ ಬಳಿಕ (ಉದಾಹರಣೆಗೆ, ವೀಡಿಯೊ ನೋಡಲು), ಅಪ್ಲಿಕೇಶನ್ ತೆರೆದೇ ಇರುವಾಗ ಚಿತ್ರದಲ್ಲಿ ಚಿತ್ರ ವಿಂಡೋ ರಚಿಸಲು ಈ ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿ ನೀಡಿ. ನೀವು ಬಳಸುವ ಇತರ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಮೇಲೆ ಈ ವಿಂಡೋ ಡಿಸ್‌ಪ್ಲೇ ಆಗುತ್ತದೆ."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"ನೀವು ಈ ಅಪ್ಲಿಕೇಶನ್ ತೊರೆದ ಬಳಿಕ (ಉದಾಹರಣೆಗೆ, ವೀಡಿಯೊ ನೋಡಲು), ಅಪ್ಲಿಕೇಶನ್ ತೆರೆದೇ ಇರುವಾಗ ಚಿತ್ರದಲ್ಲಿ ಚಿತ್ರ ವಿಂಡೋ ರಚಿಸಲು ಈ ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿ ನೀಡಿ. ನೀವು ಬಳಸುವ ಇತರ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಮೇಲೆ ಈ ವಿಂಡೋ ಡಿಸ್‌ಪ್ಲೇ ಆಗುತ್ತದೆ."</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>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"ಫೈಲ್‌ಗಳನ್ನು ವರ್ಗಾಯಿಸುವುದು"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"ಫೋಟೋಗಳನ್ನು ವರ್ಗಾಯಿಸುವುದು (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"MIDI ರೀತಿಯ ಸಾಧನಗಳನ್ನು ಬಳಸುವುದು"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"ಎಸ್‌ಎಂಎಸ್ ಪ್ರತಿಬಿಂಬಿಸುವಿಕೆ"</string>
     <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>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"ನೈಟ್ ಲೈಟ್ ವೇಳಾಪಟ್ಟಿಯನ್ನು ಹೊಂದಿಸಿ"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"ನಿದ್ರೆಗಾಗಿ, ಪರದೆಗೆ ಆಂಬರ್ ಟಿಂಟ್"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"ನೈಟ್ ಲೈಟ್ ಆನ್ ಆಗಿದೆ"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"ಪರದೆಯನ್ನು ಆಂಬರ್ ಬಣ್ಣದಿಂದ ಟಿಂಟ್ ಮಾಡಲಾಗಿದೆ. ಇದು ನಿಮಗೆ ನಿದ್ರಿಸಲು ಸಹಾಯ ಮಾಡಬಹುದು."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"ಸಲಹೆಗಳು"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"ತಂಪಾದ ಪ್ರದರ್ಶನ ಬಣ್ಣಗಳನ್ನು ಬಳಸಿ"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"ಬಣ್ಣದ ಬದಲಾವಣೆಯನ್ನು ಅನ್ವಯಿಸಲು, ಪರದೆ ಆಫ್ ಮಾಡಿ"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"ದೂರವಾಣಿ ಮಾನಿಟರ್ ಬದಲಾವಣೆಯನ್ನು ಅನ್ವಯಿಸಲು, ಸಾಧನವನ್ನು ರೀಬೂಟ್ ಮಾಡಿ"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HAL HDR+ ಕ್ಯಾಮೆರಾ"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"HAL HDR+ ಕ್ಯಾಮೆರಾ ಬದಲಾವಣೆಯನ್ನು ಅನ್ವಯಿಸಲು, ಸಾಧನವನ್ನು ರೀಬೂಟ್ ಮಾಡಿ"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"ಕ್ಯಾಮೆರಾ ಲೇಸರ್ ಸೆನ್ಸಾರ್"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ಸ್ವಯಂಚಾಲಿತ ಸಿಸ್ಟಂ ಅಪ್‌ಡೇಟ್‌ಗಳು"</string>
     <string name="usage" msgid="2977875522080448986">"ಬಳಕೆ"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"ಮೊಬೈಲ್ ಡೇಟಾ ಬಳಕೆ"</string>
@@ -3410,7 +3427,7 @@
     <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="data_usage_template" msgid="2923744765873163859">"<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">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"ಅಳಿಸಿ ಮತ್ತು ಪರಿವರ್ತಿಸು"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager ನ ದರ-ಮಿತಿಗೊಳಿಸುವಿಕೆಯನ್ನು ಮರುಹೊಂದಿಸಿ"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager ದರ-ಮಿತಿಗೊಳಿಸುವಿಕೆಯನ್ನು ಮರುಹೊಂದಿಸಲಾಗಿದೆ"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"ಲಾಕ್‌ ಪರದೆಯ ಅಧಿಸೂಚನೆಗಳನ್ನು ನಿಯಂತ್ರಿಸಿ"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"ಲಾಕ್ ಪರದೆಯ ಮೇಲೆ ನಿಯಂತ್ರಣದ ಮಾಹಿತಿ"</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="8483187649355540109">"ಬೆಂಬಲ ಮತ್ತು ಸಲಹೆಗಳು"</string>
@@ -3487,7 +3504,7 @@
     <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="2456198532288640046">"ಇತರ ಸಾಧನಗಳಿಗೆ ಕಾಣಿಸುವುದಿಲ್ಲ"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"ಆಫ್"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕಿಸಲಾಗಿದೆ"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"ಹಲವು ಸಾಧನಗಳಿಗೆ ಸಂಪರ್ಕಿಸಲಾಗಿದೆ"</string>
     <string name="demo_mode" msgid="2798762752209330277">"ಸಿಸ್ಟಂ UI ಡೆಮೋ ಮೋಡ್"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"ತತ್‌ಕ್ಷಣ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಸ್ಥಾಪಿಸಿರದಿದ್ದರೂ, ಲಿಂಕ್‌ಗಳನ್ನು ಅಪ್ಲಿಕೇಶನ್‌ಗಳಲ್ಲಿ ತೆರೆಯಿರಿ"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"ತತ್‌ಕ್ಷಣ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"ತತ್‌ಕ್ಷಣ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಖಾತೆ"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"ತ್ವರಿತ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಆದ್ಯತೆಗಳು"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ಸ್ಥಾಪಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"ನಿಮ್ಮ ಸಂಗ್ರಹಣೆಯು ಈಗ ಸಂಗ್ರಹಣೆ ನಿರ್ವಾಹಕರಿಂದ ನಿರ್ವಹಿಸಿಲಾಗುತ್ತಿದೆ"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> ಅವರಿಗಾಗಿ ಖಾತೆಗಳು"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಪ್ರೊಫೈಲ್‌ನಲ್ಲಿ VPN ನಲ್ಲಿ ಯಾವಾಗಲೂ ಆನ್‌ ಆಗಿರಿ ಎಂಬುದನ್ನು ಆನ್ ಮಾಡಿ"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್‌ನಲ್ಲಿ VPN ನಲ್ಲಿ ಯಾವಾಗಲೂ ಆನ್‌ ಆಗಿರಿ ಎಂಬುದನ್ನು ಆನ್ ಮಾಡಿ"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"ಜಾಗತಿಕ HTTP ಪ್ರಾಕ್ಸಿ ಸೆಟ್"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"ವಿಶ್ವಾಸಾರ್ಹ ರುಜುವಾತುಗಳು"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"ವಿಶ್ವಾಸಾರ್ಹ ರುಜುವಾತುಗಳು"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಪ್ರೊಫೈಲ್‌ನಲ್ಲಿರುವ ವಿಶ್ವಾಸಾರ್ಹ ರುಜುವಾತುಗಳು"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"ನಿಮ್ಮ ಕಚೇರಿ ಪ್ರೊಫೈಲ್‌ನಲ್ಲಿರುವ ವಿಶ್ವಾಸಾರ್ಹ ರುಜುವಾತುಗಳು"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">ಕನಿಷ್ಠ <xliff:g id="COUNT_1">%d</xliff:g> CA ಪ್ರಮಾಣಪತ್ರಗಳು</item>
       <item quantity="other">ಕನಿಷ್ಠ <xliff:g id="COUNT_1">%d</xliff:g> CA ಪ್ರಮಾಣಪತ್ರಗಳು</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"ವಾಹಕ ಪೂರೈಕೆಯ ಮಾಹಿತಿ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ಟ್ರಿಗ್ಗರ್ ವಾಹಕ ಪೂರೈಕೆ"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"ಆಕರ್ಷಕವಾಗಿ ಮತ್ತು ಹೊಸದಾಗಿ ಏನಿದೆ?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ಟಾಪ್ 5 ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಪರಿಶೀಲಿಸಿ"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"ನಿಮ್ಮ ಹೊಸ ಫೋನ್‌ನ ಬಳಕೆಯನ್ನು ಪ್ರಾರಂಭಿಸಿ"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ನಿಮ್ಮ ಹೊಸ ಟ್ಯಾಬ್ಲೆಟ್‌ನ ಬಳಕೆ ಪ್ರಾರಂಭಿಸಿ"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"ನಿಮ್ಮ ಹೊಸ ಸಾಧನದ ಬಳಕೆಯನ್ನು ಪ್ರಾರಂಭಿಸಿ"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"ಈ ಸಾಧನದಲ್ಲಿ ಈ ವೀಡಿಯೊ ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS ನೋಂದಣಿ ಸ್ಥಿತಿ"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"ನೋಂದಾಯಿಸಲಾಗಿದೆ"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"ನೋಂದಾಯಿಸಲಾಗಿಲ್ಲ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 51a1a8e..ae3ad74 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s이(가) 메시지에 액세스하려고 합니다. %2$s에 액세스 권한을 제공하시겠습니까?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM 액세스 요청"</string>
     <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="bluetooth_device_name_summary" msgid="4757990010751789977">"다른 기기에 \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\'(으)로 표시"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"다른 기기에 \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\'(으)로 표시됩니다."</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"내 기기"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"새 기기와 페어링"</string>
     <string name="date_and_time" msgid="9062980487860757694">"날짜 및 시간"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"다음"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"지문 설정을 건너뛰시겠습니까?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"지문 설정에는 1~2분 정도밖에 걸리지 않습니다. 이 과정을 건너뛰면 나중에 설정에서 지문을 추가할 수 있습니다."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"화면 잠금 설정을 건너뛰시겠습니까?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"기기 보호 기능이 사용 설정되지 않습니다. 분실, 도난 또는 재설정되었을 때 다른 사람이 이 태블릿을 사용하는 것을 방지할 수 없습니다."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"기기 보호 기능이 사용 설정되지 않습니다. 분실, 도난 또는 재설정되었을 때 다른 사람이 이 기기를 사용하는 것을 방지할 수 없습니다."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"기기 보호 기능이 사용 설정되지 않습니다. 분실, 도난 또는 재설정되었을 때 다른 사람이 이 휴대전화를 사용하는 것을 방지할 수 없습니다."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"최대 개수의 지문을 추가했습니다."</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"지문을 추가할 수 없습니다."</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"모든 지문을 삭제할까요?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' 삭제"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"이 지문을 삭제하시겠습니까?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"지문을 사용하여 휴대전화를 잠금 해제하거나 구매를 승인하거나 앱에 로그인할 수 없게 됩니다."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"지문을 사용하여 직장 프로필을 잠금 해제하거나 구매를 승인하거나 직장 앱에 로그인할 수 없게 됩니다."</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"삭제"</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"보안을 강화하려면 백업 화면 잠금을 설정하세요."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"보안을 강화하려면 백업 화면 잠금을 설정하세요."</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>
@@ -497,35 +502,35 @@
     <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_fingerprint" msgid="8212242533942400457">"기기 보호 기능은 패턴 없이 작동하지 않습니다. <xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"기기 보호 기능은 패턴 없이 작동하지 않습니다.<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_fingerprint" msgid="875669051899437197">"기기 보호 기능은 PIN이 있어야만 작동합니다.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"기기 보호 기능은 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_fingerprint" msgid="2228159168587170445">"기기 보호 기능은 비밀번호 없이 작동하지 않습니다. <xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"기기 보호 기능은 비밀번호 없이 작동하지 않습니다.<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_fingerprint" msgid="6363091330281670692">"기기 보호 기능은 화면 잠금 없이 작동하지 않습니다. <xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"기기 보호 기능은 화면 잠금 없이 작동하지 않습니다.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>저장된 지문 파일이 이 기기에서 삭제되며 지문을 이용해 휴대전화의 잠금을 해제하거나, 구매를 승인하거나, 앱에 로그인할 수 없게 됩니다."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"프로필 보호 기능은 패턴 없이 작동하지 않습니다."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"프로필 보호 기능은 패턴 없이 작동하지 않습니다.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"프로필 보호 기능은 패턴 없이 작동하지 않습니다.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>저장된 지문 파일이 이 프로필에서 삭제되며 지문을 이용해 프로필의 잠금을 해제하거나, 구매를 승인하거나, 앱에 로그인할 수 없게 됩니다."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"프로필 보호 기능은 PIN 없이 작동하지 않습니다."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"프로필 보호 기능은 PIN 없이 작동하지 않습니다.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"프로필 보호 기능은 PIN 없이 작동하지 않습니다.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>저장된 지문 파일이 이 프로필에서 삭제되며 지문을 이용해 프로필의 잠금을 해제하거나, 구매를 승인하거나, 앱에 로그인할 수 없게 됩니다."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"프로필 보호 기능은 비밀번호 없이 작동하지 않습니다."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"프로필 보호 기능은 비밀번호 없이 작동하지 않습니다.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"프로필 보호 기능은 비밀번호 없이 작동하지 않습니다.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>저장된 지문 파일이 이 프로필에서 삭제되며 지문을 이용해 프로필의 잠금을 해제하거나, 구매를 승인하거나, 앱에 로그인할 수 없게 됩니다."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"프로필 보호 기능은 화면 잠금 없이 작동하지 않습니다."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"프로필 보호 기능은 화면 잠금 없이 작동하지 않습니다.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"프로필 보호 기능은 화면 잠금 없이 작동하지 않습니다.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>저장된 지문 파일이 이 프로필에서 삭제되며 지문을 이용해 프로필의 잠금을 해제하거나, 구매를 승인하거나, 앱에 로그인할 수 없게 됩니다."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"삭제"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"연속으로 올라가거나 내려가는 숫자 또는 반복되는 숫자의 배열은 허용되지 않습니다."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"확인"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"취소"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"지우기"</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>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS 사용 가능"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS 사용 가능)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"네트워크 비밀번호 입력"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"이동통신사 Wi‑Fi 네트워크"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g>(을)를 통해 연결"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"위치 정확성 개선 등의 목적으로 <xliff:g id="APP_NAME">%1$s</xliff:g>에서 Wi-Fi가 꺼져 있을 때에도 네트워크 검색을 사용하도록 설정하려 합니다.\n\n검색하려는 모든 앱에 대해 이를 허용하시겠습니까?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"이 기능을 사용 중지하려면 더보기 메뉴에서 고급으로 이동하세요."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"허용"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"연결"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"네트워크 연결 실패"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"저장 안함"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"수정"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"네트워크 기록 삭제 실패"</string>
     <string name="wifi_save" msgid="3331121567988522826">"저장"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"네트워크 저장 실패"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"고급 Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC 주소"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP 주소"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"네트워크 정보"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"서브넷 마스크"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 주소"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"초대를 취소하시겠습니까?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g>와(과) 연결하려는 초대를 취소하시겠습니까?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"이 그룹을 삭제할까요?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"휴대용 Wi-Fi 핫스팟"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi 핫스팟"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"다른 기기와 인터넷 또는 콘텐츠를 공유하지 않음"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"핫스팟을 통해 태블릿의 인터넷 연결 공유 중"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"핫스팟을 통해 휴대전화의 인터넷 연결 공유 중"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"앱에서 콘텐츠를 공유하지 않습니다. 인터넷 연결을 공유하려면 핫스팟을 껐다가 켜세요."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi 이름"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"핫스팟 이름"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> 켜는 중..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"다른 기기에서 <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>에 연결할 수 있습니다."</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi 비밀번호"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"핫스팟 비밀번호"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP 대역"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"핫스팟을 사용하여 다른 기기에서 사용할 수 있는 Wi‑Fi 네트워크를 만드세요. 핫스팟은 내 모바일 데이터 연결을 사용하여 인터넷을 제공합니다. 추가 모바일 데이터 요금이 부과될 수 있습니다."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"앱에서 핫스팟을 만들어 주변 기기와 콘텐츠를 공유할 수 있습니다."</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi 통화가 켜져 있으면 휴대전화에서 환경설정과 신호 강도에 따라 Wi-Fi 네트워크나 데이터 네트워크를 통해 통화를 연결할 수 있습니다. 이 기능을 사용하기 전에 이동통신사에 문의하여 요금과 기타 세부정보를 알아보세요."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"긴급 주소 업데이트"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"Wi-Fi를 통해 119에 전화를 걸 때 응급 서비스에서 내 위치로 사용한 주소"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"Wi-Fi를 통해 긴급 전화를 걸 때 응급 서비스에서 내 위치로 사용할 주소"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"디스플레이"</string>
     <string name="sound_settings" msgid="5534671337768745343">"소리"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"볼륨"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"검색"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"검색 설정 및 기록 관리"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"검색결과 없음"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"기록 삭제"</string>
     <string name="display_settings" msgid="7965901687241669598">"디스플레이"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"자동 화면 회전"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"선명한 색상"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"기본 APN 설정 복원 중"</string>
     <string name="menu_restore" msgid="8260067415075573273">"초기화"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"기본 APN 설정을 초기화했습니다."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"재설정"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"네트워크 설정 초기화"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"옵션 재설정"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"네트워크, 앱, 기기가 재설정될 수 있습니다."</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi, 모바일, 블루투스 재설정"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"이렇게 하면 다음을 포함한 모든 네트워크 설정이 재설정됩니다.\n\n"<li>"Wi‑Fi"</li>\n<li>"모바일 데이터"</li>\n<li>"블루투스"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"설정 초기화"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"모든 네트워크 설정을 초기화하시겠습니까? 수행한 후에는 작업을 취소할 수 없습니다."</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"초기화하시겠습니까?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"네트워크 재설정 권한이 없는 사용자입니다."</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"네트워크 설정이 재설정되었습니다."</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"초기화"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other">계정 <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g>개가 재설정됨</item>
-      <item quantity="one">계정 1개가 재설정됨</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"내부 저장소 및 모든 데이터가 재설정됩니다."</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"모든 데이터 삭제(초기화)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"공장 초기화하면 태블릿의 "<b>"내부 저장소의 모든 데이터가 삭제됩니다."</b>\n\n<li>"Google 계정"</li>\n<li>"시스템과 앱 데이터 및 설정"</li>\n<li>"다운로드된 앱"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"공장 초기화하면 다음을 포함한 휴대전화 "<b>"내부 저장소"</b>"의 모든 데이터가 삭제됩니다.\n\n"<li>"Google 계정"</li>\n<li>"시스템과 앱 데이터 및 설정"</li>\n<li>"다운로드된 앱"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"현재 로그인한 계정:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"안전 정보"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"데이터 서비스에 연결되어 있지 않습니다. 지금 정보를 보려면 인터넷에 연결된 컴퓨터에서 %s(으)로 이동하세요."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"로드 중..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"비밀번호 선택"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"화면 잠금 설정"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"보안을 위해 비밀번호를 설정하세요."</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"비밀번호를 설정하여 지문 사용"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"패턴 선택"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"지문 사용 전 입력할 패턴 설정"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PIN 선택"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"보안을 위해 PIN을 설정하세요."</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"PIN을 설정하여 지문 사용"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"비밀번호 확인"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"비밀번호 다시 입력"</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_pin_header" msgid="7744513791910572550">"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>
@@ -1483,12 +1490,18 @@
     <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_strong_auth_required_device_pattern" msgid="530802132223800623">"보안을 강화하려면 기기 패턴을 사용하세요."</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"보안을 강화하려면 기기 PIN을 입력하세요."</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"보안을 강화하려면 기기 비밀번호를 입력하세요."</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"보안을 강화하려면 직장 패턴을 사용하세요."</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"보안을 강화하려면 직장 PIN을 사용하세요."</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"보안을 강화하려면 직장 비밀번호를 입력하세요."</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"휴대전화가 초기화되었습니다. 이 기기를 사용하려면 이전 패턴을 입력하세요."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"휴대전화가 초기화되었습니다. 이 기기를 사용하려면 이전 PIN을 입력하세요."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"휴대전화가 초기화되었습니다. 이 기기를 사용하려면 이전 비밀번호를 입력하세요."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"패턴 확인"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"PIN 확인"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"비밀번호 확인"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"잘못된 PIN입니다."</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"잘못된 비밀번호입니다."</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"잘못된 패턴입니다."</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"위젯을 만들고 액세스를 허용하시겠습니까?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"위젯을 만든 다음에는 <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>에서 위젯이 표시하는 모든 데이터에 액세스할 수 있습니다."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>에서 위젯을 만들고 자체 데이터에 액세스할 수 있도록 항상 허용"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>일 <xliff:g id="HOURS">%2$d</xliff:g>시간 <xliff:g id="MINUTES">%3$d</xliff:g>분 <xliff:g id="SECONDS">%4$d</xliff:g>초"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>시간 <xliff:g id="MINUTES">%2$d</xliff:g>분 <xliff:g id="SECONDS">%3$d</xliff:g>초"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>분 <xliff:g id="SECONDS">%2$d</xliff:g>초"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>초"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"사용 통계"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"사용 통계"</string>
     <string name="display_order_text" msgid="8592776965827565271">"정렬 기준:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"스크린 리더, 디스플레이, 상호작용 컨트롤"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"보기 설정"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"필요에 따라 기기를 맞춤설정할 수 있습니다. 다음 접근성 기능은 언제든지 설정에서 변경할 수 있습니다."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"글꼴 크기 확대"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"글꼴 크기 변경"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"스크린 리더"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"오디오 및 화면에 있는 텍스트"</string>
     <string name="display_category_title" msgid="685461049938269166">"디스플레이"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"확대/축소하려면"</b>" 화면을 빠르게 세 번 탭합니다.\n"<ul><li>"스크롤하려면 2개 이상의 손가락으로 드래그합니다."</li>\n<li>"확대/축소 수준을 조정하려면 2개 이상의 손가락을 오므립니다."</li></ul>\n\n<b>"일시적으로 확대/축소하려면"</b>" 화면을 빠르게 세 번 탭하고 세 번째 탭에서 길게 누릅니다.\n"<ul><li>"화면에서 이동하려면 드래그합니다."</li>\n<li>"축소하려면 손가락을 뗍니다."</li></ul>\n\n"키보드나 탐색 메뉴는 확대할 수 없습니다."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"확대가 사용 설정되어 있을 때 화면 하단의 접근성 버튼을 사용하면 빠르게 확대할 수 있습니다.\n\n"<b>"확대/축소하려면"</b>" 접근성 버튼을 탭한 다음 화면의 아무 곳이나 탭합니다.\n"<ul><li>"스크롤하려면 2개 이상의 손가락으로 드래그합니다."</li>\n<li>"확대/축소 수준을 조정하려면 2개 이상의 손가락을 오므립니다."</li></ul>\n\n<b>"일시적으로 확대/축소"</b>"하려면 접근성 버튼을 탭한 다음 화면의 아무 곳이나 길게 터치합니다.\n"<ul><li>"화면에서 이동하려면 드래그합니다."</li>\n<li>"축소하려면 손가락을 뗍니다."</li></ul>\n\n"키보드나 탐색 메뉴는 확대할 수 없습니다."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"접근성 버튼이 <xliff:g id="SERVICE">%1$s</xliff:g>(으)로 설정되어 있습니다. 확대를 사용하려면 접근성 버튼을 길게 터치한 다음 확대를 선택하세요."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"접근성 단축키"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"볼륨 키 단축키"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"단축키 서비스"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"잠금 화면에서 허용"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"단축키가 사용 설정되어 있는 경우 볼륨 버튼 2개를 동시에 3초 동안 눌러 접근성 기능을 시작할 수 있습니다."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"단축키가 사용 설정되어 있는 경우 볼륨키 2개를 동시에 3초 동안 눌러 접근성 기능을 시작할 수 있습니다."</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">"화면 확대 자동 업데이트"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"앱 전환 시 화면 확대 업데이트"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"성능에 영향을 미칠 수 있음"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"포인터 이동이 멈춘 뒤 클릭"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"지연 후 클릭"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"사용"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"사용 안함"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"빠른 설정에 표시"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g>개 중 <xliff:g id="NUMBER">%1$d</xliff:g>개가 선택됨"</string>
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"요금제 관리"</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>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"모바일 네트워크"</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_metered_auto" msgid="1262028400911918865">"자동"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"데이터 전송량 제한 있음"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"데이터 전송량 제한 없음"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"이동통신사 데이터 사용량 계산은 기기와 다를 수 있습니다."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"긴급 전화"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"통화로 돌아가기"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"통화 관리자"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"긴급 방송"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"긴급 경보"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"네트워크 이동통신사"</string>
     <string name="access_point_names" msgid="1381602020438634481">"액세스포인트 네임(APN)"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"향상된 4G LTE 모드"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"다음 작업에 대하여 선호하는 SIM"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"항상 확인"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"선택 필요"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"SIM 선택"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"설정"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">%d개의 숨겨진 항목 표시</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"앱 알림"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"알림 카테고리"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"중요도"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"앱에서 결정"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"소리 허용"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"알림 표시 안함"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"소리나 시각적인 방해 없음"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"소리 안 남"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"소리로 알림"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"소리 및 화면 표시로 알림"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"화면 표시로 알림"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"낮음"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"보통"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"높음"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"긴급"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"소리 허용"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"현재 화면에서 소리, 진동, 알림 표시를 허용하지 않습니다."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"알림 허용"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"앱의 소리, 진동, 화면 알림 표시 허용"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"중요도 낮음"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"중요도 보통"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"중요도 높음"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"PIP 모드"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"PIP 모드"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"PIP 모드 허용"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"앱이 열려 있을 때나 사용자가 앱에서 나갔을 때(예: 동영상 시청을 계속하기 위해) 이 앱에서 PIP 창을 표시하도록 허용합니다. 이 창은 사용 중인 다른 앱 위에 표시됩니다."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"앱이 열려 있을 때나 사용자가 앱에서 나갔을 때 이 앱에서 PIP 창을 표시하도록 허용합니다(예: 동영상 시청을 계속하기 위해). 이 창은 사용 중인 다른 앱 위에 표시됩니다."</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>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"파일 전송 중"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"사진 전송 중(PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"기기를 MIDI로 사용"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS 미러링"</string>
     <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>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"야간 조명 시간 설정"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"편안한 수면을 위해 화면을 황색으로 변경"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"야간 조명 켜짐"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"화면에 황색광이 적용됩니다. 이렇게 하면 수면 방해 효과가 줄어듭니다."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"추천"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"더 차가운 디스플레이 색상 사용"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"색상 변경을 적용하려면 화면을 끄세요."</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"통신 모니터의 변경사항을 적용하려면 기기를 재부팅하세요."</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"카메라 HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"카메라 HAL HDR+의 변경사항을 적용하려면 기기를 재부팅하세요."</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"카메라 레이저 센서"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"자동 시스템 업데이트"</string>
     <string name="usage" msgid="2977875522080448986">"사용량"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"모바일 데이터 사용량"</string>
@@ -3410,7 +3427,7 @@
     <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_2">%2$s</xliff:g>에 <xliff:g id="ID_1">%1$s</xliff:g> 사용함"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g>에 <xliff:g id="ID_1">%1$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">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"삭제 및 변환"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager 대역 제한 기능 재설정"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager 대역 제한 기능이 재설정되었습니다."</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"잠금 화면 알림 제어"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"잠금 화면에서 정보 제어"</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="8483187649355540109">"지원 및 도움말"</string>
@@ -3487,7 +3504,7 @@
     <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="2456198532288640046">"다른 기기에서 보이지 않음"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"사용 안함"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g>에 연결됨"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"여러 기기에 연결됨"</string>
     <string name="demo_mode" msgid="2798762752209330277">"시스템 UI 데모 모드"</string>
@@ -3561,12 +3578,12 @@
     <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"휴대전화를 두 번 돌려 셀카 모드를 실행합니다."</string>
     <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"태블릿을 두 번 돌려 셀카 모드를 실행합니다."</string>
     <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"기기를 두 번 돌려 셀카 모드를 실행합니다."</string>
-    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"두 번 탭하여 스마트폰 확인"</string>
+    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"두 번 탭하여 휴대전화 확인"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"두 번 탭하여 태블릿 확인"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"두 번 탭하여 기기 확인"</string>
     <string name="ambient_display_summary" msgid="525662960806416373">"시간, 알림 아이콘, 기타 정보를 확인하려면 화면을 두 번 탭하세요."</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"화면이 꺼져 있을 때도 알림을 확인할 수 있습니다."</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"들어서 스마트폰 확인"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"들어올려 휴대전화 확인"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"들어서 태블릿 확인"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"들어서 기기 확인"</string>
     <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"시간, 알림 아이콘 등의 정보를 확인하려면 휴대전화를 들어 올리세요."</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"인스턴트 앱"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"앱이 설치되어 있지 않아도 앱에서 링크 열기"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"인스턴트 앱"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"인스턴트 앱 계정"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"인스턴트 앱 환경설정"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"설치된 앱"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"현재 저장용량 관리자가 저장용량을 관리하고 있습니다."</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g>님의 계정"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"개인 프로필에 연결 유지 VPN 사용 설정됨"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"직장 프로필에 연결 유지 VPN 사용 설정됨"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"전체 HTTP 프록시 설정됨"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"신뢰할 수 있는 사용자 인증 정보"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"신뢰할 수 있는 사용자 인증 정보"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"개인 프로필에서 신뢰할 수 있는 사용자 인증 정보"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"직장 프로필에서 신뢰할 수 있는 사용자 인증 정보"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">CA 인증서 최소 <xliff:g id="COUNT_1">%d</xliff:g>개</item>
       <item quantity="one">CA 인증서 최소 <xliff:g id="COUNT_0">%d</xliff:g>개</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Carrier Provisioning Info"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Carrier Provisioning"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"흥미로운 새 기능 살펴보기"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"5가지 주요 기능 확인하기"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"새 휴대전화 둘러보기"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"새 태블릿 둘러보기"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"새 기기 둘러보기"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"이 기기에서 지원하지 않는 기능입니다."</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS 등록 상태"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"등록됨"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"등록되지 않음"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index b499634..1f48df5 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -165,7 +165,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s сиздин баарлашуу билдирүүлөрүңүзгө жеткиси келет. %2$s уруксат берилсинби?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM карта пайдалануу мүмкүнчүлүгүн суроо"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> SIM картаңызды пайдалануу мүмкүнчүлүгүнө ээ болгусу келет. SIM картаны пайдалануу укугу берилсе, түзмөк SIM картага туташып жатканда дайындарды мобилдик тармак аркылуу өткөрүү кызматтары убактылуу иштебей калат. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> түзмөгүнө SIM картаны пайдалануу мүмкүнчүлүгүн берүү"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Башка түзмөктөргө <xliff:g id="DEVICE_NAME">^1</xliff:g> деп көрүнөт"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Башка түзмөктөргө \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" деп көрүнөт"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Түзмөктөрүңүз"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Жаңы түзмөктү жупташтыруу"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Күн жана убакыт"</string>
@@ -371,6 +371,9 @@
     <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="1961957425135180242">"Кийинки"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Манжа изин жөндөбөйсүзбү?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Манжа изин жөндөө бир-эки эле мүнөткө созулат. Азыр өткөрүп жиберсеңиз, манжа изиңизди кийинчерээк кошсоңуз болот."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Экран кулпусун жөндөбөйсүзбү?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт. Эгер планшет жоголуп же уурдалып кетсе, же баштапкы абалга келтирилсе, башкалар аны пайдалана беришет."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт. Эгер түзмөк жоголуп же уурдалып кетсе, же баштапкы абалга келтирилсе, башкалар аны пайдалана беришет."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт. Эгер телефон жоголуп же уурдалып кетсе, же баштапкы абалга келтирилсе, башкалар аны пайдалана беришет."</string>
@@ -410,6 +413,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Кошулган манжа издеринин саны жогорку чегине жетти"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Дагы манжа издерин кошуу мүмкүн эмес"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Бардык манжа издери алынып салнснб?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"\"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" манжа изин алып салуу"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Бул манжа изин жок кыласызбы?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Телефонуңуздун кулпусун ачып, сатып алууга уруксат берип же колдонмолорго кирүү үчүн манжа издерин башка колдоно албай каласыз"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Жумуш профилиңиздин кулпусун ачып, сатып алууга уруксат берип же жумуштагы колдонмолорго кирүү үчүн манжа издерин башка колдоно албай каласыз"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Ооба, алынып салынсн"</string>
@@ -454,7 +459,7 @@
     <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="5585650064305600578">"Кошумча коопсуздук үчүн көмөкчү экран кулпусун жөндөп коюңуз."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Кошумча коопсуздук үчүн көмөкчү экран кулпусун жөндөп коюңуз."</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>
@@ -496,37 +501,37 @@
     <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_fingerprint" msgid="8212242533942400457">"Кулпуну ачуучу сүрөт үлгүңүзсүз түзмөктү коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Графикалык ачкычыңызсыз түзмөгүңүздү коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сакталган манжа издериңиз да бул түзмөктөн алынып салынат жана алар менен телефонуңуздун кулпусун ачып, сатып алууга уруксат берип же каттоо эсебине кире албай каласыз.\""</string>
+</xliff:g>Сакталган манжа издериңиз да бул түзмөктөн алынып салынат жана алардын жардамы менен түзмөгүңүздүн кулпусун ачып, ар кандай нерселерди сатып алып же каттоо эсебине кире албай каласыз."</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">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"PIN кодуңузсуз түзмөктү коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сакталган манжа издериңиз да бул түзмөктөн алынып салынат жана алар менен телефонуңуздун кулпусун ачып, сатып алууга уруксат берип же каттоо эсебине кире албай каласыз.\""</string>
+</xliff:g>Сакталган манжа издериңиз да бул түзмөктөн алынып салынат жана алардын жардамы менен түзмөгүңүздүн кулпусун ачып, ар кандай нерселерди сатып алып же каттоо эсебине кире албай каласыз."</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Сырсөзүңүзсүз түзмөктү коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сакталган манжа издериңиз да бул түзмөктөн алынып салынат жана алар менен телефонуңуздун кулпусун ачып, сатып алууга уруксат берип же каттоо эсебине кире албай каласыз.\""</string>
+</xliff:g>Сакталган манжа издериңиз да бул түзмөктөн алынып салынат жана алар менен телефонуңуздун кулпусун ачып, сатып алууга уруксат берип же каттоо эсебине кире албай каласыз."</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Экраныңыздын кулпусусуз түзмөктү коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сакталган манжа издериңиз да бул түзмөктөн алынып салынат жана алар менен телефонуңуздун кулпусун ачып, сатып алууга уруксат берип же каттоо эсебине кире албай каласыз.\""</string>
+</xliff:g>Сакталган манжа издериңиз да бул түзмөктөн алынып салынат жана алардын жардамы менен түзмөгүңүздүн кулпусун ачып, ар кандай нерселерди сатып алып же каттоо эсебине кире албай каласыз."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Графикалык ачкычыңызсыз профилди коргоо функциялары иштебейт."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Графикалык ачкычыңызсыз профилди коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Графикалык ачкычыңызсыз профилди коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сакталган манжа издериңиз да бул профилден алынып салынат жана алардын жардамы менен профилиңиздин кулпусун ачып, ар кандай нерселерди сатып алып же каттоо эсебине кире албай каласыз.\""</string>
+</xliff:g>Сакталган манжа издериңиз да бул профилден алынып салынат жана алардын жардамы менен профилиңиздин кулпусун ачып, ар кандай нерселерди сатып алып же каттоо эсебине кире албай каласыз."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"PIN кодуңузсуз профилди коргоо функциялары иштебейт."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"PIN кодуңузсуз профилди коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"PIN кодуңузсуз профилди коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сакталган манжа издериңиз да бул профилден алынып салынат жана алардын жардамы менен профилиңиздин кулпусун ачып, ар кандай нерселерди сатып алып же каттоо эсебине кире албай каласыз.\""</string>
+</xliff:g>Сакталган манжа издериңиз да бул профилден алынып салынат жана алардын жардамы менен профилиңиздин кулпусун ачып, ар кандай нерселерди сатып алып же каттоо эсебине кире албай каласыз."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Сырсөзүңүзсүз профилди коргоо функциялары иштебейт."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Сырсөзүңүзсүз профилди коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Сырсөзүңүзсүз профилди коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сакталган манжа издериңиз да бул профилден алынып салынат жана алардын жардамы менен профилиңиздин кулпусун ачып, ар кандай нерселерди сатып алып же каттоо эсебине кире албай каласыз.\""</string>
+</xliff:g>Сакталган манжа издериңиз да бул профилден алынып салынат жана алардын жардамы менен профилиңиздин кулпусун ачып, ар кандай нерселерди сатып алып же каттоо эсебине кире албай каласыз."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Экраныңыздын кулпусусуз профилди коргоо функциялары иштебейт."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Экраныңыздын кулпусусуз профилди коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Экраныңыздын кулпусусуз профилди коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сакталган манжа издериңиз да бул профилден алынып салынат жана алардын жардамы менен профилиңиздин кулпусун ачып, ар кандай нерселерди сатып алып же каттоо эсебине кире албай каласыз.\""</string>
+</xliff:g>Сакталган манжа издериңиз да бул профилден алынып салынат жана алардын жардамы менен профилиңиздин кулпусун ачып, ар кандай нерселерди сатып алып же каттоо эсебине кире албай каласыз."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Ооба, өчүрүлсүн"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Кулпн ачуу үлгсн өзгрт"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Клпн ачуу PIN кдн өзгр"</string>
@@ -585,6 +590,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Сандар чоңойгон, кичирейген же кайталанган ыраатта болбошу керек"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Жарайт"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Жокко чыгаруу"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Тазалоо"</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>
@@ -815,6 +821,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS жеткиликтүү"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS жеткиликтүү)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Тармактагы сырсөзүңүздү киргизиңиз"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Оператордун Wi‑Fi тармагы"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> аркылуу туташуу"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Жайгаштыруунун тактыгын жогорулатуу жана башка максаттарда, Wi-Fi өчүк болсо да, <xliff:g id="APP_NAME">%1$s</xliff:g> желелерди скандагысы келет.\n\nБардык скандоону кааалаган колдонмолорго уруксат берелсинби?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Муну өчүрүү үчүн, жөндөөлөр менюсунан Өркүндөтүлгөндөргө өтүңүз."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Уруксат"</string>
@@ -832,6 +840,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Туташуу"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Түйүндгө байланышкан жок"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Унутулсун"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Өзгөртүү"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Түйүн унутулган жок"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Сактоо"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Түйүн сакталган жок"</string>
@@ -844,6 +853,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Илгерилетилген Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC дареги"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP дарек"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Тармак жөнүндө маалымат"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Тармак бөлүктөрүнүн маскасы"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 даректери"</string>
@@ -876,16 +886,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Чакыруу жокко чыгарылсынбы?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g> менен байланышууга чакырууну жокко чыгарууну каалайсызбы?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Бул топ унутулсунбу?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Көчмө Wi‑Fi туташуу түйүнү"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi туташуу түйүнү"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Интернет же мазмун башка түзмөктөр менен бөлүшүлгөн жок"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Планшеттин Интернети хотспот аркылуу бөлүшүлүүдө"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Телефондун Интернети хотспот аркылуу бөлүшүлүүдө"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Колдонмо мазмун менен бөлүшүүдө. Интернет байланышы менен бөлүшүү үчүн хотспотту өчүрүп, кайра күйгүзүңүз"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi\'дын аталышы"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Туташуу түйүнүнүн аталышы"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> күйгүзүлүүдө…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Башка түзмөктөр <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> тармагына туташа алышат"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi\'дын сырсөзү"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Туташуу түйүнүнүн сырсөзү"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP жыштыгы"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Башка түзмөктөрүңүз үчүн Wi‑Fi таратуу үчүн хотспот режимин пайдаланыңыз. Хотспот аркылуу башка түзмөктөр сиздин мобилдик Интернетти колдонот. Мобилдик Интернет үчүн кошумча акы алынышы мүмкүн."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Жакын жердеги түзмөктөр менен мазмунду бөлүшүү үчүн колдонмолор хотспот болуп бере алышат."</string>
@@ -937,7 +946,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi чалуу күйгүзүлгөндө, телефонуңуз, жеке жөндөөлөрүңүзгө жана сигналдын күчтүүлүгүнө жараша, чалууларды Wi-Fi тармактары же операторуңуздун тармагы аркылуу багыттай алат. Бул өзгөчөлүктү күйгүзүүдөн мурун, акылары жана башка маалымат боюнча операторуңузга кайрылыңыз."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Өзгөчө кырдаалда кайрыла турган даректи жаңыртуу"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"WiFi аркылуу 911 номерине чалганыңызда куткаруучуларга жайгашкан жериңиз катары көрсөтүлө турган дарек"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"WiFi аркылуу өзгөчө кырдаалдар кызматынын номерине чалганыңызда куткаруучуларга жайгашкан жериңиз катары көрсөтүлө турган дарек"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Үн"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Үн бийиктиги"</string>
@@ -991,6 +1000,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Издөө"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Издөөнүн жөндөөлөрүн жана таржымалын башкаруу"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Бир да натыйжа жок"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Таржымалды тазалоо"</string>
     <string name="display_settings" msgid="7965901687241669598">"Дисплей"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Экранды авто-буруу"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Ачык түстөр"</string>
@@ -1323,8 +1333,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Абалкы APN тууралоолорун кайтарууда."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Баштапкы абалга келтирүү"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Абалкы APN тууралоолорун кайтаруу аяктады."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Баштапкы абалга келтирүү"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Тармак жөндөөлөрүн баштапкы абалга келтирүү"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Баштапкы абалга келтирүү опциялары"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Тармактын, колдонмолордун же түзмөктүн жөндөөлөрүн баштапкы абалга келтирсеңиз болот"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi\'ды, мобилдик түзмөктү жана Bluetooth\'ду баштапкы абалга келтирүү"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Ушуну менен тармактын бардык жөндөөлөрү баштапкы абалга келет. Тактап айтканда: \n\n"<li>"Wi‑Fi"</li>\n<li>"Мобилдик Интернет"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Жөндөөлөрдү баштапкы абалга келтирүү"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Тармак жөндөөлөрүнүн баары баштапкы абалга келтирилсинби? Бул аракетти кайра кайтара албайсыз!"</string>
@@ -1332,12 +1343,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Баштапкы абалга келтирилсинби?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Бул колдонуучу тармакты баштапкы абалына келтире албайт"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Тармак жөндөөлөрү баштапкы абалга келди"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Баштапкы абалга кайтаруу"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> каттоо эсеби баштапкы абалга келтирилет</item>
-      <item quantity="one">1 каттоо эсеби баштапкы абалга келтирилет</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Ички сактагыч жана бардык дайындар баштапкы абалына келтирилет"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Бардык дайындарды тазалоо (заводдук абалына келтирүү)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Планшетиңиздин "<b>"ички сактагычындагы"</b>" бардык дайындар өчүрүлөт, ошону менен катар:\n\n"<li>"Google каттоо эсебиңиз"</li>\n<li>"Тутумдун жана колдонмолордун жөндөөлөрү жана дайындары"</li>\n<li>"Жүктөлүп алынган колдонмолор"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Телефонуңуздун "<b>"ички сактагычындагы"</b>" бардык дайындар өчүрүлөт, ошону менен катар:\n\n"<li>"Google каттоо эсебиңиз"</li>\n<li>"Тутумдун жана колдонмолордун жөндөөлөрү жана дайындары"</li>\n<li>"Жүктөлүп алынган колдонмолор"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Ушул түзмөктөгү каттоо эсептер:\n"</string>
@@ -1390,7 +1396,7 @@
     <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_text" msgid="1522783933230274787">"Сиздин <xliff:g id="CURRENT_APP">%2$s</xliff:g> SMS колдонмоңуз ордуна <xliff:g id="NEW_APP">%1$s</xliff:g> колдонулсунбу?"</string>
+    <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"SMS билдирүүлөрү менен жазышуу үчүн <xliff:g id="CURRENT_APP">%2$s</xliff:g> ордуна <xliff:g id="NEW_APP">%1$s</xliff:g> колдоносузбу?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"<xliff:g id="NEW_APP">%s</xliff:g> SMS колдонмосу болсунбу?"</string>
     <string name="network_scorer_picker_title" msgid="6383879578279046456">"Тармактардын рейтингинин автору"</string>
     <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"Эч бири"</string>
@@ -1461,15 +1467,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Коопсуздук маалыматы"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Сизде азыр интернет-байланыш жок. Бул маалыматтарды азыр көрүш үчүн, интернет байланышы бар компүтерден  %s кирсеңиз болот:"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Жүктөлүүдө…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Сырсөзүңүздү тандаңыз"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Экран кулпусун коюп алыңыз"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Коопсуздук үчүн сырсөз коюп алыңыз"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Манжа изин колдонуу үчүн сырсөздү жөндөңүз"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Графикалык ачкычты тандаңыз"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Манжа изин колдонуу үчүн графикалык ачкычты жөндөңүз"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PIN кодуңузду тандаңыз"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Коопсуздук үчүн PIN код коюп алыңыз"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Манжа изин колдонуу үчүн PIN кодду жөндөңүз"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Сырсөзүңүздү ырастаңыз"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Сырсөзүңүздү кайра киргизиңиз"</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_pin_header" msgid="7744513791910572550">"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>
@@ -1482,12 +1489,18 @@
     <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_strong_auth_required_device_pattern" msgid="530802132223800623">"Кошумча коопсуздук үчүн түзмөгүңүздүн графикалык ачкычын колдонуңуз"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Кошумча коопсуздук үчүн түзмөгүңүздүн PIN кодун киргизиңиз"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Кошумча коопсуздук үчүн түзмөгүңүздүн сырсөзүн киргизиңиз"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Кошумча коопсуздук үчүн жумуш профилиңиздин графикалык ачкычын колдонуңуз"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Кошумча коопсуздук үчүн жумуш профилиңиздин PIN кодун киргизиңиз"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Кошумча коопсуздук үчүн жумуш профилиңиздин сырсөзүн киргизиңиз"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Телефонуңуз заводдук жөндөөлөрүнө кайтарылды. Аны колдонуу үчүн мурунку граф. ачкычты киргизиңиз."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Телефонуңуз заводдук жөндөөлөрүнө кайтарылды. Аны колдонуу үчүн мурунку PIN кодуңузду киргизиңиз."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Телефонуңуз заводдук жөндөөлөрүнө кайтарылды. Аны колдонуу үчүн мурунку сырсөзүңүздү киргизиңиз."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Графикалык ачкычты ырастоо"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"PIN кодду ырастоо"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Сырсөздү ырастоо"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN код туура эмес"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Сырсөз туура эмес"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Үлгү туура эмес"</string>
@@ -1790,13 +1803,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Виджет түзүлүп жана ага жетки берилсинби?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Сиз виджетти түзгөндөн кийин, ал көргөзгөн бардык берилиштерге <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> жете алат."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> виджеттерди түзгөнгө жана жана алардын берилиштерине жеткенге дайым уруксат берилсин"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>к. <xliff:g id="HOURS">%2$d</xliff:g>с. <xliff:g id="MINUTES">%3$d</xliff:g>мүн. <xliff:g id="SECONDS">%4$d</xliff:g>сек."</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>с. <xliff:g id="MINUTES">%2$d</xliff:g>мүн. <xliff:g id="SECONDS">%3$d</xliff:g>сек."</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>мүн. <xliff:g id="SECONDS">%2$d</xliff:g>сек."</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>сек."</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"Колдонуу статистикасы"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Колдонуу статистикасы"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Төмөнкү боюнча иргөө:"</string>
@@ -1808,7 +1814,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Экрандагыны окугучтар, экран, башкаруу элементтери"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Атайн мүмкүнчлктрдн жөндлр"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Түзмөктү өзүңүзгө карап ыңгайлаштырып алыңыз. Бул атайын мүмкүнчүлүктөрдүн параметрлерин кийинчерээк өзгөртсөңүз болот."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Арип өлчөмүн чоңойтуу"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Арип өлчөмүн өзгөртүү"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Экрандагыны окугучтар"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Аудио жана текстти окуп берүү"</string>
     <string name="display_category_title" msgid="685461049938269166">"Дисплей"</string>
@@ -1829,10 +1835,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Чоңойтуу үчүн"</b>" экранды бир манжаңыз менен 3 жолу бат-бат таптаңыз.\n"<ul><li>"Эки манжаңыз менен сыдырып карасаңыз болот."</li>\n<li>"Масштабын тууралоо үчүн эки манжаңызды бириктирип жана ажыратыңыз."</li></ul>\n\n<b>"Ал эми убактылуу чоңойтуу үчүн"</b>" экранды 3 жолу бат-бат таптап, үчүнчүсүндө манжаңызды басып туруңуз.\n"<ul><li>"Көрүнүштүн экранга батпаган жерлерин ары-бери сүйрөп карасаңыз болот."</li>\n<li>"Кичирейтүү үчүн манжаңызды көтөрүп коюңуз."</li></ul>\n\n"Баскычтоптон же чабыттоо тилкесинен чоңойто албайсыз."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Чоңойтуу функциясын күйгүзгөндөн кийин, экрандын аягындагы Атайын мүмкүнчүлүктөр баскычы менен дисплейди тез эле чоңойтуп аласыз.\n\n"<b>"Чоңойтуу үчүн"</b>" Атайын мүмкүнчүлүктөр баскычын, андан соң экрандын бир жерин таптап коюңуз.\n"<ul><li>"Эки манжаңыз менен сыдырып карасаңыз болот."</li>\n<li>"Масштабын тууралоо үчүн эки манжаңызды бириктирип жана ажыратыңыз."</li></ul>\n\n<b>"Убактылуу чоңойтуу үчүн"</b>" Атайын мүмкүнчүлүктөр баскычын таптап, экрандын бир жерин басып, кармап туруңуз.\n"<ul><li>"Көрүнүштүн экранга батпаган жерлерин ары-бери сүйрөп карасаңыз болот."</li>\n<li>"Кичирейтүү үчүн манжаңызды көтөрүп коюңуз."</li></ul>\n\n"Баскычтоптон же чабыттоо тилкесинен чоңойто албайсыз."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Атайын мүмкүнчүлүктөр баскычы <xliff:g id="SERVICE">%1$s</xliff:g> кызматы үчүн коюлган. Чоңойтуу функциясын колдонуу үчүн, Атайын мүмкүнчүлүктөр баскычын басып, кармап туруңуз да, чоңойтуу функциясын тандаңыз."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Тез иштетүү"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Үндү кат-уу/ак-уу баск-н кыска жолу"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Кыска жол кызматы"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Кулпуланган экранда иштетүү"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Атайын мүмкүнчүлүктөр функциясын пайдалануу үчүн, анын кыска жолу күйгүзүлгөндө, үндү катуулатуу/акырындатуу баскычын үч секунддай кое бербей басып туруңуз."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Атайын мүмкүнчүлүктөр функциясын пайдалануу үчүн, анын кыска жолу күйгүзүлгөндө, үндү катуулатуу/акырындатуу баскычын үч секунддай кое бербей басып туруңуз."</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">"Экрандын чоңойтуусун авто жаңыртуу"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Колдонмо кубулган сайын, экрандын чоңойтуусун жаңыртуу"</string>
@@ -1845,7 +1851,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Түзмөктүн иштешине кедергисин тийгизиши мүмкүн"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Көрсөткүч токтогондо басуу"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Баскыч басылганга чейин кармалган убакыт"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"КҮЙҮК"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ӨЧҮК"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Ылдам тууралоолор абалында көргөзүү"</string>
@@ -2361,6 +2366,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g> ичинен <xliff:g id="NUMBER">%1$d</xliff:g> тандалды"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g> ичинен <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Бардыгын тандоо"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Тарифтик план-ы башкаруу"</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>
@@ -2446,6 +2452,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мобилдик түйүндөр"</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_metered_auto" msgid="1262028400911918865">"Автоматтык"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Трафик ченелет"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Трафик ченелбейт"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Оператор эсептеген дайындар түзмөгүңүздө эсептелген дайындардан айырмаланышы мүмкүн."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Шашылыш чалуу"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Чалууга кайтуу"</string>
@@ -2663,7 +2672,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Чалууларды башкаргыч"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Өзгөчө кырдаал тууралуу кулактандыруу"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Шашылыш билдирүүлөр"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Тармактык операторлор"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Жетки түйүнүнүн аталыштары"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Жакшыртылган 4G LTE режими"</string>
@@ -2732,6 +2741,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Төмөнкү үчүн тандалган SIM"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Чалган сайын сурасын"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Тандоо керек"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"SIM-картаны тандоо"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Жөндөөлөр"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">Жашырылган %d нерсе көрсөтүлсүн</item>
@@ -2883,18 +2893,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Колдонмо эскертмелери"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Эскертменин категориясы"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Маанилүүлүгү"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Колдонмо өзү чечим чыгарсын"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Добуш чыгарууга уруксат берүү"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Эскертмелер эч качан көрсөтүлбөсүн"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Добуш да чыгарбасын, экранда да көрсөтүлбөсүн"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Добушу жок"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Добуш чыгарсын"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Добуш менен экранга калкып чыксын"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Экранга калкып чыксын"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Төмөн"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Орто"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Жогору"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Шашылыш"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Добуш чыгарууга уруксат берүү"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Үн чыгарылбасын, дирилдебесин же бул эскертмелер учурдагы экранда көрүнбөсүн."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Эскертмелерге уруксат берүү"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Үндүү сигналдарды, дирилдөөнү иштетип, эскертмелерди башка колдонмолордун үстүнөн көрсөтүү"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Маанилүүлү эмес"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Орточо"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Маанилүү"</string>
@@ -2925,7 +2936,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"сүрөт ичиндеги сүрөт"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Сүрөт ичиндеги сүрөт"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Сүрөт ичиндеги сүрөткө уруксат берүү"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Бул колдонмо ачылып турганда же андан чыгып кеткениңизде (мисалы, видео көрүүнү улантуу үчүн), колдонмого сүрөт ичиндеги сүрөт терезсин түзүүгө уруксат бериңиз. Терезе колдонулуп жаткан башка колдонмолордун үстүнөн көрсөтүлөт."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Бул колдонмо ачылып турганда же андан чыгып кеткениңизде (мисалы, видео көрүүнү улантуу үчүн), колдонмого сүрөт ичиндеги сүрөт терезсин түзүүгө уруксат бериңиз. Терезе колдонулуп жаткан башка колдонмолордун үстүнөн көрсөтүлөт."</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>
@@ -3228,6 +3239,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Файлдарды өткөрүү"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Сүрөттөрдү өткөрүү (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Түзмөктү MIDI режиминде колдонуу"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS билдирүүлөрдү чагылдыруу"</string>
     <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>
@@ -3370,6 +3382,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="night_display_suggestion_title" msgid="6602129097059325291">"Түнкү режимдин графигин түзүү"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Экран саргыч түскө боёлуп, тезирээк уктап каласыз"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Түнкү жарык күйүк"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Экран янтарь түскө боёлуп, күңүрт жерде көзүңүзгө күч келбей, тезирээк уктап каласыз."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Сунуштар"</string>
@@ -3388,6 +3402,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Салкыныраак дисплей түстөрүн колдонуңуз"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Түс өзгөртүүлөрүн күчүнө киргизүү үчүн, экранды өчүрүңүз"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telephony Monitor функциясын колдонуу үчүн түзмөктү өчүрүп-күйгүзүү керек"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HAL HDR+ камера режими"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"HAL HDR+ камера режимин колдонуу үчүн түзмөктү өчүрүп-күйгүзүңүз"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Камеранын лазердик сенсору"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматтык тутум жаңыртуулары"</string>
     <string name="usage" msgid="2977875522080448986">"Дайындардын өткөрүлүшү"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Мобилдик трафик"</string>
@@ -3413,7 +3430,7 @@
     <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_2">%2$s</xliff:g> аралыгында <xliff:g id="ID_1">%1$s</xliff:g> колдонулду"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g> аралыгында <xliff:g id="ID_1">%1$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">
@@ -3482,7 +3499,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Тазалап туруп өтүү"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager ылдамдыкты чектөөнү баштапкы абалга келтирүү"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager ылдамдыкты чектөө баштапкы абалга келтирилди"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Кулпуланган экрндг эскртмнлрд көзөмөлдөө"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Кулпуланган экрандагы маалыматты көзөмөлдөө"</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="8483187649355540109">"Колдоо жана кеңештер"</string>
@@ -3490,7 +3507,7 @@
     <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="2456198532288640046">"Башка түзмөктөргө көрүнбөйт"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Өчүк"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> менен туташты"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Бир нече түзмөккө туташты"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Тутум интерфейсинин демо режими"</string>
@@ -3592,7 +3609,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Ыкчам ачылуучу колдонмолор"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Орнотулган эмес болсо да, колдонмолордогу шилтемелерди ачыңыз"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Ыкчам ачылуучу колдонмолор"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Ыкчам ачылуучу колдонмолордун каттоо эсеби"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Ыкчам ачылуучу колдонмолордун параметрлери"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Орнотулган колдонмолор"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Учурда сактагычыңыз сактагычты көзөмөлдөгүч тарабынан башкарылууда"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> каттоо эсептери"</string>
@@ -3639,7 +3656,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Дайым иштеген VPN жеке профилиңизде күйгүзүлдү"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Дайым иштеген VPN жумуш профилиңизде күйгүзүлдү"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Глобалдык HTTP проксиси орнотулду"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Ишенимдүү эсептик дайындар"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Ишенимдүү эсептик дайындар"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Жеке профилиңиздеги ишенимдүү эсептик дайындар"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Жумуш профилиңиздеги ишенимдүү эсептик дайындар"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Кеминде <xliff:g id="COUNT_1">%d</xliff:g> ТБ тастыктамасы</item>
       <item quantity="one">Кеминде <xliff:g id="COUNT_0">%d</xliff:g> ТБ тастыктамасы</item>
@@ -3702,7 +3721,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Байланыш оператору жөнүндө маалымат"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Байланыш операторун өзгөртүү"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Эмне жаңылык бар?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Мыкты 5 функцияны карап чыгыңыз"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Жаңы телефонуңузду карап чыгыңыз"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Жаңы планшетиңизди карап чыгыңыз"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Жаңы түзмөгүңүзду карап чыгыңыз"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Бул функция бул түзмөктө иштебейт"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS каттоо абалы"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Катталган"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Катталган эмес"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index fa2571a..44d2bd5 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ຕ້ອງການສິດເພື່ອເຂົ້າໄປຂໍ້ຄວາມຂອງທ່ານ. ໃຫ້ສິດແກ່ %2$s ຫຼືບໍ່?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"ການ​ຂໍ​ເຂົ້າ​ຫາ SIM"</string>
     <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="bluetooth_device_name_summary" msgid="4757990010751789977">"ສະແດງເປັນ \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' ໃຫ້ອຸປະກອນອື່ນເຫັນ"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"ສະແດງເປັນ \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' ໃຫ້ອຸປະກອນອື່ນເຫັນ"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ອຸປະກອນຂອງທ່ານ"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ຈັບຄູ່ອຸປະກອນໃໝ່"</string>
     <string name="date_and_time" msgid="9062980487860757694">"ວັນ​ທີ &amp; ເວ​ລາ"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"ຕໍ່ໄປ"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"ຂ້າມລາຍນິ້ວມືບໍ?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"ການຕັ້ງຄ່າລາຍນິ້ວມືຈະໃຊ້ເວລາພຽງໜຶ່ງ ຫຼື ສອງນາທີເທົ່ານັ້ນ. ຫາກທ່ານຂ້າມຂັ້ນຕອນນີ້, ທ່ານຈະສາມາດເພີ່ມລາຍນິ້ວມືໄດ້ໃນພາຍຫຼັງໂດຍການໄປທີ່ການຕັ້ງຄ່າ."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"ຂ້າມໜ້າຈໍລັອກບໍ?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"ບໍ່ສາມາດເປີດຄຸນສົມບັດການປ້ອງກັນອຸປະກອນໄດ້. ທ່ານຈະບໍ່ສາມາດປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ແທັບເລັດນີ້ໄດ້ຫາກມັນເສຍ, ຖືກລັກ ຫຼື ຖືກຣີເຊັດ."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"ບໍ່ສາມາດເປີດຄຸນສົມບັດການປ້ອງກັນອຸປະກອນໄດ້. ທ່ານຈະບໍ່ສາມາດປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ອຸປະກອນນີ້ໄດ້ຫາກມັນເສຍ, ຖືກລັກ ຫຼື ຖືກຣີເຊັດ."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"ບໍ່ສາມາດເປີດຄຸນສົມບັດການປ້ອງກັນອຸປະກອນໄດ້. ທ່ານຈະບໍ່ສາມາດປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ໂທລະສັບນີ້ໄດ້ຫາກມັນເສຍ, ຖືກລັກ ຫຼື ຖືກຣີເຊັດ."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"You’ve added the maximum number of fingerprints"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Can’t add more fingerprints"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"ເອົາ​ທຸກ​ລາຍ​ນີ້ວ​ມື​ອອກ​ໄປ​ບໍ?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"ລຶບ \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' ອອກ"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"ທ່ານຕ້ອງການລຶບລາຍນິ້ວມືນີ້ອອກບໍ່?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"ທ່ານຈະບໍ່ສາມາດໃຊ້ລາຍນິ້ວມືຂອງທ່ານເພື່ອປົດລັອກໂທລະສັບຂອງທ່ານ, ອະນຸມັດການສັ່ງຊື້ ຫຼື ເຂົ້າສູ່ລະບົບຫາແອັບໄດ້"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"ທ່ານຈະບໍ່ສາມາດໃຊ້ລາຍນິ້ວມືຂອງທ່ານເພື່ອປົດລັອກໂປຣໄຟລ໌ບ່ອນເຮັດວຽກຂອງທ່ານ, ອະນຸມັດການສັ່ງຊືື້ ຫຼື ເຂົ້າສູ່ລະບົບແອັບຢູ່ບ່ອນເຮັດວຽກໄດ້"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"ແມ່ນແລ້ວ​, ເອົາອອກ"</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"ເພື່ອຄວາມປອດໄພທີ່ເພີ່ມຂຶ້ນ, ໃຫ້ຕັ້ງໜ້າຈໍລັອກສຳຮອງໄວ້."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"ເພື່ອຄວາມປອດໄພທີ່ເພີ່ມຂຶ້ນ, ໃຫ້ຕັ້ງໜ້າຈໍລັອກສຳຮອງໄວ້."</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>
@@ -497,37 +502,37 @@
     <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_fingerprint" msgid="8212242533942400457">"ຄຸນສົມບັດການປົກປ້ອງອຸປະກອນຈະບໍ່ສາມາດໃຊ້ວຽກໄດ້ຫາກບໍ່ມີຮູບແບບປົດລັອກຂອງທ່ານ.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"ຄຸນສົມບັດການປ້ອງກັນອຸປະກອນຈະບໍ່ເຮັດວຽກຫາກບໍ່ລະບຸຮູບແບບປົດລັອກຂອງທ່ານ.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ລາຍນິ້ວມືທີ່ບັນທຶກໄວ້ຂອງທ່ານຈະຖືກລຶບອອກຈາກອຸປະກອນນີ້ ແລະ ທ່ານຈະບໍ່ສາມາດປົດລັອກໂທລະສັບ, ອະນຸຍາດການຊື້ ຫຼື ລົງຊື່ເຂົ້າໃຊ້ແອັບດ້ວຍພວກມັນໄດ້.\""</string>
+</xliff:g>ລາຍນິ້ວມືທີ່ທ່ານບັນທຶກໄວ້ຈະຖືກລຶບອອກຈາກອຸປະກອນນີ້ນຳ ແລະ ທ່ານຈະບໍ່ສາມາດປົດລັອກໂທລະສັບຂອງທ່ານ, ອະນຸມັດການສັ່ງຊື້ ຫຼື ເຂົ້າສູ່ລະບົບແອັບໄດ້."</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">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"ຄຸນສົມບັດການປ້ອງກັນອຸປະກອນຈະບໍ່ເຮັດວຽກຫາກບໍ່ລະບຸລະຫັດ PIN ຂອງທ່ານ.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ລາຍນິ້ວມືທີ່ບັນທຶກໄວ້ຂອງທ່ານຈະຖືກເອົາອອກຈາກອຸປະກອນນີ້ ແລະທ່ານຈະບໍ່ສາມາດປົດລັອກໂທລະສັບ, ອະນຸຍາດການຊື້ ຫຼືລົງຊື່ເຂົ້າໃຊ້ແອັບດ້ວຍພວກມັນໄດ້.\""</string>
+</xliff:g>ລາຍນິ້ວມືທີ່ທ່ານບັນທຶກໄວ້ຈະຖືກລຶບອອກຈາກອຸປະກອນນີ້ນຳ ແລະ ທ່ານຈະບໍ່ສາມາດປົດລັອກອຸປະກອນຂອງທ່ານ, ອະນຸມັດການສັ່ງຊື້ ຫຼື ເຂົ້າສູ່ລະບົບແອັບໄດ້."</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"ຄຸນສົມບັດການປ້ອງກັນອຸປະກອນຈະບໍ່ເຮັດວຽກຫາກບໍ່ລະບຸລະຫັດຜ່ານຂອງທ່ານ.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ລາຍນິ້ວມືທີ່ບັນທຶກໄວ້ຂອງທ່ານຈະຖືກເອົາອອກຈາກອຸປະກອນນີ້ ແລະທ່ານຈະບໍ່ສາມາດປົດລັອກໂທລະສັບ, ອະນຸຍາດການຊື້ ຫຼືລົງຊື່ເຂົ້າໃຊ້ແອັບດ້ວຍພວກມັນໄດ້.\""</string>
+</xliff:g>ລາຍນິ້ວມືທີ່ທ່ານບັນທຶກໄວ້ຈະຖືກລຶບອອກຈາກອຸປະກອນນີ້ນຳ ແລະ ທ່ານຈະບໍ່ສາມາດປົດລັອກໂທລະສັບຂອງທ່ານ, ອະນຸມັດການສັ່ງຊື້ ຫຼື ເຂົ້າສູ່ລະບົບແອັບໄດ້."</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"ຄຸນສົມບັດການປ້ອງກັນອຸປະກອນຈະບໍ່ເຮັດວຽກຫາກບໍ່ລະບຸໜ້າຈໍລັອກຂອງທ່ານ.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ລາຍນິ້ວມືທີ່ບັນທຶກໄວ້ຂອງທ່ານຈະຖືກເອົາອອກຈາກອຸປະກອນນີ້ ແລະທ່ານຈະບໍ່ສາມາດປົດລັອກໂທລະສັບ, ອະນຸຍາດການຊື້ ຫຼືລົງຊື່ເຂົ້າໃຊ້ແອັບດ້ວຍພວກມັນໄດ້.\""</string>
+</xliff:g>ລາຍນິ້ວມືທີ່ທ່ານບັນທຶກໄວ້ຈະຖືກລຶບອອກຈາກອຸປະກອນນີ້ນຳ ແລະ ທ່ານຈະບໍ່ສາມາດປົດລັອກອຸປະກອນຂອງທ່ານ, ອະນຸມັດການສັ່ງຊື້ ຫຼື ເຂົ້າສູ່ລະບົບແອັບໄດ້."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"ຄຸນສົມບັດການປົກປ້ອງໂປຣໄຟລ໌ຈະໃຊ້ບໍ່ໄດ້ໂດຍບໍ່ມີແບບຮູບຂອງທ່ານ."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"ຄຸນສົມບັດການປົກປ້ອງໂປຣໄຟລ໌ຈະໃຊ້ບໍ່ໄດ້ຫາກບໍ່ມີແບບຮູບຂອງທ່ານ.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"ຄຸນສົມບັດການປ້ອງກັນໂປຣໄຟລ໌ຈະບໍ່ເຮັດວຽກຫາກບໍ່ລະບຸຮູບແບບປົດລັອກຂອງທ່ານ.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ລາຍນິ້ວມືທີ່ບັນທຶກໄວ້ຂອງທ່ານຈະຖືກລຶບອອກຈາກໂປຣໄຟລ໌ນີ້ນຳ ແລະທ່ານຈະບໍ່ສາມາດປົດລັອກໂປຣໄຟລ໌ຂອງທ່ານ, ອະນຸຍາດການຊື້ ຫຼື ເຂົ້າສູ່ລະບົບລະບົບແອັບດ້ວຍພວກມັນໄດ້\"."</string>
+</xliff:g>ລາຍນິ້ວມືທີ່ທ່ານບັນທຶກໄວ້ຈະຖືກລຶບອອກຈາກອຸປະກອນນີ້ນຳ ແລະ ທ່ານຈະບໍ່ສາມາດປົດລັອກໂປຣໄຟລ໌ຂອງທ່ານ, ອະນຸມັດການສັ່ງຊື້ ຫຼື ເຂົ້າສູ່ລະບົບແອັບໄດ້."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"ຄຸນສົມບັດການປົກປ້ອງໂປຣໄຟລ໌ຈະໃຊ້ບໍ່ໄດ້ຫາກບໍ່ມີ PIN ຂອງທ່ານ."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"ຄຸນສົມບັດການປົກປ້ອງໂປຣໄຟລ໌ຈະໃຊ້ບໍ່ໄດ້ຫາກບໍ່ມີ PIN ຂອງທ່ານ.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"ຄຸນສົມບັດການປ້ອງກັນໂປຣໄຟລ໌ຈະບໍ່ເຮັດວຽກຫາກບໍ່ລະບຸລະຫັດ PIN ຂອງທ່ານ.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ລາຍນິ້ວມືທີ່ບັນທຶກໄວ້ຂອງທ່ານຈະຖືກລຶບອອກຈາກໂປຣໄຟລ໌ນີ້ນຳ ແລະ ທ່ານຈະບໍ່ສາມາດປົດລັອກໂປຣໄຟລ໌ຂອງທ່ານ, ອະນຸຍາດການຊື້ ຫຼື ເຂົ້າສູ່ລະບົບລະບົບແອັບດ້ວຍພວກມັນໄດ້\"."</string>
+</xliff:g>ລາຍນິ້ວມືທີ່ທ່ານບັນທຶກໄວ້ຈະຖືກລຶບອອກຈາກອຸປະກອນນີ້ນຳ ແລະ ທ່ານຈະບໍ່ສາມາດປົດລັອກໂປຣໄຟລ໌ຂອງທ່ານ, ອະນຸມັດການສັ່ງຊື້ ຫຼື ເຂົ້າສູ່ລະບົບແອັບໄດ້."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"ຄຸນສົມບັດການປົກປ້ອງໂປຣໄຟລ໌ຈະໃຊ້ບໍ່ໄດ້ຫາກບໍ່ມີລະຫັດຜ່ານຂອງທ່ານ."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"ຄຸນສົມບັດການປົກປ້ອງໂປຣໄຟລ໌ຈະໃຊ້ບໍ່ໄດ້ຫາກບໍ່ມີລະຫັດຜ່ານຂອງທ່ານ.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"ຄຸນສົມບັດການປ້ອງກັນໂປຣໄຟລ໌ຈະບໍ່ເຮັດວຽກຫາກບໍ່ລະບຸລະຫັດຜ່ານຂອງທ່ານ.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ລາຍນິ້ວມືທີ່ບັນທຶກໄວ້ຂອງທ່ານຈະຖືກລຶບອອກຈາກໂປຣໄຟລ໌ນີ້ນຳ ແລະທ່ານຈະບໍ່ສາມາດປົດລັອກໂປຣໄຟລ໌ຂອງທ່ານ, ອະນຸຍາດການຊື້ ຫຼື ເຂົ້າສູ່ລະບົບລະບົບແອັບດ້ວຍພວກມັນໄດ້\"."</string>
+</xliff:g>ລາຍນິ້ວມືທີ່ທ່ານບັນທຶກໄວ້ຈະຖືກລຶບອອກຈາກອຸປະກອນນີ້ນຳ ແລະ ທ່ານຈະບໍ່ສາມາດປົດລັອກໂປຣໄຟລ໌ຂອງທ່ານ, ອະນຸມັດການສັ່ງຊື້ ຫຼື ເຂົ້າສູ່ລະບົບແອັບໄດ້."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"ຄຸນສົມບັດການປົກປ້ອງໂປຣໄຟລ໌ຈະໃຊ້ບໍ່ໄດ້ຫາກບໍ່ມີການລັອກໜ້າຈໍຂອງທ່ານ."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"ຄຸນສົມບັດການປົກປ້ອງໂປຣໄຟລ໌ຈະໃຊ້ບໍ່ໄດ້ຫາກບໍ່ມີການລັອກໜ້າຈໍຂອງທ່ານ.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"ຄຸນສົມບັດການປ້ອງກັນໂປຣໄຟລ໌ຈະບໍ່ເຮັດວຽກຫາກບໍ່ລະບຸໜ້າຈໍລັອກຂອງທ່ານ.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ລາຍນິ້ວມືທີ່ບັນທຶກໄວ້ຂອງທ່ານຈະຖືກລຶບອອກຈາກໂປຣໄຟລ໌ນີ້ນຳ ແລະ ທ່ານຈະບໍ່ສາມາດປົດລັອກໂປຣໄຟລ໌ຂອງທ່ານ, ອະນຸຍາດການຊື້ ຫຼື ເຂົ້າສູ່ລະບົບລະບົບແອັບດ້ວຍພວກມັນໄດ້\"."</string>
+</xliff:g>ລາຍນິ້ວມືທີ່ທ່ານບັນທຶກໄວ້ຈະຖືກລຶບອອກຈາກອຸປະກອນນີ້ນຳ ແລະ ທ່ານຈະບໍ່ສາມາດປົດລັອກໂປຣໄຟລ໌ຂອງທ່ານ, ອະນຸມັດການສັ່ງຊື້ ຫຼື ເຂົ້າສູ່ລະບົບແອັບໄດ້."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"ແມ່ນ​, ເອົາອອກ"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"ປ່ຽນຮູບແບບການປົດລັອກ"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ປ່ຽນລະຫັດປົດລັອກ PIN"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"ນ້ອຍຫາໃຫຍ່, ໃຫຍ່ຫານ້ອຍ ຫຼື ຊຸດຕົວເລກຊ້ຳໆແມ່ນບໍ່ສາມາດໃຊ້ໄດ້"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ຕົກລົງ"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"ຍົກເລີກ"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"ລຶບ"</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>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"ສາມາດໃຊ້ WPS ໄດ້"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (ສາມາດໃຊ້ WPS ໄດ້)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ໃສ່​ລະຫັດ​ເຄືອ​ຂ່າຍ​ຂອງ​ທ່ານ"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"ເຄືອຂ່າຍ Wi‑Fi ຜູ້ໃຫ້ບໍລິການ"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"ເຊື່ອມຕໍ່ຜ່ານ <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ເພື່ອປັບປຸງຄວາມຖືກຕ້ອງຂອງສະຖານທີ່ ແລະເພື່ອຈຸດປະສົງອື່ນໆ, <xliff:g id="APP_NAME">%1$s</xliff:g> ຕ້ອງການເປີດນຳໃຊ້ການສະແກນເຄືອຂ່າຍ ເຖິງແມ່ນວ່າ Wi-Fi ຈະປິດກໍຕາມ.\n\nອະນຸຍາດການດຳເນີນການນີ້ ໃຫ້ກັບທຸກແອັບຯທີ່ຕ້ອງການສະແກນບໍ່?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ເພື່ອ​ປິດ, ໃຫ້​ໄປ​ທີ່​ຫົວ​ຂໍ້​ຂັ້ນ​ສູງ ໃນ​ເມ​ນູ​ໂອ​ເວີ​ໂຟລ."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ອະ​ນຸ​ຍາດ​"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"ເຊື່ອມຕໍ່"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ລົ້ມເຫລວໃນການເຊື່ອມຕໍ່ເຄືອຂ່າຍ"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"ລືມ"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"ແກ້ໄຂ"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"ລົ້ມເຫລວໃນການລືມເຄືອຂ່າຍ"</string>
     <string name="wifi_save" msgid="3331121567988522826">"ບັນທຶກ"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"ລົ້ມເຫລວໃນການບັນທຶກເຄືອຂ່າຍ"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi ຂັ້ນສູງ"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"ທີ່ຢູ່ MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"ທີ່ຢູ່ IP"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"ຂໍ້ມູນເຄືອຂ່າຍ"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet Mask"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"ທີ່ຢູ່ IPv6"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ຍົກເລີກການເຊີນ?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"ທ່ານຕ້ອງການຍົກເລີກການເຊີນເພື່ອເຊື່ອມຕໍ່ກັບ <xliff:g id="PEER_NAME">%1$s</xliff:g> ບໍ່?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ລືມກຸ່ມນີ້?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Wi-Fi ຮັອດສະປອດເຄື່ອນທີ່"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi ຮັອດ​ສະ​ປອດ"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"ບໍ່ໄດ້ແບ່ງປັນອິນເຕີເນັດ ຫຼື ເນື້ອຫາກັບອຸປະກອນອື່ນ"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"ກຳລັງແບ່ງປັນການເຊື່ອມຕໍ່ອິນເຕີເນັດຂອງແທັບເລັດຜ່ານທາງຮັອດສະປອດ"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"ກຳລັງແບ່ງປັນການເຊື່ອມຕໍ່ອິນເຕີເນັດຂອງໂທລະສັບຜ່ານທາງຮັອດສະປອດ"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"ແອັບກຳລັງແບ່ງປັນເນື້ອຫາ. ເພື່ອແບ່ງປັນອິນເຕີເນັດ, ໃຫ້ປິດຮັອດສະປອດໄວ້ກ່ອນ ຈາກນັ້ນເປີດຄືນໃໝ່"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"ຊື່ Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"ຊື່ຮັອດສະປອດ"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"ກຳລັງເປີດໃຊ້ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"ອຸປະກອນອື່ນສາມາດເຊື່ອມຕໍ່ຫາ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ໄດ້"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"ລະຫັດຜ່ານ Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"ລະຫັດຜ່ານຮັອດສະປອດ"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"ຄື້ນ AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"ໃຊ້ຮັອດສະປອດເພື່ອສ້າງເຄືອຂ່າຍ Wi-Fi ສຳລັບອຸປະກອນອື່ນຂອງທ່ານ. ຮັອດສະປອດຈະສະໜອງອິນເຕີເນັດໂດຍໃຊ້ການເຊື່ອມຕໍ່ອິນເຕີເນັດມືຖືຂອງທ່ານ. ອາດມີການຮຽກເກັບຄ່າອິນເຕີເນັດມືຖືເພີ່ມເຕີມໄດ້."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ແອັບຕ່າງໆສາມາດສ້າງຮັອດສະປອດເພື່ອແບ່ງປັນເນື້ອຫາກັບອຸປະກອນທີ່ຢູ່ໃກ້ຄຽງໄດ້."</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"ເມື່ອ​ການ​ໂທ Wi-Fi ເປີດ, ໂທ​ລະ​ສັບ​ຂອງ​ທ່ານ​ສາ​ມາດ​ໃຫ້​ທິດ​ທາງ​ການ​ໂທ​ຜ່ານ​ເຄືອ​ຂ່າຍ Wi-Fi ຫຼື​ເຄືອ​ຂ່າຍ​ຂອງ​ຜູ້​ໃຫ້​ບໍ​ລິ​ການ​ຂອງ​ທ່ານ, ຂຶ້ນ​ກັບ​ຄວາມ​ມັກ​ຂອງ​ທ່ານ ແລະ​ສັນ​ຍານ​ໃດ​ແຮງ​ກ່ວາ. ກ່ອນ​ເປີດ​ຄຸນ​ສ​ົມ​ບັດ​ນີ້, ກວດ​ເບິ່ງ​ກັບ​ຜູ້​ໃຫ້​ບໍ​ລິ​ການ​ເຄືອ​ຂ່າຍ​ຂອງ​ທ່ານ​ໃນ​ເລື່ອງ​ຄ່າ​ບໍ​ລິ​ການ ແລະ​ລາຍ​ລະ​ອຽດ​ອື່ນໆ."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"ອັບເດດທີ່ຢູ່ສຸກເສີນ"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"ທີ່ຢູ່ທີ່ໃຊ້ໂດຍບໍລິການສຸກເສີນເປັນສະຖານທີ່ຢູ່ຂອງທ່ານຫາກທ່ານໂທຫາ 911 ຜ່ານ WiFi"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"ທີ່ຢູ່ທີ່ໃຊ້ໂດຍບໍລິການສຸກເສີນເປັນສະຖານທີ່ຂອງທ່ານຫາກທ່ານໂທສຸກເສີນໂດຍໃຊ້ Wi‑Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ການສະແດງຜົນ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ສຽງ"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ລະດັບສຽງ"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"ຊອກຫາ"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"ຈັດການການຕັ້ງຄ່າຊອກຫາ ແລະປະຫວັດ"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"ບໍ່ມີຜົນການຊອກຫາ"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"ລຶບປະຫວັດ"</string>
     <string name="display_settings" msgid="7965901687241669598">"ການສະແດງຜົນ"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"ໝຸນໜ້າຈໍອັດຕະໂນມັດ"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"ສີສົດໃສ"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"ກຳລັງຄືນການຕັ້ງຄ່າ APN ເລີ່ມຕົ້ນ."</string>
     <string name="menu_restore" msgid="8260067415075573273">"ຕັ້ງກັບຄືນໄປໃຊ້ຄ່າເລີ່ມຕົ້ນ"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"ການຕັ້ງຄ່າ APN ເລີ່ມຕົ້ນຄືນໃໝ່ສຳເລັດແລ້ວ."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"ຣີເຊັດ"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"ການຕັ້ງຄ່າເຄືອຂ່າຍຖືກຕັ້ງຄືນແລ້ວ"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"ຕົວເລືອກການຣີເຊັດ"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"ເຄືອຂ່າຍ, ແອັບ ຫຼື ອຸປະກອນທີ່ສາມາດຣີເຊັດໄດ້"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"ຣີເຊັດ Wi-Fi, ມືຖື ແລະ Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"ນີ້ຈະເປັນການຣີເຊັດການຕັ້ງຄ່າເຄືອຂ່າຍທັງໝົດ, ຮວມເຖິງ:\n\n"<li>"Wi‑Fi"</li>\n<li>"ອິນເຕີເນັດມືຖື"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"ຕັ້ງຄືນການຕັ້ງຄ່າ"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"ຕັ້ງຄືນທຸກການຕັ້ງຄ່າເຄືອຂ່າຍບໍ? ທ່ານບໍ່ສາມາດບໍ່​ເຮັດການດຳເນີນການນີ້ໄດ້!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"ຕັ້ງຄືນບໍ?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"ການ​ຕັ້ງ​ຄ່າ​ເຄືອ​ຂ່າຍ​ຄືນ​ໃໝ່​ແມ່ນ​ບໍ່​ມີ​ໃຫ້​ສຳ​ລັບ​ຜູ້​ໃຊ້​ຄົນ​ນີ້"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"​ການ​ຕັ້ງ​ຄ່າ​ເຄືອ​ຂ່າຍ​ຖືກຕັ້ງ​ຄ່າ​ຄືນ​ໃໝ່​ແລ້ວ."</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"ຣີເຊັດຄ່າຈາກໂຮງງານ"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other">ຈະຣີເຊັດ <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> ບັນຊີ</item>
-      <item quantity="one">ຈະຣີເຊັດ 1 ບັນຊີ</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"ບ່ອນຈັດເກັບຂໍ້ມູນພາຍໃນ ແລະ ຂໍ້ມູນທັງໝົດຈະຖືກຣີເຊັດ"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"ລຶບຂໍ້ມູນທັງໝົດ (ຣີເຊັດເປັນຄ່າຈາກໂຮງງານ)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ນີ້ຈະເປັນການລຶບຂໍ້ມູນທັງໝົດຈາກ "<b>"ໜ່ວຍຄວາມຈຳພາຍໃນ"</b>" ຂອງແທັບເລັດທ່ານ, ຮວມເຖິງ:\n\n"<li>"ບັນຊີ Google ຂອງທ່ານ"</li>\n<li>"ຂໍ້ມູນລະບົບ ແລະແອັບພລິເຄຊັນ ແລະການຕັ້ງຄ່າ"</li>\n<li>"ແອັບຯທີ່ດາວໂຫລດມາ"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ນີ້ຈະເປັນການລຶບຂໍ້ມູນທັງໝົດໃນ "<b>"ໜ່ວຍຄວາມຈຳພາຍໃນ"</b>" ຂອງໂທລະສັບທ່ານ ຮວມເຖິງ:\n\n"<li>"ບັນຊີ Google ຂອງທ່ານ"</li>\n<li>"ຂໍ້ມູນລະບົບ ແລະແອັບພລິເຄຊັນ ຮວມທັງການຕັ້ງຄ່າຕ່າງໆ"</li>\n<li>"ແອັບພລິເຄຊັນທີ່ດາວໂຫລດມາ"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ປັດຈຸບັນທ່ານກຳລັງເຂົ້າສູ່ລະບົບບັນຊີຕໍ່ໄປນີ້:\n"</string>
@@ -1390,8 +1396,8 @@
     <string name="network_settings_title" msgid="2876509814832830757">"ເຄືອຂ່າຍໂທລະສັບ"</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_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_dialog_title" msgid="1958688831875804286">"ປ່ຽນແອັບສົ່ງ SMS?"</string>
+    <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"ໃຊ້ <xliff:g id="NEW_APP">%1$s</xliff:g> ເປັນແອັບສົ່ງ SMS ແທນ <xliff:g id="CURRENT_APP">%2$s</xliff:g> ບໍ?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"ໃຊ້ <xliff:g id="NEW_APP">%s</xliff:g> ເປັນແອັບຯ SMS ຂອງທ່ານ?"</string>
     <string name="network_scorer_picker_title" msgid="6383879578279046456">"ຜູ້ໃຫ້ບໍລິການຄະແນນເຄືອຂ່າຍ"</string>
     <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"ບໍ່ໃຊ້"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"ຂໍ້ມູນດ້ານຄວາມປອດໄພ"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"ທ່ານບໍ່ໄດ້ເຊື່ອມຕໍ່ຂໍ້ມູນອິນເຕີເນັດ. ເພື່ອເບິ່ງຂໍ້ມູນນີ້ໃນເວລານີ້, ກະລຸນາໄປທີ່ %s ຈາກຄອມພິວເຕີເຄື່ອງໃດກໍໄດ້ທີ່ເຊື່ອມຕໍ່ກັບອິນເຕີເນັດຢູ່."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ກຳລັງໂຫລດ..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"ເລືອກລະຫັດຜ່ານຂອງທ່ານ"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"ຕັ້ງໜ້າຈໍລັອກ"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"ເພື່ອຄວາມປອດໄພ, ໃຫ້ຕັ້ງລະຫັດຜ່ານໄວ້"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"ເພື່ອໃຊ້ລາຍນິ້ວມື, ໃຫ້ຕັ້ງລະຫັດຜ່ານກ່ອນ"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"ເລືອກຮູບແບບຂອງທ່ານ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ເພື່ອໃຊ້ລາຍນິ້ວມື, ໃຫ້ຕັ້ງຮູບແບບປົດລັອກກ່ອນ"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"ເລືອກລະຫັດ PIN ຂອງທ່ານ"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"ເພື່ອຄວາມປອດໄພ, ໃຫ້ຕັ້ງລະຫັດ PIN ໄວ້"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"ເພື່ອໃຊ້ລາຍນິ້ວມື, ໃຫ້ຕັ້ງລະຫັດ PIN ກ່ອນ"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"ຢືນຢັນລະຫັດຜ່ານຂອງທ່ານ"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"ໃສ່ລະຫັດຜ່ານຂອງທ່ານອີກຄັ້ງ"</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_pin_header" msgid="7744513791910572550">"ໃສ່ລະຫັດ 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>
@@ -1483,12 +1490,18 @@
     <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_strong_auth_required_device_pattern" msgid="530802132223800623">"ເພື່ອເພີ່ມຄວາມປອດໄພ, ໃຫ້ໃຊ້ຮູບແບບປົດລັອກອຸປະກອນຂອງທ່ານ"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"ເພື່ອເພີ່ມຄວາມປອດໄພ, ໃຫ້ລະບຸລະຫັດ PIN ອຸປະກອນຂອງທ່ານ"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"ເພື່ອເພີ່ມຄວາມປອດໄພ, ໃຫ້ລະບຸລະຫັດຜ່ານອຸປະກອນຂອງທ່ານ"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"ເພື່ອເພີ່ມຄວາມປອດໄພ, ໃຫ້ໃຊ້ຮູບແບບປົດລັອກບ່ອນເຮັດວຽກຂອງທ່ານ"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"ເພື່ອເພີ່ມຄວາມປອດໄພ, ໃຫ້ລະບຸລະຫັດ PIN ບ່ອນເຮັດວຽກຂອງທ່ານ"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"ເພື່ອເພີ່ມຄວາມປອດໄພ, ໃຫ້ລະບຸລະຫັດຜ່ານບ່ອນເຮັດວຽກຂອງທ່ານ"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"ໂທລະສັບຂອງທ່ານຖືກຣີເຊັດເປັນຄ່າຈາກໂຮງງານແລ້ວ. ເພື່ອໃຊ້ໂທລະສັບໜ່ວຍນີ້, ໃຫ້ໃສ່ຮູບແບບປົດລັອກກ່ອນໜ້ານີ້ຂອງທ່ານ."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"ໂທລະສັບຂອງທ່ານຖືກຣີເຊັດເປັນຄ່າຈາກໂຮງງານແລ້ວ. ເພື່ອໃຊ້ໂທລະສັບໜ່ວຍນີ້, ໃຫ້ໃສ່ລະຫັດ PIN ກ່ອນໜ້ານີ້ຂອງທ່ານ."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"ໂທລະສັບຂອງທ່ານຖືກຣີເຊັດເປັນຄ່າຈາກໂຮງງານແລ້ວ. ເພື່ອໃຊ້ໂທລະສັບໜ່ວຍນີ້, ໃຫ້ໃສ່ລະຫັດກ່ອນໜ້ານີ້ຂອງທ່ານ."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"ຢັ້ງຢືນຮູບແບບປົດລັອກ"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"ຢັ້ງຢືນລະຫັດ PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"ຢັ້ງຢືນລະຫັດຜ່ານ"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN ​ບໍ່​ຖືກ​ຕ້ອງ"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"ລະຫັດຜ່ານ​ບໍ່ຖືກຕ້ອງ"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"ຮູບແບບປົດ​ລັອກ​ບໍ່​ຖືກ​ຕ້ອງ"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"ສ້າງວິກເຈັດ ແລະອະນຸຍາດການເຂົ້າເຖິງ?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"ຫຼັງຈາກທີ່ທ່ານສ້າງວິກເຈັດແລ້ວ, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ຈະສາມາດເຂົ້າເຖິງຂໍ້ມູນທັງໝົດທີ່ມັນສະແດງ."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"ອະນຸຍາດໃຫ້ <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ສ້າງວິກເຈັດ ແລະເຂົ້າເຖິງຂໍ້ມູນໄດ້ສະເໝີ"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>ມ <xliff:g id="HOURS">%2$d</xliff:g>ຊ <xliff:g id="MINUTES">%3$d</xliff:g>ນ <xliff:g id="SECONDS">%4$d</xliff:g>ວ"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>ຊມ <xliff:g id="MINUTES">%2$d</xliff:g>ນທ <xliff:g id="SECONDS">%3$d</xliff:g>ວ"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>ນ <xliff:g id="SECONDS">%2$d</xliff:g>ວ"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>ວິ"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"ສະຖິຕິການນຳໃຊ້"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"ສະຖິຕິການນຳໃຊ້"</string>
     <string name="display_order_text" msgid="8592776965827565271">"ຮຽງຕາມ:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"ຕົວອ່ານໜ້າຈໍ, ການສະແດງຜົນ, ການຄວບຄຸມແບບໂຕ້ຕອບໄດ້"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"ການຕັ້ງຄ່າການເບິ່ງເຫັນ"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"ທ່ານສາມາດປັບແຕ່ງອຸປະກອນນີ້ໃຫ້ເໝາະສົມກັບຄວາມຕ້ອງການຂອງທ່ານ. ຄຸນສົມຊ່ວຍເຂົ້າເຖິງເຫຼົ່ານີ້ສາມາດຖືກປ່ຽນແປງໄດ້ໃນພາຍຫຼັງໃນການຕັ້ງຄ່າ."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"ເພີ່ມຂະໜາດຟອນ"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"ປ່ຽນຂະໜາດຟອນ"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"ຕົວອ່ານໜ້າຈໍ"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ສຽງ ແລະ ຂໍ້ຄວາມໜ້າຈໍ"</string>
     <string name="display_category_title" msgid="685461049938269166">"ການສະແດງຜົນ"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"ເພື່ອຊູມ"</b>", ໃຫ້ແຕະໃສ່ໜ້າຈໍໄວໆ 3 ເທື່ອ.\n"<ul><li>"ລາກສອງນິ້ວຂຶ້ນໄປເພື່ອເລື່ອນ"</li>\n<li>"ຖ່າງສອງນິ້ວຂຶ້ນໄປເພື່ອປັບແຕ່ງລະດັບການຊູມ"</li></ul>\n\n<b>"ເພື່ອຊູມຊົ່ວຄາວ"</b>", ໃຫ້ແຕະໃສ່ໜ້າຈໍໄວໆ 3 ເທື່ອ ແລ້ວກົດນິ້ວຂອງທ່ານລົງຄ້າງໄວ້ໃນເທື່ອທີສາມ.\n"<ul><li>"ລາກເພື່ອເລື່ອນໄປມາຢູ່ໜ້າຈໍ"</li>\n<li>"ຍົກນິ້ວຂຶ້ນເພື່ອຊູມອອກ"</li></ul>\n\n"ທ່ານບໍ່ສາມາດຊູມໃສ່ແປ້ນພິມ ຫຼື ແຖບການນຳທາງໄດ້."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"ເມື່ອເປີດໃຊ້ການຂະຫຍາຍແລ້ວ, ໃຫ້ໃຊ້ປຸ່ມການຊ່ວຍເຂົ້າເຖິງຢູ່ລຸ່ມໜ້າຈໍເພື່ອຂະຫຍາຍແບບດ່ວນ.\n\n"<b>"ເພື່ອຊູມ"</b>", ໃຫ້ແຕະທີ່ປຸ່ມການຊ່ວຍເຂົ້າເຖິງ, ຈາກນັ້ນແຕະໃສ່ບ່ອນໃດກໍໄດ້ຢູ່ໜ້າຈໍ.\n"<ul><li>"ລາກສອງນິ້ວຂຶ້ນໄປເພື່ອເລື່ອນ"</li>\n<li>"ຖ່າງສອງນິ້ວຂຶ້ນໄປເພື່ອປັບລະດັບການຊູມ"</li></ul>\n\n<b>"ເພື່ອຊູມຊົ່ວຄາວ"</b>", ໃຫ້ແຕະທີ່ປຸ່ມການຊ່ວຍເຂົ້າເຖິງ, ຈາກນັ້ນແຕະຄ້າງໃສ່ບ່ອນໃດກໍໄດ້ຢູ່ໜ້າຈໍ.\n"<ul><li>"ລາກເພື່ອເລື່ອນໄປມາຢູ່ໜ້າຈໍ"</li>\n<li>"ຍົກນິ້ວຂຶ້ນເພື່ອຊູມອອກ"</li></ul>\n\n"ທ່ານບໍ່ສາມາດຊູມໃສ່ແປ້ນພິມ ຫຼື ແຖບການນຳທາງໄດ້."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"ປຸ່ມການຊ່ວຍເຂົ້າເຖິງຖືກຕັ້ງເປັນ <xliff:g id="SERVICE">%1$s</xliff:g> ແລ້ວ. ເພື່ອໃຊ້ການຂະຫຍາຍ, ໃຫ້ແຕະປຸ່ມການຊ່ວຍເຂົ້າເຖິງຄ້າງໄວ້, ຈາກນັ້ນເລືອກການຂະຫຍາຍ."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"ທາງລັດສຳລັບການເຂົ້າເຖິງ"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"ທາງລັດປຸ່ມລະດັບສຽງ"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"ບໍລິການປຸ່ມທາງລັດ"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"ອະນຸຍາດຈາກໜ້າຈໍລັອກ"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"ເມື່ອເປີດໃຊ້ທາງລັດແລ້ວ, ທ່ານສາມາດກົດປຸ່ມປັບລະດັບສຽງທັງສອງເປັນເວລາ 3 ວິນາທີເພື່ອເລີ່ມຄຸນສົມບັດການຊ່ວຍເຂົ້າເຖິງໄດ້."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"ເມື່ອເປີດໃຊ້ທາງລັດແລ້ວ, ທ່ານສາມາດກົດປຸ່ມລະດັບສຽງທັງສອງຄ້າງໄວ້ 3 ວິນາທີເພື່ອເລີ່ມຄຸນສົມບັດການຊ່ວຍເຂົ້າເຖິງໄດ້."</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">"ອັບເດດການຂະຫຍາຍໜ້າຈໍອັດຕະໂນມັດ"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"ອັບເດດການຂະຫຍາຍໜ້າຈໍເມື່ອປ່ຽນແອັບພລິເຄຊັນ"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"ອາດກະທົບກັບປະສິດທິພາບ"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"ຄ​ລິກ​ຫຼັງ​ຈາກຕົວ​ຊີ້​ຢຸດ​ເຄື່ອນໄຫວແລ້ວ"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"ໜ່ວງເວລາກ່ອນຄລິກ"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ເປີດ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ປິດ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"ສະ​ແດງໃນການຕັ້ງຄ່າດ່ວນ"</string>
@@ -2358,6 +2363,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"ຈັດການແພັກເກດ"</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>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"ເຄືອຂ່າຍມືຖື"</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_metered_auto" msgid="1262028400911918865">"ອັດຕະໂນມັດ"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"ມີການວັດແທກ"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"ບໍ່ມີການວັດແທກ"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"​ການ​ນັບ​ຈ​ຳ​ນວນ​ຂໍ້​ມູນ​ທີ່​ໃຊ້​ຂອງ​ຜູ່​ໃຫ້​ບໍ​ລິ​ການ​ອາດ​ແຕກ​ຕ່າງ​ຈາກ​​ທີ່ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານນັບ."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"ການໂທສຸກເສີນ"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"ກັບໄປຫາການໂທ"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"​ໂຕ​ຈັດ​ການ​ການ​ໂທ"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"​ການ​ສົ່ງ​ສັນ​ຍານ​ສຸກ​ເສີນ"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"ການແຈ້ງເຕືອນສຸກເສີນ"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"ຜູ່ໃຫ້ບໍລິການເຄືອຂ່າຍ"</string>
     <string name="access_point_names" msgid="1381602020438634481">"ຊື່ຂອງຈຸດການເຂົ້າເຖິງ (APN)"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"ໂໝດ Enhanced 4G LTE"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"​ຊິມ​ທີ່​ໃຊ້​ສຳ​ລັບ"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"​ຖາມ​ທຸກ​ເທື່ອ"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"ຕ້ອງເລືອກ​ອັນໃດອັນນຶ່ງ"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"ການເລືອກ SIM"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"ການ​ຕັ້ງ​ຄ່າ"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">ສະແດງ %d ລາຍການທີ່ເຊື່ອງໄວ້</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"​ການ​ແຈ້ງ​ເຕືອນ​ແອັບຯ"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"ໝວດໝູ່ການແຈ້ງເຕືອນ"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"ຄວາມສໍາຄັນ"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"ໃຫ້ແອັບຕັດສິນໃຈ"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"ອະນຸຍາດສຽງ"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"ຢ່າສະແດງການແຈ້ງເຕືອນອີກ"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ບໍ່ມີສຽງ ຫຼື ການລົບກວນໃນໜ້າຈໍ"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"ບໍ່ມີສຽງ"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"ເຮັດສຽງ"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"ເຮັດສຽງດັງ ແລະ ສະແດງຂຶ້ນໃນໜ້າຈໍ"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"ເປີດໜ້າຈໍ"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"ຕໍ່າ"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"ປານກາງ"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"ສູງ"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"ດ່ວນ"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"ອະນຸຍາດສຽງ"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"ບໍ່ໃຊ້ສຽງ, ສັ່ນ ຫຼື ເຫັນການແຈ້ງເຕືອນເຫຼົ່ານີ້ໃນໜ້າຈໍປັດຈຸບັນ."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"ອະນຸຍາດໃຫ້ລົບກວນໄດ້"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"ໃຫ້ແອັບເປີດສຽງ, ສັ່ນເຕືອນ ແລະ/ຫຼື ສະແດງການແຈ້ງເຕືອນຢູ່ໜ້າຈໍ"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"ຄວາມສໍາຄັນຕໍ່າ"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"ຄວາມສຳຄັນປານກາງ"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"ຄວາມສໍາຄັນສູງ"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip ສະແດງຜົນຫຼາຍຢ່າງພ້ອມກັນ"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"ສະແດງຜົນຫຼາຍຢ່າງພ້ອມກັນ"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"ອະນຸຍາດການສະແດງຜົນຊ້ອນ"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"ອະນຸຍາດໃຫ້ແອັບນີ້ສ້າງໜ້າຈໍທີ່ຊ້ອນຂຶ້ນມາໃນເວລາເປີດແອັບອື່ນ ຫຼື ຫຼັງຈາກທ່ານອອກຈາກມັນ (ເຊັ່ນ: ເພື່ອສືບຕໍ່ການເບິ່ງວິດີໂອ). ໜ້າຈໍນີ້ຈະສະແດງບັງແອັບອື່ນທີ່ທ່ານກຳລັງໃຊ້ຢູ່."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"ອະນຸຍາດໃຫ້ແອັບນີ້ສ້າງໜ້າຈໍທີ່ຊ້ອນຂຶ້ນມາໃນເວລາເປີດແອັບອື່ນ ຫຼື ຫຼັງຈາກທ່ານອອກຈາກມັນ (ເຊັ່ນ: ເພື່ອສືບຕໍ່ການເບິ່ງວິດີໂອ). ໜ້າຈໍນີ້ຈະສະແດງບັງແອັບອື່ນທີ່ທ່ານກຳລັງໃຊ້ຢູ່."</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>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"ກຳລັງໂອນຍ້າຍໄຟລ໌"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"ກຳລັງໂອນຍ້າຍຮູບ (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"ການໃຊ້ອຸປະກອນເປັນ MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS Mirroring"</string>
     <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>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"ກຳນົດເວລາໄຟກາງຄືນ"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"ການປັບສີຂອງແສງໜ້າຈໍຈະຊ່ວຍໃຫ້ທ່ານອນຫຼັບໄດ້ງ່າຍຂຶ້ນ"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"ເປີດໃຊ້ແສງກາງຄືນແລ້ວ"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"ໜ້າຈໍເປັນສີອົມແດງແລ້ວ. ນີ້ອາດຊ່ວຍໃຫ້ນອນຫຼັບໄດ້ດີຂຶ້ນ."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"ຄຳແນະນຳ"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"ໃຊ້ສີຈໍສະແດງຜົນທີ່ເຢັນກວ່າ"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"ເພື່ອນຳໃຊ້ການປ່ຽນສີ, ໃຫ້ປິດໜ້າຈໍ"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"ເພື່ອນຳໃຊ້ການປ່ຽນແປງ Telephony Monitor, ໃຫ້ປິດແລ້ວເປີດອຸປະກອນຄືນໃໝ່"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"ກ້ອງຖ່າຍຮູບ HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"ເພື່ອນຳໃຊ້ການປ່ຽນແປງກ້ອງຖ່າຍຮູບ HAL HDR+, ໃກ້ປິດເປີດອຸປະກອນຄືນໃໝ່"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"ເຊັນເຊີເລເຊີກ້ອງ"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ການອັບເດດລະບົບອັດຕະໂນມັດ"</string>
     <string name="usage" msgid="2977875522080448986">"ການໃຊ້"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"ການນຳໃຊ້ອິນເຕີເນັດມືຖື"</string>
@@ -3410,7 +3427,7 @@
     <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="data_usage_template" msgid="2923744765873163859">"ໃຊ້ໄປແລ້ວ <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">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"ລຶບ ແລະ ປ່ຽນ"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ຣີເຊັດການຈຳກັດອັດຕາ ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ຣີເຊັດການຈຳກັດອັດຕາ ShortcutManager ແລ້ວ"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"ຄວບຄຸມການແຈ້ງເຕືອນໃນໜ້າຈໍລັອກ"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"ຂໍ້ມູນການຄວບຄຸມໃນໜ້າຈໍລັອກ"</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="8483187649355540109">"ຊ່ວຍເຫຼືອ ແລະ ເຄັດລັບ"</string>
@@ -3487,7 +3504,7 @@
     <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="2456198532288640046">"ອຸປະກອນອື່ນບໍ່ສາມາດເຫັນໄດ້"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"ປິດ"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"ເຊື່ອມຕໍ່ຫາ <xliff:g id="ID_1">%1$s</xliff:g> ແລ້ວ"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"ເຊື່ອມຕໍ່ຫາຫຼາຍອຸປະກອນ"</string>
     <string name="demo_mode" msgid="2798762752209330277">"ໂໝດເດໂມສ່ວນຕິດຕໍ່ຜູ້ໃຊ້ລະບົບ"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"ອິນສະແຕນແອັບ"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"ເປີດລິ້ງໃນແອັບ, ເຖິງແມ່ນວ່າບໍ່ໄດ້ຕິດຕັ້ງກໍຕາມ"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"ອິນສະແຕນແອັບ"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"ບັນຊີອິນສະແຕນແອັບ"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"ການຕັ້ງຄ່າອິນສະແຕນແອັບ"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ແອັບຯທີ່ຕິດຕັ້ງແລ້ວ"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"ຕອນນີ້ອຸປະກອນຂອງທ່ານຖືກຈັດການໂດຍຕົວຈັດການບ່ອນຈັດເກັບຂໍ້ມູນແລ້ວ."</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"ບັນຊີສຳລັບ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Always-on VPN turned on in your personal profile"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Always-on VPN turned on in your work profile"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP proxy set"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"ຂໍ້ມູນລັບທີ່ເຊື່ອຖື"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"ຂໍ້ມູນລັບທີ່ເຊື່ອຖື"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"ຂໍ້ມູນລັບທີ່ເຊື່ອຖືໃນໂປຣໄຟລ໌ສ່ວນຕົວຂອງທ່ານ"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"ຂໍ້ມູນລັບທີ່ເຊື່ອຖືໃນໂປຣໄຟລ໌ບ່ອນເຮັດວຽກຂອງທ່ານ"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">ຂັ້ນຕ່ຳ <xliff:g id="COUNT_1">%d</xliff:g> ໃບຮັບຮອງ CA</item>
       <item quantity="one">ຂັ້ນຕ່ຳ <xliff:g id="COUNT_0">%d</xliff:g> ໃບຮັບຮອງ CA</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"ຂໍ້ມູນການເປີດນຳໃຊ້ເຄືອຂ່າຍ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Carrier Provisioning"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"ມີຫຍັງໃໝ່ ແລະ ໜ້າຕື່ນເຕັ້ນ?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ກວດເບິ່ງຄຸນສົມບັດຍອດນິຍົມ 5 ອັນດັບ"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"ລອງເບິ່ງໂທລະສັບໃໝ່ຂອງທ່ານ"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ລອງເບິ່ງແທັບເລັດໃໝ່ຂອງທ່ານ"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"ລອງເບິ່ງອຸປະກອນໃໝ່ຂອງທ່ານ"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"ຄຸນສົມບັດນີ້ບໍ່ສາມາດໃຊ້ໄດ້ໃນອຸປະກອນນີ້ໄດ້"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"ສະຖານະການລົງທະບຽນ IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"ລົງທະບຽນແລ້ວ"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"ບໍ່ໄດ້ລົງທະບຽນ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 152b266..075e437 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -168,7 +168,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s nori pasiekti jūsų pranešimus. Suteikti prieigą %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM prieigos užklausa"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"„<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>“ nori pasiekti jūsų SIM kortelę. Suteikus prieigą prie SIM kortelės bus išjungtas duomenų ryšys įrenginyje, kol veiks šis ryšys. Leiskite pasiekti „<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>“"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Kitiems įrenginiams matomas kaip „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Kitiems įrenginiams matomas kaip „<xliff:g id="DEVICE_NAME">^1</xliff:g>“ įrenginys"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Jūsų įrenginiai"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Susieti naują įrenginį"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data ir laikas"</string>
@@ -378,6 +378,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Kitas"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Praleisti kontrolinį kodą?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Kontrolinio kodo sąranka užtrunka tik minutę ar dvi. Jei praleisite šį veiksmą, vėliau kontrolinį kodą galėsite pridėti nustatymuose."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Praleisti ekrano užraktą?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Įrenginio apsaugos funkcijos nebus įjungtos. Negalėsite užtikrinti, kad kiti asmenys negalėtų pasinaudoti planšetiniu kompiuteriu, jei jis bus pavogtas ar nustatytas iš naujo arba jį pamesite."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Įrenginio apsaugos funkcijos nebus įjungtos. Negalėsite užtikrinti, kad kiti asmenys negalėtų pasinaudoti įrenginiu, jei jis bus pavogtas ar nustatytas iš naujo arba jį pamesite."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Įrenginio apsaugos funkcijos nebus įjungtos. Negalėsite užtikrinti, kad kiti asmenys negalėtų pasinaudoti telefonu, jei jis bus pavogtas ar nustatytas iš naujo arba jį pamesite."</string>
@@ -417,6 +420,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Pridėjote maksimalų skaičių kontrolinių kodų"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Negalima pridėti daugiau kontrolinių kodų"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Pašalinti visus kontrolinius kodus?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Pašalinti „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Ar norite ištrinti šį kontrolinį kodą?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Negalėsite naudoti kontrolinių kodų norėdami atrakinti telefoną, įgalioti pirkimo procesus ar prisijungti prie programų"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Negalėsite naudoti kontrolinių kodų norėdami atrakinti darbo profilį, įgalioti pirkimo operacijas ar prisijungti prie darbo programų"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Taip, pašalinti"</string>
@@ -461,7 +466,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Apsaugok. planš. komp."</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Apsaugokite įrenginį"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Apsaugokite savo telefoną"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Kad dar labiau apsaugotumėte įrenginį, nustatykite atsarginį ekrano užraktą."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Kad dar labiau apsaugotumėte įrenginį, nustatykite atsarginį ekrano užraktą."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Neleiskite kitiems asmenims naudoti šio planšetinio kompiuterio be leidimo, suaktyvinę įrenginio apsaugos funkcijas. Pasirinkite norimą naudoti užrakinimo ekraną."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Neleiskite kitiems asmenims naudoti šio įrenginio be jūsų leidimo, suaktyvinę įrenginio apsaugos funkcijas. Pasirinkite norimą naudoti užrakinimo ekraną."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Neleiskite kitiems asmenims naudoti šio telefono be jūsų leidimo, suaktyvinę įrenginio apsaugos funkcijas. Pasirinkite norimą naudoti užrakinimo ekraną."</string>
@@ -503,37 +508,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Pašalinti įrenginio apsaugą?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Pašalinti profilio apsaugą?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Įrenginio apsaugos funkcijos neveiks be atrakinimo piešinio."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Įrenginio apsaugos funkcijos neveiks be atrakinimo piešinio.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Įrenginio apsaugos funkcijos neveiks be atrakinimo piešinio.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Išsaugoti kontroliniai kodai taip pat bus pašalinti iš šio įrenginio ir negalėsite atrakinti telefono, įgalioti pirkimo veiksmų ar prisijungti prie programų."</string>
+</xliff:g>Išsaugoti kontroliniai kodai taip pat bus pašalinti iš šio įrenginio ir jūs negalėsite atrakinti telefono, įgalioti pirkimo veiksmų ar prisijungti prie programų juos naudodami."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Įrenginio apsaugos funkcijos neveiks be PIN kodo."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Įrenginio apsaugos funkcijos neveiks be PIN kodo.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Įrenginio apsaugos funkcijos neveiks be PIN kodo.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Išsaugoti kontroliniai kodai taip pat bus pašalinti iš šio įrenginio ir negalėsite atrakinti telefono, įgalioti pirkimų ar prisijungti prie programų."</string>
+</xliff:g>Išsaugoti kontroliniai kodai taip pat bus pašalinti iš šio įrenginio ir jūs negalėsite atrakinti telefono, įgalioti pirkimo veiksmų ar prisijungti prie programų juos naudodami."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Įrenginio apsaugos funkcijos neveiks be slaptažodžio."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Įrenginio apsaugos funkcijos neveiks be slaptažodžio.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Įrenginio apsaugos funkcijos neveiks be slaptažodžio.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Išsaugoti kontroliniai kodai taip pat bus pašalinti iš šio įrenginio ir negalėsite atrakinti telefono, įgalioti pirkimo veiksmų ar prisijungti prie programų."</string>
+</xliff:g>Išsaugoti kontroliniai kodai taip pat bus pašalinti iš šio įrenginio ir jūs negalėsite atrakinti telefono, įgalioti pirkimo veiksmų ar prisijungti prie programų juos naudodami."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Įrenginio apsaugos funkcijos neveiks be ekrano užrakto."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Įrenginio apsaugos funkcijos neveiks be ekrano užrakto.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Įrenginio apsaugos funkcijos neveiks be ekrano užrakto.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Išsaugoti kontroliniai kodai taip pat bus pašalinti iš šio įrenginio ir negalėsite atrakinti telefono, įgalioti pirkimų ar prisijungti prie programų."</string>
+</xliff:g>Išsaugoti kontroliniai kodai taip pat bus pašalinti iš šio įrenginio ir jūs negalėsite atrakinti telefono, įgalioti pirkimo veiksmų ar prisijungti prie programų juos naudodami."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Profilio apsaugos funkcijos neveiks be atrakinimo piešinio."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Profilio apsaugos funkcijos neveiks be atrakinimo piešinio.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Profilio apsaugos funkcijos neveiks be atrakinimo piešinio.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Išsaugoti kontroliniai kodai taip pat bus pašalinti iš šio profilio ir naudodami juos negalėsite atrakinti profilio, įgalioti pirkinių ar prisijungti prie programų."</string>
+</xliff:g>Išsaugoti kontroliniai kodai taip pat bus pašalinti iš šio profilio ir jūs negalėsite atrakinti profilio, įgalioti pirkimo veiksmų ar prisijungti prie programų juos naudodami."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Profilio apsaugos funkcijos neveiks be PIN kodo."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Profilio apsaugos funkcijos neveiks be PIN kodo.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Profilio apsaugos funkcijos neveiks be PIN kodo.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Išsaugoti kontroliniai kodai taip pat bus pašalinti iš šio profilio ir naudodami juos negalėsite atrakinti profilio, įgalioti pirkinių ar prisijungti prie programų."</string>
+</xliff:g>Išsaugoti kontroliniai kodai taip pat bus pašalinti iš šio profilio ir jūs negalėsite atrakinti profilio, įgalioti pirkimo veiksmų ar prisijungti prie programų juos naudodami."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Profilio apsaugos funkcijos neveiks be slaptažodžio."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Profilio apsaugos funkcijos neveiks be slaptažodžio.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Profilio apsaugos funkcijos neveiks be slaptažodžio.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Išsaugoti kontroliniai kodai taip pat bus pašalinti iš šio profilio ir naudodami juos negalėsite atrakinti profilio, įgalioti pirkinių ar prisijungti prie programų."</string>
+</xliff:g>Išsaugoti kontroliniai kodai taip pat bus pašalinti iš šio profilio ir jūs negalėsite atrakinti profilio, įgalioti pirkimo veiksmų ar prisijungti prie programų juos naudodami."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Profilio apsaugos funkcijos neveiks be ekrano užrakto."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Profilio apsaugos funkcijos neveiks be ekrano užrakto.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Profilio apsaugos funkcijos neveiks be ekrano užrakto.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Išsaugoti kontroliniai kodai taip pat bus pašalinti iš šio profilio ir naudodami juos negalėsite atrakinti profilio, įgalioti pirkinių ar prisijungti prie programų."</string>
+</xliff:g>Išsaugoti kontroliniai kodai taip pat bus pašalinti iš šio profilio ir jūs negalėsite atrakinti profilio, įgalioti pirkimo veiksmų ar prisijungti prie programų juos naudodami."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Taip, pašalinti"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Keisti atrakinimo modelį"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Pakeisti atrakinimo PIN kodą"</string>
@@ -604,6 +609,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Didėjanti, mažėjanti ar pasikartojanti skaitmenų seka neleidžiama"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Gerai"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Atšaukti"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Išvalyti"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Atšaukti"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Kitas"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Sąranka baigta."</string>
@@ -838,6 +844,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Galima WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (galima WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Įveskite tinklo slaptažodį"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Operatoriaus „Wi‑Fi“ ryšio tinklas"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Prisijunkite per „<xliff:g id="NAME">%1%s</xliff:g>“"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Siekiant tiksliau nustatyti vietą ir dėl kitų priežasčių, „<xliff:g id="APP_NAME">%1$s</xliff:g>“ prašo leidimo nuskaityti tinklus, net kai „Wi-Fi“ yra išjungtas.\n\nAr norite suteikti leidimą nuskaityti visoms to prašančioms programoms?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Kad išjungtumėte, perpildymo meniu eikite į skiltį „Išplėstiniai“"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Leisti"</string>
@@ -855,6 +863,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Prijungti"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Jungiantis prie tinklo įvyko klaida."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Pamiršti"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Keisti"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Ištrinant tinklą įvyko klaida."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Išsaugoti"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Išsaugant tinklą įvyko klaida."</string>
@@ -869,6 +878,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Išplėstinis „Wi-Fi“"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC adresas"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP adresas"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Tinklo informacija"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Potinklio kaukė"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"„IPv6“ adresai"</string>
@@ -901,16 +911,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Atšaukti kvietimą?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Ar norite atšaukti kvietimą prisijungti prie <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Pamiršti šią grupę?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Kilnojamasis „Wi-Fi“ viešosios interneto prieigos taškas"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"„Wi-Fi“ vieš. int. pr. taškas"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Internetas ar turinys nebendrinamas su kitais įrenginiais"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Šio planšetinio kompiuterio interneto ryšys bendrinamas per viešosios interneto prieigos tašką"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Šio telefono interneto ryšys bendrinamas per viešosios interneto prieigos tašką"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Programa bendrina turinį. Norėdami bendrinti interneto ryšį, išjunkite viešosios interneto prieigos tašką ir vėl jį įjunkite."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"„Wi‑Fi“ pavadinimas"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Viešosios interneto prieigos taško pavadinimas"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Įjungiamas „<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>“..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Kiti įrenginiai gali prisijungti prie „<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>“"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"„Wi-Fi“ slaptažodis"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Viešosios interneto prieigos taško slaptažodis"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Prieigos taško juosta"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Naudodami viešosios interneto prieigos tašką, galite sukurti „Wi‑Fi“ tinklą kitiems įrenginiams. Internetas teikiamas per viešosios interneto prieigos tašką naudojant mobiliųjų duomenų ryšį. Gali būti taikomi papildomi mobiliojo ryšio duomenų mokesčiai."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Programos gali sukurti viešosios interneto prieigos tašką ir bendrinti turinį su netoliese esančiais įrenginiais."</string>
@@ -962,7 +971,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Adresas, kurį kaip jūsų vietovę naudoja pagalbos tarnybos, jei skambinate pagalbos numeriu naudodami „Wi-Fi“"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekranas"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Garsas"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Garsumas"</string>
@@ -1016,6 +1025,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Ieškoti"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Valdyti paieškos nustatymus ir istoriją"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nėra jokių rezultatų"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Išvalyti istoriją"</string>
     <string name="display_settings" msgid="7965901687241669598">"Ekranas"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Automatiškai sukti ekraną"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Ryškios spalvos"</string>
@@ -1350,8 +1360,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Atkuriami numatytieji APN nustatymai."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Nustatyti iš naujo į numatytuosius nustatymus"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Numatytųjų APN nustatymų nustatymas iš naujo baigtas."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Nustatyti iš naujo"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Tinklo nust. nustatymas iš naujo"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Nustatyti parinktis iš naujo"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Tinklą, programas arba įrenginį galima nustatyti iš naujo"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Iš naujo nustatyti „Wi-Fi“, mobiliųjų duomenų ir „Bluetooth“ nustatymus"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Bus iš naujo nustatyti visi tinklo nustatymai, įskaitant:\n\n"<li>"„Wi‑Fi“;"</li>\n<li>"mobiliojo ryšio duomenis;"</li>\n<li>"„Bluetooth“."</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Nustatyti iš naujo"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Iš naujo nustatyti visus tinklo nustatymus? Šio veiksmo negalėsite anuliuoti!"</string>
@@ -1359,14 +1370,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Nustatyti iš naujo?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Šis naudotojas negali iš naujo nustatyti tinklo"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Tinklo nustatymai nustatyti iš naujo"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Gamyklos duomenų nustatymas iš naujo"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> paskyra bus nustatyta iš naujo</item>
-      <item quantity="few"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> paskyros bus nustatytos iš naujo</item>
-      <item quantity="many"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> paskyros bus nustatyta iš naujo</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> paskyrų bus nustatyta iš naujo</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Vidinė saugykla ir visi duomenys bus nustatyti iš naujo"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Ištrinti visus duomenis (atkurti gamyklinius duomenis)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Taip bus ištrinti visi duomenys iš planšetinio kompiuterio "<b>"vidinės atminties"</b>", įskaitant:\n\n"<li>"„Google“ paskyrą"</li>\n<li>"Sistemos ir programų duomenis bei nustatymus"</li>\n<li>"Atsisiųstas programas"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Taip bus ištrinti visi toliau nurodyti duomenys iš telefono "<b>"vidinės atminties"</b>".\n\n"<li>"„Google“ paskyra"</li>\n<li>"Sistemos ir programų duomenys bei nustatymai"</li>\n<li>"Atsisiųstos programos"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Šiuo metu esate prisijungę prie šių paskyrų:\n"</string>
@@ -1490,15 +1494,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Saugos informacija"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nėra duomenų ryšio. Jei norite dabar peržiūrėti šią informaciją, bet kuriuo prie interneto prijungtu kompiuteriu eikite į %s."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Įkeliama…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Pasirinkite slaptažodį"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ekrano užrakto nustatymas"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Kad užtikrintumėte saugumą, nustatykite slaptažodį"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Nust. slapt., kad gal. naud. kont. kodą"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Pasirinkite piešinį"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Nust. atrak. pieš., kad gal. naud. kont. kodą"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Pasirinkite PIN kodą"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Kad užtikrintumėte saugumą, nustatykite PIN kodą"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Nus. PIN kodą, kad gal. naud. kon. kodą"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Patvirtinkite slaptažodį"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Įveskite slaptažodį iš naujo"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Patvirtinkite piešinį"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Patvirtinkite savo PIN kodą"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Įveskite PIN kodą iš naujo"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Slaptažodžiai neatitinka"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN kodai neatitinka"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Atrakinimo pasirinkimas"</string>
@@ -1511,12 +1516,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Jei norite tęsti, naudokite darbo atrakinimo piešinį"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Jei norite tęsti, įveskite darbo PIN kodą"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Jei norite tęsti, įveskite darbo slaptažodį"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Norėdami tęsti naudokite įrenginio atrakinimo piešinį. Jo reikia iš naujo paleidus įrenginį."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Norėdami tęsti įveskite įrenginio PIN kodą. Jo reikia iš naujo paleidus įrenginį."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Norėdami tęsti įveskite įrenginio slaptažodį. Jo reikia iš naujo paleidus įrenginį."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Norėdami tęsti naudokite darbo atrakinimo piešinį. Jo reikia iš naujo paleidus įrenginį."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Norėdami tęsti įveskite darbo PIN kodą. Jo reikia iš naujo paleidus įrenginį."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Norėdami tęsti įveskite darbo slaptažodį. Jo reikia iš naujo paleidus įrenginį."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Kad dar labiau apsaugotumėte įrenginį, naudokite įrenginio atrakinimo piešinį"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Kad dar labiau apsaugotumėte įrenginį, įveskite įrenginio PIN kodą"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Kad dar labiau apsaugotumėte įrenginį, įveskite įrenginio slaptažodį"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Kad dar labiau apsaugotumėte įrenginį, naudokite darbo profilio atrakinimo piešinį"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Kad dar labiau apsaugotumėte įrenginį, įveskite darbo profilio PIN kodą"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Kad dar labiau apsaugotumėte įrenginį, įveskite darbo profilio slaptažodį"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Atkurti telefono gamykl. nust. Jei norite naudoti šį telef., įveskite ankstesnį atrakinimo piešinį."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Atkurti telefono gamykl. nustatymai. Jei norite naudoti šį telefoną, įveskite ankstesnį PIN kodą."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Atkurti telefono gamykl. nustatymai. Jei norite naudoti šį telefoną, įveskite ankstesnį slaptažodį."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Patvirtinkite atrakinimo piešinį"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Patvirtinkite PIN kodą"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Patvirtinkite slaptažodį"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Netinkamas PIN kodas"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Netinkamas slaptažodis"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Netinkamas piešinys"</string>
@@ -1821,13 +1832,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Sukurti valdiklį ir leisti prieigą?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Sukūrus valdiklį, „<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>“ gali pasiekti visus jame pateikiamus duomenis."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Visada leisti „<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>“ kurti valdiklius ir pasiekti jų duomenis"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> d. <xliff:g id="HOURS">%2$d</xliff:g> val. <xliff:g id="MINUTES">%3$d</xliff:g> min. <xliff:g id="SECONDS">%4$d</xliff:g> sek."</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> val. <xliff:g id="MINUTES">%2$d</xliff:g> min. <xliff:g id="SECONDS">%3$d</xliff:g> sek."</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> min. <xliff:g id="SECONDS">%2$d</xliff:g> sek."</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> sek."</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d. <xliff:g id="HOURS">%2$d</xliff:g> val. <xliff:g id="MINUTES">%3$d</xliff:g> min."</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> val. <xliff:g id="MINUTES">%2$d</xliff:g> min."</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min."</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Naudojimo statistika"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Naudojimo statistika"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Rūšiuoti pagal:"</string>
@@ -1839,7 +1843,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Ekrano skaitytuvai, vaizdo, sąveikos valdikliai"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Matomumo nustatymai"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Galite tinkinti šį įrenginį pagal savo poreikius. Vėliau šias pritaikymo neįgaliesiems funkcijas galite pakeisti nustatymuose."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Padidinkite šrifto dydį"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Pakeisti šrifto dydį"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Ekrano skaitytuvai"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Garsas ir tekstas ekrane"</string>
     <string name="display_category_title" msgid="685461049938269166">"Ekranas"</string>
@@ -1860,10 +1864,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Jei norite keisti mastelį"</b>", greitai palieskite ekraną 3 kartus.\n"<ul><li>"Vilkite 2 ar daugiau pirštų, kad slinktumėte."</li>\n<li>"Suimkite 2 ar daugiau pirštų, kad koreguotumėte mastelio keitimą."</li></ul>\n\n<b>"Jei norite laikinai keisti mastelį"</b>", greitai palieskite ekraną 3 kartus ir laikykite palietę pirštu po trečio palietimo.\n"<ul><li>"Vilkite pirštą, kad judėtumėte ekranu."</li>\n<li>"Atkelkite pirštą, kad tolintumėte."</li></ul>\n\n"Negalite artinti klaviatūroje ir naršymo juostoje."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Kai didinimas įjungtas, naudokite ekrano apačioje esantį pritaikymo neįgaliesiems mygtuką, kad greitai padidintumėte.\n\n"<b>"Jei norite keisti mastelį"</b>", palieskite pritaikymo neįgaliesiems mygtuką, tada palieskite bet kurią ekrano vietą.\n"<ul><li>"Vilkite 2 ar daugiau pirštų, kad slinktumėte."</li>\n<li>"Suimkite 2 ar daugiau pirštų, kad koreguotumėte mastelio keitimą."</li></ul>\n\n<b>"Jei norite laikinai pakeisti mastelį"</b>", palieskite pritaikymo neįgaliesiems mygtuką, tada palieskite ir laikykite bet kurią ekrano vietą.\n"<ul><li>"Vilkite pirštą, kad judėtumėte ekranu."</li>\n<li>"Pakelkite pirštą, kad tolintumėte."</li></ul>\n\n"Negalite artinti klaviatūroje ar naršymo juostoje."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Pritaikymo mobiliesiems mygtukas nustatytas į „<xliff:g id="SERVICE">%1$s</xliff:g>“. Jei norite naudoti didinimo funkciją, palieskite ir palaikykite pritaikymo neįgaliesiems mygtuką, tada pasirinkite didinimo funkciją."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Spart. pritaikymo neįgal. įjungimas"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Garsumo spartusis klavišas"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Šaukinio paslauga"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Leisti iš užrakinimo ekrano"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Kai įjungtas spartusis klavišas, galite nuspausti abu garsumo mygtukus 3 sekundes, kad būtų paleista pritaikymo neįgaliesiems funkcija."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Kai įjungtas spartusis klavišas, galite paspausti abu garsumo klavišus ir palaikyti 3 sekundes, kad būtų paleista pritaikymo neįgaliesiems funkcija."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Didelio kontrasto tekstas"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Automat. atnaujinti ekrano didinimą"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Atnaujinti ekrano didinimą perkeliant programas"</string>
@@ -1876,7 +1880,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Gali paveikti našumą"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Spustelėkite, kai žymeklis nustos judėti"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Delsa prieš paspaudimą"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ĮJUNGTI"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"IŠJUNGTA"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Rodyti sparčiuosiuose nustatymuose"</string>
@@ -2402,6 +2405,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"pasirinkti (-a) <xliff:g id="NUMBER">%1$d</xliff:g> iš <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> iš <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Pasirinkti viską"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Tvarkyti planus"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Duomenų naudojimas"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Programos duomenų naud."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operatoriaus duomenų apskaita gali skirtis nuo jūsų įrenginio apskaitos."</string>
@@ -2487,6 +2491,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobiliojo ryšio tinklai"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Matuojami „Wi-Fi“ tinklai"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Kad galėtumėte pasirinkti matuojamus tinklus, įjunkite „Wi-Fi“."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatinis"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Matuojamas"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Nematuojamas"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Operatoriaus duomenų apskaita gali skirtis nuo informacijos įrenginyje."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Skambutis pagalbos numeriu"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Grįžti prie skambučio"</string>
@@ -2712,7 +2719,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Skambučių tvarkyklė"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Avarinės transliacijos"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Įspėjimai apie kritines situacijas"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Tinklo operatoriai"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Prieigos taškų pavadinimai"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Patobulintas 4G LTE režimas"</string>
@@ -2781,6 +2788,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Pageidautina SIM, skirta"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Klausti kaskart"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Būtina pasirinkti"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"SIM pasirinkimas"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Nustatymai"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="one">Rodyti %d paslėptą elementą</item>
@@ -2936,18 +2944,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Programų pranešimai"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Pranešimo kategorija"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Svarba"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Leisti programai nuspręsti"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Leisti garsą"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Niekada nerodyti pranešimų"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Neskambėti ir nepertraukti vaizdo"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Nėra garso"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Skambėti"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Skambėti ir iššokti ekrane"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Iššokantysis langas ekrane"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Žemas"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Vidutinis"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Aukštas"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Skubus"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Leisti garsą"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Neskambėti, nevibruoti arba nerodyti šių pranešimų dabartiniame ekrane."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Leisti pertrauktis"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Leisti programai skambėti, vibruoti ir (arba) rodyti pranešimus ekrane"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Maža svarba"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Vidutinė svarba"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Didelė svarba"</string>
@@ -2980,7 +2989,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"vaizdas vaizde"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Vaizdas vaizde"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Leisti vaizdą vaizde"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Leisti šiai programai kurti vaizdo vaizde langą, kol programa atidaryta arba iš jos išėjus (pvz., kad galėtumėte ir toliau žiūrėti vaizdo įrašą). Šis langas rodomas virš kitų naudojamų programų."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Leisti šiai programai kurti vaizdo vaizde langą, kol programa yra atidaryta arba ją uždarius (pvz., kad galėtumėte ir toliau žiūrėti vaizdo įrašą). Šis langas rodomas virš kitų naudojamų programų."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Prieiga „Netrukdyti“"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Jokios įdiegtos programos nepateikė prieigos „Netrukdyti“ užklausos"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Įkeliamos programos..."</string>
@@ -3303,6 +3312,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Failų perdavimas"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Nuotraukų perdavimas (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Įrenginio naudojimas kaip MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS ekrano vaizdo bendrinimas"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Fono tikrinimas"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Visateisė prieiga prie fono"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Naudoti tekstą iš ekrano"</string>
@@ -3449,6 +3459,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="night_display_suggestion_title" msgid="6602129097059325291">"Nakties šviesos tvarkaraščio nustatymas"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Sut. ekr. gin. atsp., kad užm."</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Nakties šviesa įjungta"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Ekranas rodomas gintaro spalvos atspalviu. Tai gali padėti užmigti."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Pasiūlymai"</string>
@@ -3471,6 +3483,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Naudoti šaltesnes ekrano spalvas"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Kad pritaikytumėte spalvos pakeitimą, išjunkite ekraną"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Kad pritaikytumėte telefonijos stebėjimo priemonės pakeitimą, paleiskite įrenginį iš naujo"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Fotoaparatas HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Kad pritaikytumėte fotoaparato HAL HDR+ pakeitimą, paleiskite įrenginį iš naujo"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Fotoaparato lazerio jutiklis"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatiniai sistemos naujiniai"</string>
     <string name="usage" msgid="2977875522080448986">"Naudojimas"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobiliojo ryšio duom. naud."</string>
@@ -3498,7 +3513,7 @@
     <string name="data_warning" msgid="209133958008062117">"Duomenų įspėjimas"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Nustatyti duomenų apribojimą"</string>
     <string name="data_limit" msgid="1885406964934590552">"Duomenų apribojimas"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> išnaudota <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g> sunaudota: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigūruoti"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Kitos įtrauktos naudojamos programos"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3571,7 +3586,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Išvalyti ir konvertuoti"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Iš naujo nustatyti „ShortcutManager“ įkainių ribojimą"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"„ShortcutManager“ įkainių ribojimas nustatytas iš naujo"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Užrakinimo ekrano pranešimų valdymas"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Valdykite informaciją užrakinimo ekrane"</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="8483187649355540109">"Palaik. ir patarimai"</string>
@@ -3579,7 +3594,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Nėra jokių įdiegtų programų, pateikusių išskirtinių SMS prieigos užklausą"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Išskirtiniai SMS gali būti mokami ir į operatoriaus sąskaitas gali būti įtraukta papildomų mokesčių. Jei įgalinsite programos leidimą, galėsite siųsti išskirtinius SMS naudodami tą programą."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Išskirtinių SMS prieiga"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Nematoma kitiems įrenginiams"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Išjungta"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Prisijungta prie „<xliff:g id="ID_1">%1$s</xliff:g>“"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Prisijungta prie kelių įrenginių"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Sistemos NS demonstracinis režimas"</string>
@@ -3687,7 +3702,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Akimirksniu įkeliamos programėlės"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Atidaryti nuorodas programose, net jei jos neįdiegtos"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Akimirksniu įkeliamos programėlės"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Akimirksniu įkeliamų programėlių paskyra"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"„Android“ akimirksniu įkeliamų programėlių nuostatos"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Įdiegtos programos"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Saugyklą dabar tvarko saugyklos valdytojas"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> paskyros"</string>
@@ -3738,7 +3753,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Visada įjungto VPN funkcija įjungta jūsų asmeniniame profilyje"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Visada įjungto VPN funkcija įjungta jūsų darbo profilyje"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Nustatytas visuotinis HTTP tarpinis serveris"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Patikimi prisijungimo duomenys"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Patikimi prisijungimo duomenys"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Patikimi prisijungimo duomenys asmeniniame profilyje"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Patikimi prisijungimo duomenys darbo profilyje"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">Mažiausiai <xliff:g id="COUNT_1">%d</xliff:g> CA sertifikatas</item>
       <item quantity="few">Mažiausiai <xliff:g id="COUNT_1">%d</xliff:g> CA sertifikatai</item>
@@ -3811,7 +3828,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operatoriaus aprūpinimo informacija"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktyviklio operatoriaus aprūpinimas"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Kas nauja ir verta dėmesio?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Sužinokite 5 geriausias funkcijas"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Peržiūrėkite naujo telefono apžvalgą"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Peržiūrėkite naujo planšetinio kompiuterio apžvalgą"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Peržiūrėkite naujo įrenginio apžvalgą"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ši funkcija nepasiekiama šiame įrenginyje"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS registracijos būsena"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Užregistruota"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Neužregistruota"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 977013a..dd2d012 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -167,7 +167,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Ierīce “%1$s” vēlas piekļūt jūsu ziņojumiem. Vai sniegt piekļuvi ierīcei “%2$s”?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Pieprasījums piekļūt SIM kartei"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> pieprasa piekļuvi SIM kartei. Piešķirot piekļuvi SIM kartei, savienojuma laikā ierīcē tiks atspējota datu savienojamība. Piešķirt piekļuvi ierīcei <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Citām ierīcēm redzama kā “<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Citām ierīcēm redzama kā “<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Jūsu ierīces"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Savienošana pārī ar jaunu ierīci"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datums un laiks"</string>
@@ -375,6 +375,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Tālāk"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Izlaist pirksta nospiedumu?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Pirksta nospieduma iestatīšana ilgst tikai pāris minūtes. Ja to izlaidīsiet, varēsiet pirksta nospiedumu pievienot vēlāk iestatījumos."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Vai izlaist ekrāna bloķēšanu?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Ierīces aizsardzības funkcijas netiks ieslēgtas. Jūs nevarēsiet nodrošināt, ka šo planšetdatoru neizmantos citas personas, ja tas tiks pazaudēts, nozagts vai atiestatīts."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Ierīces aizsardzības funkcijas netiks ieslēgtas. Jūs nevarēsiet nodrošināt, ka šo ierīci neizmantos citas personas, ja tā tiks pazaudēta, nozagta vai atiestatīta."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Ierīces aizsardzības funkcijas netiks ieslēgtas. Jūs nevarēsiet nodrošināt, ka šo tālruni neizmantos citas personas, ja tas tiks pazaudēts, nozagts vai atiestatīts."</string>
@@ -414,6 +417,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Jūs esat pievienojis maksimālo pirkstu nospiedumu skaitu."</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Nevar pievienot citus pirkstu nospiedumus."</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Vai noņemt visus nospiedumus?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"“<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>” noņemšana"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Vai vēlaties dzēst šo pirksta nospiedumu?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Jūs nevarēsiet izmantot pirkstu nospiedumus, lai atbloķētu tālruni, autorizētu pirkumus vai pierakstītos lietotnēs."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Jūs nevarēsiet izmantot pirkstu nospiedumus, lai atbloķētu darba profilu, autorizētu pirkumus vai pierakstītos darba lietotnēs."</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Jā, noņemt"</string>
@@ -458,7 +463,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Aizsargājiet planšetd."</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Aizsargājiet ierīci"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Aizsargājiet tālruni"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Papildu drošībai iestatiet rezerves ekrāna bloķēšanu."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Papildu drošībai iestatiet rezerves ekrāna bloķēšanu."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Aktivizējiet ierīces aizsardzības funkcijas, lai neļautu citiem lietot šo planšetdatoru bez jūsu atļaujas. Izvēlieties bloķēšanas ekrānu, kuru vēlaties izmantot."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Aktivizējiet ierīces aizsardzības funkcijas, lai neļautu citiem lietot šo ierīci bez jūsu atļaujas. Izvēlieties bloķēšanas ekrānu, kuru vēlaties izmantot."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Aktivizējiet ierīces aizsardzības funkcijas, lai neļautu citiem lietot šo tālruni bez jūsu atļaujas. Izvēlieties bloķēšanas ekrānu, kuru vēlaties izmantot."</string>
@@ -500,37 +505,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Vai atspējot ierīces aizsardzību?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Vai noņemt profila aizsardzību?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Ja tiks noņemta kombinācija, ierīces aizsardzības funkcijas nedarbosies."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Ja tiks noņemta kombinācija, ierīces aizsardzības funkcijas nedarbosies.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Ja tiks noņemta kombinācija, ierīces aizsardzības funkcijas nedarbosies.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>No šīs ierīces tiks noņemti arī saglabātie pirkstu nospiedumi, un jūs vairs nevarēsiet tos izmantot, lai atbloķētu tālruni, apstiprinātu pirkumus vai pierakstītos lietotnēs.”"</string>
+</xliff:g>No šīs ierīces tiks noņemti arī saglabātie pirkstu nospiedumi, un jūs vairs nevarēsiet tos izmantot, lai atbloķētu tālruni, apstiprinātu pirkumus vai pierakstītos lietotnēs."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Ja tiks noņemts PIN kods, ierīces aizsardzības funkcijas nedarbosies."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Ja tiks noņemts PIN kods, ierīces aizsardzības funkcijas nedarbosies.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Ja tiks noņemts PIN, ierīces aizsardzības funkcijas nedarbosies.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>No šīs ierīces tiks noņemti arī saglabātie pirkstu nospiedumi, un jūs vairs nevarēsiet tos izmantot, lai atbloķētu tālruni, apstiprinātu pirkumus vai pierakstītos lietotnēs.”"</string>
+</xliff:g>No šīs ierīces tiks noņemti arī saglabātie pirkstu nospiedumi, un jūs vairs nevarēsiet tos izmantot, lai atbloķētu tālruni, apstiprinātu pirkumus vai pierakstītos lietotnēs."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Ja tiks noņemta parole, ierīces aizsardzības funkcijas nedarbosies."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Ja tiks noņemta parole, ierīces aizsardzības funkcijas nedarbosies.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Ja tiks noņemta parole, ierīces aizsardzības funkcijas nedarbosies.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>No šīs ierīces tiks noņemti arī saglabātie pirkstu nospiedumi, un jūs vairs nevarēsiet tos izmantot, lai atbloķētu tālruni, apstiprinātu pirkumus vai pierakstītos lietotnēs."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Ja tiks atspējota ekrāna bloķēšana, ierīces aizsardzības funkcijas nedarbosies."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Ja tiks atspējota ekrāna bloķēšana, ierīces aizsardzības funkcijas nedarbosies.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Ja tiks atspējota ekrāna bloķēšana, ierīces aizsardzības funkcijas nedarbosies.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>No šīs ierīces tiks noņemti arī saglabātie pirkstu nospiedumi, un jūs vairs nevarēsiet tos izmantot, lai atbloķētu tālruni, apstiprinātu pirkumus vai pierakstītos lietotnēs.”"</string>
+</xliff:g>No šīs ierīces tiks noņemti arī saglabātie pirkstu nospiedumi, un jūs vairs nevarēsiet tos izmantot, lai atbloķētu tālruni, apstiprinātu pirkumus vai pierakstītos lietotnēs."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Ja tiks noņemta kombinācija, profila aizsardzības funkcijas nedarbosies."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Ja tiks noņemta kombinācija, profila aizsardzības funkcijas nedarbosies.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Ja tiks noņemta kombinācija, profila aizsardzības funkcijas nedarbosies.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>No šī profila tiks noņemti arī saglabātie pirkstu nospiedumi, un nevarēsiet atbloķēt profilu, autorizēt pirkumus vai pierakstīties lietotnēs, izmantojot pirkstu nospiedumus."</string>
+</xliff:g>No šī profila tiks noņemti arī saglabātie pirkstu nospiedumi, un jūs vairs nevarēsiet tos izmantot, lai atbloķētu profilu, apstiprinātu pirkumus vai pierakstītos lietotnēs."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Ja tiks noņemts PIN, profila aizsardzības funkcijas nedarbosies."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Ja tiks noņemts PIN, profila aizsardzības funkcijas nedarbosies.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Ja tiks noņemts PIN, profila aizsardzības funkcijas nedarbosies.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>No šī profila tiks noņemti arī saglabātie pirkstu nospiedumi, un nevarēsiet atbloķēt profilu, autorizēt pirkumus vai pierakstīties lietotnēs, izmantojot pirkstu nospiedumus."</string>
+</xliff:g>No šī profila tiks noņemti arī saglabātie pirkstu nospiedumi, un jūs vairs nevarēsiet tos izmantot, lai atbloķētu profilu, apstiprinātu pirkumus vai pierakstītos lietotnēs."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Ja tiks noņemta parole, profila aizsardzības funkcijas nedarbosies."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Ja tiks noņemta parole, profila aizsardzības funkcijas nedarbosies.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Ja tiks noņemta parole, profila aizsardzības funkcijas nedarbosies.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>No šī profila tiks noņemti arī saglabātie pirkstu nospiedumi, un nevarēsiet atbloķēt profilu, autorizēt pirkumus vai pierakstīties lietotnēs, izmantojot pirkstu nospiedumus."</string>
+</xliff:g>No šī profila tiks noņemti arī saglabātie pirkstu nospiedumi, un jūs vairs nevarēsiet tos izmantot, lai atbloķētu profilu, apstiprinātu pirkumus vai pierakstītos lietotnēs."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Ja tiks atspējota ekrāna bloķēšana, profila aizsardzības funkcijas nedarbosies."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Ja tiks atspējota ekrāna bloķēšana, profila aizsardzības funkcijas nedarbosies.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Ja tiks atspējota ekrāna bloķēšana, profila aizsardzības funkcijas nedarbosies.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>No šī profila tiks noņemti arī saglabātie pirkstu nospiedumi, un nevarēsiet atbloķēt profilu, autorizēt pirkumus vai pierakstīties lietotnēs, izmantojot pirkstu nospiedumus."</string>
+</xliff:g>No šī profila tiks noņemti arī saglabātie pirkstu nospiedumi, un jūs vairs nevarēsiet tos izmantot, lai atbloķētu profilu, apstiprinātu pirkumus vai pierakstītos lietotnēs."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Jā, atspējot"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Atbloķēšanas kombinācijas maiņa"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Mainīt atbloķēšanas PIN"</string>
@@ -595,6 +600,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Augoša, dilstoša vai atkārtota ciparu secība nav atļauta."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Labi"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Atcelt"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Labi"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Atcelt"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Tālāk"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Iestatīšana ir pabeigta."</string>
@@ -827,6 +833,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ir pieejams"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ir pieejams)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ievadiet tīkla paroli"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Mobilo sakaru operatora Wi‑Fi tīkls"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Izveidojiet savienojumu, izmantojot <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Lai uzlabotu atrašanās vietu noteikšanas precizitāti, kā arī citas funkcijas, lietotnē <xliff:g id="APP_NAME">%1$s</xliff:g> tiek pieprasīts ieslēgt tīkla skenēšanu, pat ja Wi-Fi savienojums ir izslēgts.\n\nVai atļaut šo darbību visām lietotnēm, kurās tiek pieprasīta skenēšana?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Lai to izslēgtu, pārpildes izvēlnē pārejiet uz sadaļu Papildu."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Atļaut"</string>
@@ -844,6 +852,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Izveidot savienojumu"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Neizdevās izveidot savienojumu ar tīklu."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Neiegaumēt"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Mainīt"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Neizdevās aizmirst tīklu."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Saglabāt"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Neizdevās saglabāt tīklu."</string>
@@ -857,6 +866,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Papildu Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC adrese"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP adrese"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Tīkla informācija"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Apakštīkla maska"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 adreses"</string>
@@ -889,16 +899,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Vai atcelt uzaicinājumu?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vai vēlaties atcelt uzaicinājumu izveidot savienojumu ar ierīci <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Vai aizmirst šo grupu?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Pārnēsājams Wi-Fi tīklājs"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi tīklājs"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Nenotiek interneta vai satura kopīgošana ar citām ierīcēm"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Šī planšetdatora interneta savienojums tiek kopīgots, izmantojot tīklāju"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Šī tālruņa interneta savienojums tiek kopīgots, izmantojot tīklāju"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Lietotne kopīgo saturu. Lai kopīgotu interneta savienojumu, izslēdziet un ieslēdziet tīklāju"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi nosaukums"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Tīklāja nosaukums"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Notiek tīklāja <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ieslēgšana..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Citas ierīces var savienot ar tīklāju <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi parole"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Tīklāja parole"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Piekļuves punkta josla"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Izmantojiet tīklāju, lai izveidotu Wi‑Fi tīklu citām savām ierīcēm. Tīklājs nodrošina internetu, izmantojot mobilo datu savienojumu. Var tikt piemērota papildu maksa par mobilo datu pārraidi."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Lietotnes var izveidot tīklāju satura kopīgošanai ar tuvumā esošajām ierīcēm."</string>
@@ -950,7 +959,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Adrese, ko izmantos ārkārtas palīdzības dienesti kā jūsu atrašanās vietu, ja zvanīsiet uz ārkārtas numuru, lietojot Wi-Fi."</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Displejs"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Skaņa"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Skaļumi"</string>
@@ -1004,6 +1013,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Meklēt"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Meklēšanas iestatījumu un vēstures pārvaldība"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nav rezultātu"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Dzēst vēsturi"</string>
     <string name="display_settings" msgid="7965901687241669598">"Attēls"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Automātiska ekrāna pagriešana"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Izteiksmīgas krāsas"</string>
@@ -1337,8 +1347,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Notiek APN noklusējuma iestatījumu atjaunošana."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Atiestatīt noklusējuma vērtības"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Noklusējuma APN iestatījumu atiestatīšana ir pabeigta."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Atiestatīšana"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Tīkla iest. atiestatīšana"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Atiestatīšanas opcijas"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Var atiestatīt tīklu, lietotnes vai ierīci"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Atiestatīt Wi-Fi, mobilo datu un Bluetooth iestatījumus"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Tādējādi tiks atiestatīti visi tīkla iestatījumi, tostarp:\n\n"<li>"Wi‑Fi;"</li>\n<li>"mobilie dati;"</li>\n<li>"Bluetooth."</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Atiestatīt iestatījumus"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Vai atiestatīt visus tīkla iestatījumus? Šo darbību nevarēs atsaukt."</string>
@@ -1346,13 +1357,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Vai atiestatīt?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Šim lietotājam nav pieejama tīkla atiestatīšana."</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Tīklu iestatījumi ir atiestatīti."</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Rūpnīcas datu atiest."</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="zero"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> konti tiks atiestatīti</item>
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> konts tiks atiestatīts</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> konti tiks atiestatīti</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Iekšējā krātuve un visi dati tiks atiestatīti"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Notīrīt visus datus (atiestatīt rūpnīcas datus)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Tādējādi tiks izdzēsti visi planšetdatora "<b>"iekšējā atmiņā"</b>" esošie dati, tostarp:\n\n"<li>"Google konta dati;"</li>\n<li>"sistēmas un lietotņu dati un iestatījumi;"</li>\n<li>"lejupielādētās lietotnes."</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Tiks dzēsti visi tālruņa "<b>"iekšējā atmiņā"</b>" esošie dati, tostarp:\n\n"<li>"Google konta dati;"</li>\n<li>"sistēmas un lietotņu dati un iestatījumi;"</li>\n<li>"lejupielādētās lietotnes."</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Pašlaik esat pierakstījies šādos kontos:\n"</string>
@@ -1476,15 +1481,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informācija par drošību"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nav izveidots datu pārraides savienojums. Lai skatītu šo informāciju tūlīt, jebkurā datorā ar interneta savienojumu apmeklējiet vietni %s."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Notiek ielāde…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Izvēlieties paroli"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ekrāna bloķēšanas iestatīšana"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Drošības nolūkos iestatiet paroli."</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Parole pirksta nosp. lietošanai"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Izvēlieties kombināciju"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Kombinācijas iestatīšana"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Izvēlieties PIN kodu"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Drošības nolūkos iestatiet PIN."</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"PIN pirksta nosp. lietošanai"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Apstipriniet paroli"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Atkārtota paroles ievade"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Apstipriniet kombināciju"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Apstipriniet savu PIN kodu"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Atkārtota PIN ievade"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Paroles nav vienādas"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN kodi ir atšķirīgi"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Atbloķēšanas atlase"</string>
@@ -1497,12 +1503,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Lai turpinātu, izmantojiet darba profila kombināciju."</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Lai turpinātu, ievadiet darba profila PIN kodu."</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Lai turpinātu, ievadiet darba profila paroli."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Lai turpinātu, izmantojiet ierīces kombināciju. Nepieciešams pēc ierīces restartēšanas."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Lai turpinātu, ievadiet ierīces PIN. Nepieciešams pēc ierīces restartēšanas."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Lai turpinātu, ievadiet ierīces paroli. Nepieciešams pēc ierīces restartēšanas."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Lai turpinātu, izmantojiet darba kombināciju. Nepieciešams pēc ierīces restartēšanas."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Lai turpinātu, ievadiet darba PIN. Nepieciešams pēc ierīces restartēšanas."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Lai turpinātu, ievadiet darba paroli. Nepieciešams pēc ierīces restartēšanas."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Papildu drošībai izmantojiet ierīces kombināciju."</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Papildu drošībai ievadiet ierīces PIN."</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Papildu drošībai ievadiet ierīces paroli."</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Papildu drošībai izmantojiet darba profila kombināciju."</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Papildu drošībai ievadiet darba profila PIN."</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Papildu drošībai ievadiet darba profila paroli."</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Tālrunī atiestatīti rūpnīcas iestatījumi. Lai izmantotu tālruni, ievadiet iepriekšējo kombināciju."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Tālrunī atiestatīti rūpnīcas iestatījumi. Lai izmantotu tālruni, ievadiet iepriekšējo PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Tālrunī atiestatīti rūpnīcas iestatījumi. Lai izmantotu tālruni, ievadiet iepriekšējo paroli."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verificējiet kombināciju"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verificējiet PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verificējiet paroli"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Nepareizs PIN kods"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Nepareiza parole"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Nepareiza kombinācija"</string>
@@ -1806,13 +1818,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vai izveidot logrīku un atļaut piekļuvi?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Pēc logrīka izveidošanas <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> var piekļūt visiem tajā attēlotajiem datiem."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Vienmēr ļaut <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> veidot logrīkus un piekļūt to datiem."</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> d. <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> m <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> m <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d. <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> min"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Lietojuma statistika"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Lietojuma statistika"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Kārtot pēc:"</string>
@@ -1824,7 +1829,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Ekrāna lasītāji, attēlojums, mijiedarbības vadīklas"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Redzes iestatījumi"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Varat pielāgot šo ierīci savām vajadzībām. Šīs pieejamības funkcijas var mainīt vēlāk sadaļā Iestatījumi."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Palielināt fonta izmēru"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Mainīt fonta lielumu"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Ekrāna lasītāji"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio un ekrānā redzamais teksts"</string>
     <string name="display_category_title" msgid="685461049938269166">"Attēlojums"</string>
@@ -1845,10 +1850,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Lai veiktu tālummaiņu"</b>", trīsreiz ātri pieskarieties ekrānam.\n"<ul><li>"Velciet ar vismaz diviem pirkstiem, lai ritinātu."</li>\n<li>"Savelciet kopā vismaz 2 pirkstus, lai pielāgotu tālummaiņu."</li></ul>\n\n<b>"Lai īslaicīgi veiktu tālummaiņu"</b>", trīsreiz ātri pieskarieties ekrānam un ar trešo pieskārienu turiet pirkstu nospiestu.\n"<ul><li>"Velciet pirkstus, lai pārvietotos ekrānā."</li>\n<li>"Paceliet pirkstu, lai tālinātu."</li></ul>\n\n"Tastatūrā vai navigācijas joslā nevarat veikt tuvināšanu."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Kad palielināšana ir ieslēgta, izmantojiet pieejamības pogu ekrāna apakšdaļā, lai ātri palielinātu ekrānu.\n\n"<b>"Lai veiktu tālummaiņu"</b>", pieskarieties pieejamības pogai un pēc tam pieskarieties jebkurai vietai ekrānā.\n"<ul><li>"Velciet ar vismaz 2 pirkstiem, lai ritinātu."</li>\n<li>"Savelciet kopā vismaz 2 pirkstus, lai pielāgotu tālummaiņu."</li></ul>\n\n<b>"Lai veiktu īslaicīgu tālummaiņu"</b>", pieskarieties pieejamības pogai, pēc tam pieskarieties jebkurai vietai ekrānā un turiet to.\n"<ul><li>"Velciet ar pirkstu, lai pārvietotos pa ekrānu."</li>\n<li>"Paceliet pirkstu, lai veiktu tālināšanu."</li></ul>\n\n"Tastatūrā vai navigācijas joslā nevarat veikt tuvināšanu."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Pieejamības pogai ir iestatīts pakalpojums <xliff:g id="SERVICE">%1$s</xliff:g>. Lai izmantotu palielināšanu, pieskarieties pieejamības pogai un pēc tam atlasiet palielināšanu."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Pieejamības saīsne"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Skaļuma pogu īsinājumtaustiņš"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Īsinājumtaustiņa pakalpojums"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Atļaut no bloķēšanas ekrāna"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Kad īsinājumtaustiņš ir ieslēgts, varat 3 sekundes turēt nospiestas abas skaļuma regulēšanas pogas, lai sāktu izmantot pieejamības funkciju."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Kad īsinājumtaustiņš ir ieslēgts, varat 3 sekundes turēt nospiestas abas skaļuma regulēšanas pogas, lai aktivizētu pieejamības funkciju."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Liela kontrasta teksts"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Ekrāna palielinājuma autom. atjaun."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Atjaunināt ekrāna palielinājumu lietotņu pārejās"</string>
@@ -1861,7 +1866,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Var ietekmēt veiktspēju"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klikšķis pēc kursora apstāšanās"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Aizkave pirms klikšķa"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> — <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"IESLĒGTS"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"IZSLĒGTS"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Rādīt ātrajos iestatījumos"</string>
@@ -2380,6 +2384,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Atlasīti <xliff:g id="NUMBER">%1$d</xliff:g> no <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> no <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Atlasīt visu"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Pārvaldīt plānus"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datu lietojums"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Lietotnes datu lietojums"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Mobilo sakaru operatora datu uzskaite var atšķirties no datu uzskaites ierīcē."</string>
@@ -2465,6 +2470,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilie tīkli"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Wi-Fi maksas tīkli"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Lai atlasītu maksas tīklus, ieslēdziet Wi-Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automātiski"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Maksas"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Nav maksas"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Mobilo sakaru operatora datu uzskaite var atšķirties no datu uzskaites ierīcē."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Ārkārtas zvans"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Atgriezties pie zvana"</string>
@@ -2686,7 +2694,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Zvanu pārvaldnieks"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Ārkārtas paziņojumi"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Ārkārtas brīdinājumi"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Tīkla operatori"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Piekļuves punktu nosaukumi"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Uzlabota 4G LTE režīms"</string>
@@ -2755,6 +2763,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Vēlamā SIM karte šai ierīcei:"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Vaicāt katru reizi"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Nepieciešams veikt atlasi."</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"SIM kartes atlase"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Iestatījumi"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="zero">Rādīt %d slēptus vienumus</item>
@@ -2908,18 +2917,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Lietotņu paziņojumi"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Paziņojuma kategorija"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Svarīgums"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Atkarībā no lietotnes iestatījumiem"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Atļaujiet skaņu"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nekad nerādīt paziņojumus"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Bez skaņas signāla vai vizuāla paziņojuma"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Bez skaņas"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Atskaņot skaņas signālu"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Atskaņot skaņas signālu un īslaicīgi parādīt ekrānā"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Uznirst ekrānā"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Mazsvarīgs"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Vidēji svarīgs"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Svarīgs"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Steidzams"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Atļaujiet skaņu"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Nerādīt šos paziņojumus pašreizējā ekrāna skatā, kā arī neatskaņot to skaņas signālu un nevibrēt"</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Atļaut pārtraukšanu"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Ļaut lietotnei atskaņot signālu, aktivizēt vibrozvanu un/vai parādīt paziņojumus ekrānā"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Nav svarīgs"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Vidēji svarīgs"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Ļoti svarīgs"</string>
@@ -2951,7 +2961,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"PIP, attēls attēlā"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Attēls attēlā"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Atļaut attēlu attēlā"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Atļaut šai lietotnei izveidot logu ar attēlu attēlā, kad lietotne ir atvērta vai pēc tās aizvēršanas (piemēram, lai turpinātu skatīties video). Šis logs tiek rādīts pāri citām izmantotajām lietotnēm."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Atļaut šai lietotnei izveidot logu ar attēlu attēlā, kad lietotne ir atvērta vai pēc tās aizvēršanas (piemēram, lai turpinātu skatīties video). Šis logs tiek rādīts pāri citām izmantotajām lietotnēm."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Piekļuve pie “Netraucēt”"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nevienā instalētajā lietotnē nav pieprasīta piekļuve režīmam “Netraucēt”."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Notiek lietotņu ielāde..."</string>
@@ -3264,6 +3274,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Failu pārsūtīšana"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Fotoattēlu pārsūtīšana (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Ierīces izmantošana MIDI režīmā"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Īsziņu spoguļošana"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Fona pārbaude"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Pilna piekļuve fonam"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Izmantot ekrānā redzamo tekstu"</string>
@@ -3408,6 +3419,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="night_display_suggestion_title" msgid="6602129097059325291">"Nakts režīma iestatīšana"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Ekrāns dzintara tonī iemigšanai"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Nakts režīms ir ieslēgts"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Ekrāns iekrāsojas dzintara krāsā. Tas var palīdzēt jums iemigt."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Ieteikumi"</string>
@@ -3428,6 +3441,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Izmantot vēsākas krāsas"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Lai mainītu krāsas, izslēdziet ekrānu"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Lai lietotu telefonijas pārrauga izmaiņas, atkārtoti palaidiet ierīci."</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kameras HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Lai piemērotu kameras HAL HDR+ izmaiņas, restartējiet ierīci."</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kameras lāzera sensors"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automātiski sistēmas atjauninājumi"</string>
     <string name="usage" msgid="2977875522080448986">"Lietojums"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobilo datu lietojums"</string>
@@ -3454,7 +3470,7 @@
     <string name="data_warning" msgid="209133958008062117">"Datu brīdinājums"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Iestatīt datu ierobežojumu"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datu ierobežojums"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> izmantoti šādā laika periodā: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"Izmantotais datu apjoms: <xliff:g id="ID_1">%1$s</xliff:g> (šādā periodā: <xliff:g id="ID_2">%2$s</xliff:g>)"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurēt"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Citas lietojuma datos iekļautās lietotnes"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3525,7 +3541,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Dzēst un pārvērst"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Vai atiestatīt ShortcutManager ātruma ierobežošanu?"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager ātruma ierobežošana ir atiestatīta."</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Bloķēšanas ekrāna paziņojumu kontrole"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Kontrolējiet informāciju bloķēšanas ekrānā"</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="8483187649355540109">"Atbalsts un padomi"</string>
@@ -3533,7 +3549,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Nevienā instalētajā lietotnē nav pieprasīta piekļuve maksas īsziņām."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Par maksas īsziņām no jums var tikt iekasēta samaksa, kas tiks pievienota jūsu mobilo sakaru operatora rēķinam. Ja kādai lietotnei iespējosiet piekļuves atļauju, varēsiet sūtīt maksas īsziņas, izmantojot šo lietotni."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Piekļuve maksas īsziņām"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Nav redzams citām ierīcēm"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Izslēgts"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Izveidots savienojums ar ierīci <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Izveidots savienojums ar vairākām ierīcēm"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Sistēmas lietotāja saskarnes demonstrācijas režīms"</string>
@@ -3638,7 +3654,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Tūlītējās lietotnes"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Atveriet saites lietotnēs, pat ja tās nav instalētas."</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Tūlītējās lietotnes"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Tūlītējo lietotņu konts"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Tūlītējo lietotņu preferences"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Instalētās lietotnes"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Tagad jūsu krātuvi pārvalda krātuves pārvaldnieks"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Lietotāja <xliff:g id="USER_NAME">%1$s</xliff:g> konti"</string>
@@ -3687,7 +3703,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Iestatījums “Vienmēr ieslēgts VPN” ir ieslēgts jūsu personiskajā profilā"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Iestatījums “Vienmēr ieslēgts VPN” ir ieslēgts jūsu darba profilā"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Ir iestatīts globālais HTTP starpniekserveris"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Uzticami akreditācijas dati"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Uzticami akreditācijas dati"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Jūsu personiskajā profilā instalēti uzticami akreditācijas dati"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Jūsu darba profilā instalēti uzticami akreditācijas dati"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="zero">Vismaz <xliff:g id="COUNT_1">%d</xliff:g> CA sertifikāti</item>
       <item quantity="one">Vismaz <xliff:g id="COUNT_1">%d</xliff:g> CA sertifikāts</item>
@@ -3755,7 +3773,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informācija par operatora nodrošināšanu"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktivizēt operatora nodrošināšanu"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Kādi ir jaunumi?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Skatiet 5 jaunākās funkcijas"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Apskatiet savu jauno tālruni"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Apskatiet savu jauno planšetdatoru"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Apskatiet savu jauno ierīci"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Šī funkcija šajā ierīcē nav pieejama."</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS reģistrācijas statuss"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Reģistrēts"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Nav reģistrēts"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index d662feb..76061ca 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s сака да пристапи кон вашите пораки. Дозволи пристап на %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Побаран е пристап до SIM"</string>
     <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="bluetooth_device_name_summary" msgid="4757990010751789977">"Другите уреди го гледаат како „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Другите уреди го гледаат како „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Ваши уреди"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Спарување нов уред"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Датум и време"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"Следно"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Да се прескокне отпечаток?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Поставувањето отпечаток трае само една или две минути. Ако го прескокнете ова, може да го додадете вашиот отпечаток подоцна во поставките."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Прескокни заклучување екран?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Функциите за заштита на уредот нема да се вклучат. Нема да може да ги спречите другите да го користат таблетов ако го изгубите, ви го украдат или се ресетира."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Функциите за заштита на уредот нема да се вклучат. Нема да може да ги спречите другите да го користат уредов ако го изгубите, ви го украдат или се ресетира."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Функциите за заштита на уредот нема да се вклучат. Нема да може да ги спречите другите да го користат телефонов ако го изгубите, ви го украдат или се ресетира."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Додадовте максимален број на отпечатоци"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Не може да се додадат повеќе отпечатоци"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Да се отстранат сите отпечатоци?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Отстранете го „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Дали сакате да го избришете отпечатоков?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Нема да може да ги користите отпечатоците за да го отклучите телефонот, да одобрувате купувања или да се најавувате на апликации со нив"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Нема да може да ги користите отпечатоците за да го отклучите работниот профил, да одобрувате купувања или да се најавувате на апликациите за работа"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Отстрани го"</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"За дополнителна безбедност, поставете резервно заклучување екран."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"За дополнителна безбедност, поставете резервно заклучување екран."</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>
@@ -497,37 +502,37 @@
     <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_fingerprint" msgid="8212242533942400457">"Функциите за заштита на уредот нема да работат без вашата шема.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Функциите за заштита на уредот нема да работат без шемата.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Зачуваните отпечатоци ќе се отстранат од уредот и нема да може да го отклучувате телефонот, да овластувате купувања или да се најавувате на апликации со нив."</string>
+</xliff:g>И зачуваните отпечатоци ќе се отстранат од уредов, така што нема да може да го отклучувате телефонот, да овластувате купувања или да се најавувате на апликации со нив."</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">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Функциите за заштита на уредот нема да работат без PIN-кодот.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Зачуваните отпечатоци ќе се отстранат од уредот и нема да може да го отклучувате телефонот, да овластувате купувања или да се најавувате на апликации со нив."</string>
+</xliff:g>И зачуваните отпечатоци ќе се отстранат од уредов, така што нема да може да го отклучувате телефонот, да овластувате купувања или да се најавувате на апликации со нив."</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Функциите за заштита на уредот нема да работат без лозинката.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Зачуваните отпечатоци ќе се отстранат од уредот и нема да може да го отклучувате телефонот, да овластувате купувања или да се најавувате на апликации со нив."</string>
+</xliff:g>И зачуваните отпечатоци ќе се отстранат од уредов, така што нема да може да го отклучувате телефонот, да овластувате купувања или да се најавувате на апликации со нив."</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Функциите за заштита на уредот нема да работат без заклучувањето на екранот.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Зачуваните отпечатоци ќе се отстранат од уредот и нема да може да го отклучувате телефонот, да овластувате купувања или да се најавувате на апликации со нив."</string>
+</xliff:g>И зачуваните отпечатоци ќе се отстранат од уредов, така што нема да може да го отклучувате телефонот, да овластувате купувања или да се најавувате на апликации со нив."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Функциите за заштита на профилот нема да работат без вашата шема."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Функциите за заштита на профилот нема да работат без вашата шема.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Функциите за заштита на профилот нема да работат без шемата.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Ќе се отстранат и зачуваните отпечатоци од овој профил и нема да може да го отклучувате профилот, да овластувате купувања или да се најавувате на апликации со нив."</string>
+</xliff:g>И зачуваните отпечатоци ќе се отстранат од профилов, така што нема да може да го отклучувате профилот, да овластувате купувања или да се најавувате на апликации со нив."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Функциите за заштита на профилот нема да работат без вашиот PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Функциите за заштита на профилот нема да работат без вашиот PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Функциите за заштита на профилот нема да работат без PIN-кодот.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Ќе се отстранат и зачуваните отпечатоци од овој профил и нема да може да го отклучувате профилот, да овластувате купувања или да се најавувате на апликации со нив."</string>
+</xliff:g>И зачуваните отпечатоци ќе се отстранат од профилов, така што нема да може да го отклучувате профилот, да овластувате купувања или да се најавувате на апликации со нив."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Функциите за заштита на профилот нема да работат без вашата лозинка."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Функциите за заштита на профилот нема да работат без вашата лозинка.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Функциите за заштита на профилот нема да работат без лозинката.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Ќе се отстранат и зачуваните отпечатоци од овој профил и нема да може да го отклучувате профилот, да овластувате купувања или да се најавувате на апликации со нив."</string>
+</xliff:g>И зачуваните отпечатоци ќе се отстранат од профилов, така што нема да може да го отклучувате профилот, да овластувате купувања или да се најавувате на апликации со нив."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Функциите за заштита на профилот нема да работат без заклучувањето на екранот."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Функциите за заштита на профилот нема да работат без заклучувањето на екранот.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Функциите за заштита на профилот нема да работат без заклучувањето на екранот.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Ќе се отстранат и зачуваните отпечатоци од овој профил и нема да може да го отклучувате профилот, да овластувате купувања или да се најавувате на апликации со нив."</string>
+</xliff:g>И зачуваните отпечатоци ќе се отстранат од профилов, така што нема да може да го отклучувате профилот, да овластувате купувања или да се најавувате на апликации со нив."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Отстрани ја"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Смени шема на отклуч."</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Промени PIN за отклучување"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Не е дозволена нагорна, надолна или повторлива секвенца на цифри"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Во ред"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Откажи"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Исчисти"</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>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Достапен WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Достапен WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Внесете ја вашата мрежна лозинка"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Wi‑Fi мрежа на операторот"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Поврзете се преку <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"За да се подобри точноста на локација и за други цели, <xliff:g id="APP_NAME">%1$s</xliff:g> сака да се вклучи скенирање за мрежи  дури и кога Wi-Fi е исклучена.\n\nДозволи го ова за сите апликации кои сакаат да се скенира?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"За да го исклучите ова, одете на Напредни во менито на прелевање."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Дозволи"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Поврзи се"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Не успеа да се поврзе со мрежата"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Заборави"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Измени"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Не успеа да се заборави мрежата"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Зачувај"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Не успеа да се зачува мрежата"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Напредна Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC адреса"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-адреса"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Информации за мрежата"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Маска на подмрежа"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 адреси"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Откажи покана?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Дали сакате да ја откажете поканата да се поврзете со <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Заборави ја оваа група?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Точка на пристап на пренослива Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Точка на пристап за Wi‑Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Не се споделува интернет или содржини со други уреди"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Интернет-врската на таблетов се споделува преку точка на пристап"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Интернет-врската на телефонов се споделува преку точка на пристап"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Апликацијата споделува содржини. За споделување на интернет-врската, исклучете ја, а потоа вклучете ја точката на пристап"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Име на Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Име на точка на пристап"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Се вклучува <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Другите уреди може да се поврзат на <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Лозинка за Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Лозинка на точка на пристап"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Појас на точката на пристап"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Користете точка на пристап за да создадете Wi‑Fi мрежа за другите уреди. Точката на пристап обезбедува интернет со помош на мобилната интернет-врска. Може да ви се наплатат дополнителни трошоци за мобилниот интернет."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Апликациите може да создадат точка на пристап за да споделуваат содржини со уредите во близина."</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Кога е вклучено повикувањето преку Wi-Fi, телефонот може да насочува повици преку мрежи на Wi-Fi или мрежата на операторот, зависно од параметрите и кој сигнал е посилен. Пред да ја вклучите функцијата, проверете кај операторот за давачки и други детали."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Ажурирајте ја адресата за итни случаи"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"Адреса што ќе ја користат службите за итни случаи како ваша локација ако повикате 192 преку Wi-Fi"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"Адреса што ќе ја користат службите за итни случаи како ваша локација ако повикате итни служби преку Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Екран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Јачини"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Пребарај"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Управувај со подесувањата за пребарување и историја"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Нема резултати"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Исчисти ја историјата"</string>
     <string name="display_settings" msgid="7965901687241669598">"Приказ"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Автоматско ротирање на екранот"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Интензивни бои"</string>
@@ -1195,7 +1205,7 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"СД картичката ќе се одмонтира."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Одмонтирање"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Одмонтирање во тек"</string>
-    <string name="storage_low_title" msgid="1388569749716225155">"Меморијата е речиси полна"</string>
+    <string name="storage_low_title" msgid="1388569749716225155">"Капацитетот е речиси полн"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Некои функции на системот, како што е синхронизирањето, може да не функционираат правилно. Обидете се да ослободите простор со бришење или откачување предмети, како што се апликации или медиумски содржини."</string>
     <string name="storage_menu_rename" msgid="7141058657592615390">"Преименувај"</string>
     <string name="storage_menu_mount" msgid="1014683672493425425">"Монтирај"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Враќање стандардни поставки на APN."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Ресетирај на стандардни вредности"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Ресетирањето стандардни поставки на APN е завршено."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Ресетирај"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Ресетирање мрежни поставки"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Опции за ресетирање"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Може да се ресетира мрежа, апликации или уред"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Ресетирај Wi-Fi, мобилен интернет и Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Ова ќе ги ресетира сите мрежни поставки, вклучувајќи:\n\n"<li>"Wi‑Fi"</li>\n<li>"Мобилен интернет"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Ресетирај поставки"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Да се ресетираат сите мрежни поставки? Не може да се врати ова дејство!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Ресетирај?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Мрежното ресетирање не е достапно за овој корисник"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Мрежните поставки се ресетирани"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Ресетирање фабрички податоци"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> сметка ќе се ресетира</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> сметки ќе се ресетираат</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Внатрешната меморија и сите податоци ќе се ресетираат"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Избриши ги сите податоци (фабричко ресетирање)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Ова ќе ги избрише сите податоци од "<b>"внатрешна меморија"</b>"на вашиот таблет, заедно со:\n\n"<li>"вашата сметка на Google"</li>\n<li>"податоци и поставки на систем и апликации"</li>\n<li>"преземени апликации"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Ова ќе ги избрише сите податоци од "<b>"внатрешната меморија"</b>" на телефонот, заедно со:\n\n"<li>"вашата сметка на Google"</li>\n<li>"податоци и поставки на систем и апликации"</li>\n<li>"преземени апликации"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Моментално сте најавени на следниве сметки:\n"</string>
@@ -1391,7 +1397,7 @@
     <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_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_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_picker_title" msgid="6383879578279046456">"Оператор за оценување мрежа"</string>
     <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"Ниедно"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Безбедносни информации"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Немате врска со податоци. За да ги видите овие информации сега, одете на %s од кој било компјутер поврзан на интернет."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Се вчитува..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Изберете лозинка"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Поставете заклучување екран"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"За безбедност, поставете лозинка"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Поставете лозинка за отпечаток"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Изберете шема"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Поставете шема за отпечаток"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Изберете PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"За безбедност, поставете PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Поставете PIN за отпечаток"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Потврдете ја лозинката"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Внесете ја лозинката повторно"</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_pin_header" msgid="7744513791910572550">"Внесете го 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>
@@ -1483,12 +1490,18 @@
     <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_strong_auth_required_device_pattern" msgid="530802132223800623">"За дополнителна безбедност, користете ја шемата на уредот"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"За дополнителна безбедност, внесете го PIN-кодот на уредот"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"За дополнителна безбедност, внесете ја лозинката на уредот"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"За дополнителна безбедност, користете ја шемата на работниот профил"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"За дополнителна безбедност, внесете го PIN-кодот на работниот профил"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"За дополнителна безбедност, внесете ја лозинката на работниот профил"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Телефонот е ресетиран на фабрички поставки. За да го користите, внесете ја претходната шема."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Телефонот е ресетиран на фабрички поставки. За да го користите, внесете го претходниот PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Телефонот е ресетиран на фабрички поставки. За да го користите, внесете ја претходната лозинка."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Потврдете ја шемата"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Потврди PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Потврдете ја лозинката"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Погрешен PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Погрешна лозинка"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Погрешна шема"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Создади виџет и дозволи пристап?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Откако ќе создадете виџет, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> може да пристапи кон сите податоци што ги прикажува."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Дозволи <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> да создава виџети и секогаш да пристапува кон нивните податоци"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>д <xliff:g id="HOURS">%2$d</xliff:g>ч <xliff:g id="MINUTES">%3$d</xliff:g>м <xliff:g id="SECONDS">%4$d</xliff:g>с"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>ч <xliff:g id="MINUTES">%2$d</xliff:g>м <xliff:g id="SECONDS">%3$d</xliff:g>с"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>м <xliff:g id="SECONDS">%2$d</xliff:g>с"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>сек"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"Статистика на користење"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Статистика на користење"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Подреди по:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Читачи на екран, екран, контроли за интеракција"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Визуелна пристапност"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Уредот може да го приспособите да одговара на вашите потреби. Овие карактеристики за пристапност може да ги смените подоцна во Поставки."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Зголемете ја големината на фонтот"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Променете ја големината на фонтот"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Читачи на екран"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Аудио и текст на екранот"</string>
     <string name="display_category_title" msgid="685461049938269166">"Приказ"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"За да зумирате"</b>", брзо допрете го екранот трипати.\n"<ul><li>"Повлечете со два или повеќе прсти за да се движите"</li>\n<li>"Штипнете со два или повеќе прсти за да го приспособите зумот"</li></ul>\n\n<b>"За привремено зумирање"</b>", брзо допрете го екранот трипати и задржете го прстот на третиот допир.\n"<ul><li>"Повлечете за да се движите околу екранот"</li>\n<li>"Подигнете го екранот за да одзумирате"</li></ul>\n\n"Не може да зумирате на тастатурата или на лентата за навигација."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Кога е вклучено зголемување, користете го копчето за „Пристапност“ на дното на екранот за брзо зголемување.\n\n"<b>"За да зумирате"</b>", допрете го копчето за „Пристапност“, а потоа допрете каде било на екранот.\n"<ul><li>"Повлечете со два или повеќе прсти за да се движите"</li>\n<li>"Штипнете со два или повеќе прста за да го приспособите зумот"</li></ul>\n\n<b>"За да зумирате привремено"</b>", допрете го копчето за „Пристапност“, а потоа допрете и задржете каде било на екранот.\n"<ul><li>"Повлечете за да се движите околу екранот"</li>\n<li>"Подигнете го прстот за да одзумирате"</li></ul>\n\n"Не може да зумирате на тастатурата или на лентата за навигација."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Копчето за „Пристапност“ е поставено на <xliff:g id="SERVICE">%1$s</xliff:g>. За да користите зголемување, допрете го и задржете го копчето за „Пристапност“, а потоа изберете „Зголемување“."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Кратенка за пристапност"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Кратенка на копче за јачина на звук"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Услуга со кратенка"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Дозволете од заклучен екран"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Кога е вклучена кратенката, може да ги притиснете двете копчиња за јачина на звукот во траење од три секунди за стартување функција за пристапност."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Кога е вклучена кратенката, може да ги притиснете двете копчиња за јачина на звукот во траење од три секунди за стартување функција за пристапност."</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">"Автоматско ажурирање на зголемување на екран"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Ажурирај зголемување екран при премини меѓу аплик."</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Може да влијае на изведбата"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Кликнување откако покажувачот ќе престане да се движи"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Одложување пред кликнување"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ВКЛУЧЕНО"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ИСКЛУЧЕНО"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Прикажи во „Брзи поставки“"</string>
@@ -2358,6 +2363,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Управувајте со пакетите"</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>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мобилни мрежи"</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_metered_auto" msgid="1262028400911918865">"Автоматски"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Со ограничен интернет"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Со неограничен интернет"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Пресметувањето податоци на операторот може да се разликува од вашиот уред."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Итен повик"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Врати се на повик"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Управник со повици"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Итни емитувања"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Предупредувања за итни случаи"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Оператори на мрежа"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Имиња на пристапни точки"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Режим на подобрени 4G LTE"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Претпочитана SIM-картичка за"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Секогаш прашувај"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Потребно е да се избере"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Избор на SIM"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Поставки"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="one">Прикажи %d сокриена ставка</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Известувања за апликација"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Категорија на известувањето"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Важност"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Дозволи апликацијата да одлучи"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Дозволете звук"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Никогаш не прикажувај известувања"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Без звук или визуелен прекин"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Без звук"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Испушти звук"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Испушти звук и прикажи го на екранот"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Прикажи го на екранот"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Мало"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Средно"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Висока"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Итно"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Дозволете звук"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Прикажувај ги овие апликации на тековниот екран без звук, вибрации или ѕиркање."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Дозволете прекини"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Дозволете апликацијата да испушта звуци, да вибрира и/или пак, појавни известувања на екранот"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Мала важност"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Средна важност"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Голема важност"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"PIP слика во"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Слика во слика"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Дозволете слика во слика"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Дозволете апликацијава да создава прозорец за слика во слика додека апликацијата е отворена или пак, откако ќе ја напуштите (на пр., за да продолжите со гледање видео). Прозорецот се прикажува врз другите апликации што ги користите."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Дозволете апликацијава да создава прозорец за слика во слика додека апликацијата е отворена или пак, откако ќе ја напуштите (на пр., за да продолжите со гледање видео). Прозорецот се прикажува врз другите апликации што ги користите."</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>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Пренесување датотеки"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Пренесување фотографии (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Користење на уредот како MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Отсликување SMS-пораки"</string>
     <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>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Поставете распоред на „Ноќно светло“"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Боја на килибар за да заспиете"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Ноќното светло е вклучено"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Екранот е обоен во килибарна боја. Ова може да ви помогне да заспиете."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Предлози"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Користи поладни бои на екранот"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"За да се примени промената на бојата, исклучете го екранот"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"За да се примени промената на мониторот за телефонија, рестартирајте го уредот"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Камера HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"За применување промена на Камера HAL HDR+, рестартиртирајте го уредот"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Ласерски сензор за камерата"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматски ажурирања на системот"</string>
     <string name="usage" msgid="2977875522080448986">"Користење"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Потрошен мобилен интернет"</string>
@@ -3410,7 +3427,7 @@
     <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="data_usage_template" msgid="2923744765873163859">"Потрошено <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">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Избриши и конвертирај"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Ресетирајте го ограничувањето оценки на ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Ограничувањето оценки на ShortcutManager е ресетирано"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Контролирајте ги известувањата на заклучениот екран"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Контролирајте ги информациите на заклучениот екран"</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="8483187649355540109">"Поддршка и совети"</string>
@@ -3487,7 +3504,7 @@
     <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="2456198532288640046">"Не е видливо за други уреди"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Исклучен"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Поврзан со <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Поврзан со повеќе уреди"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Демо-режим на кориснички интерфејс на систем"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Инстант апликации"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Отворај линкови во апликации, дури и ако не се инсталирани"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Инстант апликации"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Сметка за инстант апликација"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Поставки за инстант апликации"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Инсталирани апликации"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Управникот со меморија сега управува со вашата меморија"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Сметки за <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"VPN е поставена да биде секогаш вклучена во личниот профил"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"VPN е поставена да биде секогаш вклучена во работниот профил"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Поставен е глобален HTTP прокси"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Доверливи акредитиви"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Доверливи акредитиви"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Доверливи акредитиви на вашиот личен профил"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Доверливи акредитиви на вашиот работен профил"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">Минимум <xliff:g id="COUNT_1">%d</xliff:g> сертификат ЦА</item>
       <item quantity="other">Минимум <xliff:g id="COUNT_1">%d</xliff:g> сертификати ЦА</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Информации за обезбедување оператор"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Активирајте обезбедување оператор"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Што има ново и интересно?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Погледнете ги најдобрите 5 функции"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Запознајте се со новиот телефон"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Запознајте се со новиот таблет"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Запознајте се со новиот уред"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Функцијава не е достапна на овој уред"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Состојба на IMS-регистрација"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Регистриран"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Не е регистриран"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 7b26f48..c81e3fe 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s, നിങ്ങളുടെ സന്ദേശങ്ങൾ ആക്‌സസ്സുചെയ്യാൻ താൽപ്പര്യപ്പെടുന്നു. %2$s എന്നതിലേക്ക് ആക്‌സസ്സ് നൽകണോ?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM ആക്‌സസ്സ് അഭ്യർത്ഥന"</string>
     <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="bluetooth_device_name_summary" msgid="4757990010751789977">"<xliff:g id="DEVICE_NAME">^1</xliff:g> എന്ന പേരിൽ മറ്റ് ഉപകരണങ്ങൾക്ക് ദൃശ്യമാക്കുക"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"<xliff:g id="DEVICE_NAME">^1</xliff:g> എന്ന പേരിൽ മറ്റ് ഉപകരണങ്ങൾക്ക് ദൃശ്യമാക്കുക"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"നിങ്ങളുടെ ഉപകരണങ്ങൾ"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"പുതിയ ഉപകരണവുമായി ജോടിയാക്കുക"</string>
     <string name="date_and_time" msgid="9062980487860757694">"തീയതിയും സമയവും"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"അടുത്തത്"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"ഫിംഗർപ്രിന്‍റ് ഒഴിവാക്കണോ?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"ഫിംഗർപ്രിന്‍റ് സജ്ജമാക്കാൻ ഒന്നോ രണ്ടോ മിനിറ്റോ മാത്രമേ എടുക്കൂ. ഈ ഘട്ടം ഒഴിവാക്കുകയാണെങ്കിൽ, പിന്നീട് ക്രമീകരണത്തിൽ നിങ്ങൾക്ക് ഫിംഗർപ്രിന്‍റ് ചേർക്കാവുന്നതാണ്."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"സ്‌ക്രീൻ ലോക്ക് ഒഴിവാക്കണോ?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ ഓണാക്കില്ല. ഈ ടാബ്‌ലെറ്റ് നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ പുനഃക്രമീകരിക്കുകയോ ചെയ്താൽ, ടാബ്‌ലെറ്റ് ഉപയോഗിക്കുന്നതിൽ നിന്ന് മറ്റുള്ളവരെ തടയാൻ നിങ്ങൾക്കാവില്ല."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ ഓണാക്കില്ല. ഈ ഉപകരണം നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ പുനഃക്രമീകരിക്കുകയോ ചെയ്താൽ, ഉപകരണം ഉപയോഗിക്കുന്നതിൽ നിന്ന് മറ്റുള്ളവരെ തടയാൻ നിങ്ങൾക്കാവില്ല."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ ഓണാക്കില്ല. ഈ ഫോൺ നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ പുനഃക്രമീകരിക്കുകയോ ചെയ്താൽ, ഫോൺ ഉപയോഗിക്കുന്നതിൽ നിന്ന് മറ്റുള്ളവരെ തടയാൻ നിങ്ങൾക്കാവില്ല."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"നിങ്ങൾ പരമാവധി എണ്ണം ഫിംഗർപ്രിന്റുകൾ ചേർത്തിട്ടുണ്ട്"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"കൂടുതൽ ഫിംഗർപ്രിന്റുകൾ ചേർക്കാൻ കഴിയില്ല"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"എല്ലാ വിരലടയാളങ്ങളും നീക്കംചെയ്യണോ?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' ‌നീക്കംചെയ്യുക"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"ഈ ‌ഫിംഗർപ്രിന്റ് ഇല്ലാതാക്കണോ?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"നിങ്ങളുടെ ഫോൺ അൺലോക്കുചെയ്യുന്നതിനോ വാങ്ങലുകൾ അംഗീകരിക്കുന്നതിനോ ആപ്പുകളിലേക്ക് സൈൻ ഇൻ ചെയ്യുന്നതിനോ ഫിംഗർപ്രിന്റ് ഉപയോഗിക്കാനാവില്ല"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈൽ അൺലോക്കുചെയ്യുന്നതിനോ വാങ്ങലുകൾ അംഗീകരിക്കുന്നതിനോ ഔദ്യോഗിക ആപ്പുകളിലേക്ക് സൈൻ ഇൻ ചെയ്യുന്നതിനോ ഫിംഗർപ്രിന്റ് ഉപയോഗിക്കാനാവില്ല"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"അതെ, നീക്കംചെയ്യുക"</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"അധിക സുരക്ഷയ്ക്ക്, ഒരു ബാക്കപ്പ് സ്ക്രീൻ ലോക്ക് സജ്ജമാക്കുക."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"അധിക സുരക്ഷയ്ക്ക്, ഒരു ബാക്കപ്പ് സ്ക്രീൻ ലോക്ക് സജ്ജമാക്കുക."</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>
@@ -497,37 +502,37 @@
     <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_fingerprint" msgid="8212242533942400457">"നിങ്ങളുടെ പാറ്റേൺ കൂടാതെ ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"നിങ്ങളുടെ പാറ്റേൺ കൂടാതെ ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>സംരക്ഷിച്ചിട്ടുള്ള നിങ്ങളുടെ വിരലടയാളങ്ങളും ഈ ഉപകരണത്തിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും, നിങ്ങൾക്ക് ഫോൺ അൺലോക്ക് ചെയ്യുന്നതിനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകുന്നതിനോ ആപ്സിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ കഴിയില്ല.\""</string>
+</xliff:g>സംരക്ഷിച്ചിട്ടുള്ള നിങ്ങളുടെ വിരലടയാളങ്ങളും ഈ ഉപകരണത്തിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും, നിങ്ങൾക്ക് ഫോൺ അൺലോക്ക് ചെയ്യാനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകാനോ ആപ്പിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ കഴിയില്ല."</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">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"നിങ്ങളുടെ പിൻ കൂടാതെ ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>സംരക്ഷിച്ചിട്ടുള്ള നിങ്ങളുടെ വിരലടയാളങ്ങളും ഈ ഉപകരണത്തിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും, നിങ്ങൾക്ക് ഫോൺ അൺലോക്ക് ചെയ്യുന്നതിനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകുന്നതിനോ ആപ്സിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ കഴിയില്ല.\""</string>
+</xliff:g>സംരക്ഷിച്ചിട്ടുള്ള നിങ്ങളുടെ വിരലടയാളങ്ങളും ഈ ഉപകരണത്തിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും, നിങ്ങൾക്ക് ഫോൺ അൺലോക്ക് ചെയ്യാനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകാനോ ആപ്പിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ കഴിയില്ല."</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"നിങ്ങളുടെ പാസ്‌വേഡ് കൂടാതെ ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>സംരക്ഷിച്ചിട്ടുള്ള നിങ്ങളുടെ വിരലടയാളങ്ങളും ഈ ഉപകരണത്തിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും, നിങ്ങൾക്ക് ഫോൺ അൺലോക്ക് ചെയ്യുന്നതിനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകുന്നതിനോ ആപ്സിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ കഴിയില്ല.\""</string>
+</xliff:g>സംരക്ഷിച്ചിട്ടുള്ള നിങ്ങളുടെ വിരലടയാളങ്ങളും ഈ ഉപകരണത്തിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും, നിങ്ങൾക്ക് ഫോൺ അൺലോക്ക് ചെയ്യാനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകാനോ ആപ്പുകളിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ കഴിയില്ല."</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"നിങ്ങളുടെ സ്‌ക്രീൻ ലോക്ക് കൂടാതെ ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>സംരക്ഷിച്ചിട്ടുള്ള നിങ്ങളുടെ വിരലടയാളങ്ങളും ഈ ഉപകരണത്തിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും, നിങ്ങൾക്ക് ഫോൺ അൺലോക്ക് ചെയ്യുന്നതിനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകുന്നതിനോ ആപ്സിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ കഴിയില്ല.\""</string>
+</xliff:g>സംരക്ഷിച്ചിട്ടുള്ള നിങ്ങളുടെ വിരലടയാളങ്ങളും ഈ ഉപകരണത്തിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും, നിങ്ങൾക്ക് ഫോൺ അൺലോക്ക് ചെയ്യാനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകാനോ ആപ്പിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ കഴിയില്ല."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"നിങ്ങളുടെ പാറ്റേൺ കൂടാതെ പ്രൊഫൈൽ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"നിങ്ങളുടെ പാറ്റേൺ കൂടാതെ പ്രൊഫൈൽ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"നിങ്ങളുടെ പാറ്റേൺ കൂടാതെ പ്രൊഫൈൽ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>സംരക്ഷിച്ചിട്ടുള്ള നിങ്ങളുടെ വിരലടയാളങ്ങളും ഈ പ്രൊഫൈലിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും, നിങ്ങൾക്ക് അവയുപയോഗിച്ച് പ്രൊഫൈൽ അൺലോക്ക് ചെയ്യുന്നതിനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകുന്നതിനോ ആപ്സിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ കഴിയില്ല.\""</string>
+</xliff:g>സംരക്ഷിച്ചിട്ടുള്ള നിങ്ങളുടെ വിരലടയാളങ്ങളും ഈ പ്രൊഫൈലിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും, നിങ്ങൾക്ക് അവയുപയോഗിച്ച് പ്രൊഫൈൽ അൺലോക്ക് ചെയ്യാനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകാനോ ആപ്പിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ കഴിയില്ല."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"നിങ്ങളുടെ പിൻ കൂടാതെ പ്രൊഫൈൽ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"നിങ്ങളുടെ പിൻ കൂടാതെ പ്രൊഫൈൽ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"നിങ്ങളുടെ പിൻ കൂടാതെ പ്രൊഫൈൽ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>സംരക്ഷിച്ചിട്ടുള്ള നിങ്ങളുടെ വിരലടയാളങ്ങളും ഈ പ്രൊഫൈലിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും, നിങ്ങൾക്ക് അവയുപയോഗിച്ച് പ്രൊഫൈൽ അൺലോക്ക് ചെയ്യുന്നതിനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകുന്നതിനോ ആപ്സിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ കഴിയില്ല.\""</string>
+</xliff:g>സംരക്ഷിച്ചിട്ടുള്ള നിങ്ങളുടെ വിരലടയാളങ്ങളും ഈ പ്രൊഫൈലിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും, നിങ്ങൾക്ക് അവയുപയോഗിച്ച് പ്രൊഫൈൽ അൺലോക്ക് ചെയ്യാനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകാനോ ആപ്പിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ കഴിയില്ല."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"നിങ്ങളുടെ പാസ്‌വേഡ് കൂടാതെ പ്രൊഫൈൽ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"നിങ്ങളുടെ പാസ്‌വേഡ് കൂടാതെ പ്രൊഫൈൽ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"നിങ്ങളുടെ പാസ്‌വേഡ് കൂടാതെ പ്രൊഫൈൽ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>സംരക്ഷിച്ചിട്ടുള്ള നിങ്ങളുടെ വിരലടയാളങ്ങളും ഈ പ്രൊഫൈലിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും, നിങ്ങൾക്ക് അവയുപയോഗിച്ച് പ്രൊഫൈൽ അൺലോക്ക് ചെയ്യുന്നതിനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകുന്നതിനോ ആപ്സിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ കഴിയില്ല.\""</string>
+</xliff:g>സംരക്ഷിച്ചിട്ടുള്ള നിങ്ങളുടെ വിരലടയാളങ്ങളും ഈ പ്രൊഫൈലിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും, നിങ്ങൾക്ക് അവയുപയോഗിച്ച് പ്രൊഫൈൽ അൺലോക്ക് ചെയ്യാനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകാനോ ആപ്പിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ കഴിയില്ല."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"നിങ്ങളുടെ സ്ക്രീൻ ലോക്ക് കൂടാതെ പ്രൊഫൈൽ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"നിങ്ങളുടെ സ്ക്രീൻ ലോക്ക് കൂടാതെ പ്രൊഫൈൽ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"നിങ്ങളുടെ സ്‌ക്രീൻ ലോക്ക് കൂടാതെ പ്രൊഫൈൽ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>സംരക്ഷിച്ചിട്ടുള്ള നിങ്ങളുടെ വിരലടയാളങ്ങളും ഈ പ്രൊഫൈലിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും, നിങ്ങൾക്ക് അവയുപയോഗിച്ച് പ്രൊഫൈൽ അൺലോക്ക് ചെയ്യുന്നതിനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകുന്നതിനോ ആപ്സിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ കഴിയില്ല.\""</string>
+</xliff:g>സംരക്ഷിച്ചിട്ടുള്ള നിങ്ങളുടെ വിരലടയാളങ്ങളും ഈ പ്രൊഫൈലിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും, നിങ്ങൾക്ക് അവയുപയോഗിച്ച് പ്രൊഫൈൽ അൺലോക്ക് ചെയ്യാനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകാനോ ആപ്പിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ കഴിയില്ല."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"അതെ, നീക്കംചെയ്യുക"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"അൺലോക്ക് പാറ്റേൺ മാറ്റുക"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"അൺലോക്ക് പിൻ മാറ്റുക"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"അക്കങ്ങൾ ആരോഹണ ക്രമത്തിലോ അവരോഹണ ക്രമത്തിലോ അനുക്രമമായോ നൽകുന്നത് അനുവദനീയമല്ല"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ശരി"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"റദ്ദാക്കുക"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"മായ്‌ക്കുക"</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>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ലഭ്യമാണ്"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ലഭ്യമാണ്)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"നിങ്ങളുടെ നെറ്റ്‌വർക്ക് പാസ്‌വേഡ് നൽകുക"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"കാരിയർ വൈഫൈ നെറ്റ്‌വർക്ക്"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> എന്നയാൾ വഴി കണക്‌റ്റുചെയ്യുക"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ലൊക്കേഷൻ കൃത്യത മെച്ചപ്പെടുത്തുന്നതിനും മറ്റ് ആവശ്യകതകൾക്കായും, വൈഫൈ ഓഫായിരിക്കുമ്പോൾപ്പോലും നെറ്റ്‌വർക്ക് സ്‌കാൻ ചെയ്യാൻ <xliff:g id="APP_NAME">%1$s</xliff:g> താൽപ്പര്യപ്പെടുന്നു.\n\nസ്‌കാൻ ചെയ്യാൻ താൽപ്പര്യപ്പെടുന്ന എല്ലാ അപ്ലിക്കേഷനുകൾക്കായും ഇത് അനുവദിക്കണോ?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ഇത് ഓഫുചെയ്യുന്നതിന്, ഓവർഫ്ലോ മെനുവിലെ വിപുലമായത് എന്നതിലേക്ക് പോകുക."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"അനുവദിക്കുക"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"കണക്റ്റുചെയ്യുക"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"നെറ്റ്‌വർക്കിൽ കണക്റ്റുചെയ്യുന്നതിൽ പരാജയപ്പെട്ടു"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"മറക്കുക"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"പരിഷ്‌ക്കരിക്കുക"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"നെറ്റ്‌വർക്ക് നിരസിക്കുന്നതിൽ പരാജയപ്പെട്ടു"</string>
     <string name="wifi_save" msgid="3331121567988522826">"സംരക്ഷിക്കുക"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"നെറ്റ്‌വർക്ക് സംരക്ഷിക്കുന്നതിൽ പരാജയപ്പെട്ടു"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"വിപുലമായ വൈഫൈ"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC വിലാസം"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP വിലാസം"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"നെറ്റ്‍വർക്ക് ‌വിവരങ്ങൾ"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"സബ്‌നെറ്റ് മാസ്‌ക്"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 വിലാസങ്ങൾ"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ക്ഷണം റദ്ദാക്കണോ?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g> എന്നതുമായി കണക്റ്റുചെയ്യാനുള്ള ക്ഷണം റദ്ദാക്കണോ?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ഈ ഗ്രൂപ്പിനെ മറക്കണോ?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"പോർട്ടബിൾ വൈഫൈ ഹോട്ട്‌സ്പോട്ട്"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"വൈഫൈ ഹോട്ട്‌സ്‌പോട്ട്"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"മറ്റ് ഉപകരണങ്ങളുമായി ഇന്റർനെറ്റോ ഉള്ളടക്കമോ പങ്കിടുന്നില്ല"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"ഹോട്ട്‌സ്‌പോട്ട് വഴി, ഈ ടാബ്‌ലെറ്റിന്റെ ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടുന്നു"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"ഹോട്ട്‌സ്‌പോട്ട് വഴി, ഈ ഫോണിന്റെ ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടുന്നു"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"ആപ്പ് ഉള്ളടക്കം പങ്കിടുന്നു. ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടുന്നതിന്, ഹോട്ട്‌സ്പോട്ട് ഓഫാക്കുക, തുടർന്ന് ഓണാക്കുക"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"വൈഫൈയുടെ പേര്"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"ഹോട്ട്‌സ്‌പോട്ടിന്റെ പേര്"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ഓണാക്കുന്നു..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ഹോട്ട്‌സ്പോട്ടിലേക്ക് മറ്റ് ഉപകരണങ്ങൾക്ക് കണക്റ്റുചെയ്യാൻ കഴിയും"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"വൈഫൈ പാസ്‌വേഡ്"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"ഹോട്ട്‌സ്‌പോട്ടിന്റെ പാസ്‌വേഡ്"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP ബാൻഡ്"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"നിങ്ങളുടെ മറ്റ് ഉപകരണങ്ങൾക്കായി ഒരു വൈഫൈ നെറ്റ്‌വർക്ക് സൃഷ്ടിക്കുന്നതിന് ഹോട്ട്‌സ്പോട്ട് ഉപയോഗിക്കുക. ഹോട്ട്‌സ്പോട്ട് ഇന്റർനെറ്റ് നൽകുന്നത് നിങ്ങളുടെ മൊബൈൽ ഡാറ്റാ കണക്ഷൻ ഉപയോഗിച്ചുകൊണ്ടാണ്. അധിക മൊബൈൽ ഡാറ്റ നിരക്കുകൾ ബാധകമായേക്കാം."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ചുറ്റുവട്ടത്തുള്ള ഉപകരണങ്ങളുമായി ഉള്ളടക്കം പങ്കിടുന്നതിന് ആപ്പുകൾക്ക് ഹോട്ട്‌സ്പോട്ട് സൃഷ്ടിക്കാൻ കഴിയും."</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"വൈഫൈ കോളിംഗ് ഓണായിരിക്കുമ്പോൾ, നിങ്ങളുടെ മുൻഗണനയും ഏത് സിഗ്നലാണ് ശക്തമെന്നതും അടിസ്ഥാനമാക്കി ഫോണിന് വൈഫൈ നെറ്റ്‌വർക്കോ കാരിയർ നെറ്റ്‌വർക്കോ വഴി കോളുകൾ റൂട്ട് ചെയ്യാനാകും. ഈ ഫീച്ചർ ഓണാക്കുന്നതിനുമുമ്പ്, നിരക്കുകളും മറ്റ് വിശദാംശങ്ങളും അറിയുന്നതിന് നിങ്ങളുടെ കാരിയറെ ബന്ധപ്പെടുക."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"അടിയന്തര വിലാസം അപ്ഡേറ്റുചെയ്യുക"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"വൈഫൈ ഉപയോഗിച്ച് നിങ്ങൾ 911-ലേക്ക് വിളിക്കുമ്പോൾ, ലൊക്കേഷൻ പോലുള്ള അടിയന്തര സേവനങ്ങൾ ഉപയോഗിക്കുന്ന വിലാസം"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"വൈഫൈ ഉപയോഗിച്ച് നിങ്ങളൊരു അടിയന്തര കോൾ വിളിക്കുമ്പോൾ, ലൊക്കേഷൻ പോലുള്ള അടിയന്തര സേവനങ്ങൾ ഉപയോഗിക്കുന്ന വിലാസം"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ഡിസ്പ്ലേ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ശബ്‌ദം"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"വോളിയം"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"തിരയൽ"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"തിരയൽ ക്രമീകരണങ്ങളും ചരിത്രവും നിയന്ത്രിക്കുക"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"ഫലങ്ങൾ ഇല്ല"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"ചരിത്രം മായ്‌ക്കുക"</string>
     <string name="display_settings" msgid="7965901687241669598">"ഡിസ്പ്ലേ"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"സ്‌ക്രീൻ സ്വയമേ തിരിക്കുക"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"കടും നിറങ്ങൾ"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"സ്ഥിര APN ക്രമീകരണങ്ങൾ പുനഃസ്ഥാപിക്കുന്നു"</string>
     <string name="menu_restore" msgid="8260067415075573273">"സ്ഥിരമായതിലേക്ക് പുനഃസജ്ജമാക്കുക"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"സ്ഥിര APN ക്രമീകരണങ്ങൾ പുനഃസജ്ജീകരിക്കൽ പൂർത്തിയാക്കി."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"പുനഃസജ്ജമാക്കുക"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"നെറ്റ്‌വർക്ക്‌സെറ്റിംഗ് റീസെറ്റുചെയ്യൂ"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"ഓപ്‌ഷനുകള്‍ റീസെറ്റുചെയ്യുക"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"നെറ്റ്‌വർക്കോ ആപ്പുകളോ ഉപകരണമോ റീസെറ്റുചെയ്യാം"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"വൈഫൈ, മൊബൈൽ, Bluetooth എന്നിവ റീസെറ്റുചെയ്യുക"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"ഇങ്ങനെ ചെയ്താൽ ഇനിപ്പറയുന്നവ ഉപ്പെടെയുള്ള എല്ലാ നെറ്റ്‍വർക്ക് ക്രമീകരണവും പുനഃക്രമീകരിക്കപ്പെടും:\n\n"<li>"വൈഫൈ"</li>\n<li>"മൊബൈൽ ഡാറ്റ"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"ക്രമീകരണം റീസെറ്റുചെയ്യുക"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"എല്ലാ നെറ്റ്‌വർക്കിംഗ് ക്രമീകരണവും റീസെറ്റുചെയ്യണോ? നിങ്ങൾക്ക് ഈ പ്രവർത്തനം പഴയപടിയാക്കാനാവില്ല!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"റീസെറ്റുചെയ്യണോ?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"ഈ ഉപയോക്താവിന് നെറ്റ്‌വർക്ക് റീസെറ്റ് ലഭ്യമല്ല"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"നെറ്റ്‌വർക്ക് ക്രമീകരണം റീസെറ്റുചെയ്‌തു"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"ഫാക്‌ടറിഡാറ്റ റീസെറ്റ്"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> അക്കൗണ്ടുകൾ പുനഃക്രമീകരിക്കപ്പെടും</item>
-      <item quantity="one">1 അക്കൗണ്ട് പുനഃക്രമീകരിക്കപ്പെടും</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"ഇന്റേണൽ സ്‌റ്റോറേജും എല്ലാ ഡാറ്റയും പുനഃക്രമീകരിക്കുന്നതാണ്"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"എല്ലാ ഡാറ്റയും മായ്‌ക്കുക (ഫാക്‌ടറി റീസെറ്റ്)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ഇത് നിങ്ങളുടെ ടാബ്‌ലെറ്റിന്റെ "<b>"ആന്തരിക സംഭരണത്തിൽ"</b>" നിന്നും ഇവയുൾപ്പെടെ എല്ലാ ഡാറ്റയും മായ്ക്കും:\n\n"<li>"നിങ്ങളുടെ Google അക്കൗണ്ട്"</li>\n<li>"സി‌സ്റ്റത്തിന്റെയും അപ്ലിക്കേഷന്റെയും ഡാറ്റയും ക്രമീകരണങ്ങളും"</li>\n<li>"ഡൗൺലോഡുചെ‌യ്‌ത അപ്ലിക്കേഷനുകൾ"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ഇത് നിങ്ങളുടെ ഫോണിലെ "<b>"ആന്തരിക സംഭരണത്തിലെ"</b>" എല്ലാ ഡാറ്റയും മായ്ക്കും, അതിൽ ഇവയുൾപ്പെടുന്നു:\n\n"<li>"നിങ്ങളുടെ Google അക്കൗണ്ട്"</li>\n<li>"സിസ്റ്റം, അപ്ലിക്കേഷൻ എന്നിവയുടെ ഡാറ്റയും ക്രമീകരണങ്ങളും"</li>\n<li>"ഡൗൺലോഡ്ചെയ്‌ത അപ്ലിക്കേഷനുകൾ"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"നിങ്ങൾ നിലവിൽ ഇനിപ്പറയുന്ന അക്കൗണ്ടുകളിൽ സൈൻ ചെ‌യ്തിരിക്കുന്നു:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"സുരക്ഷാ വിവരം"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"നിങ്ങൾക്ക് ഒരു ഡാറ്റ കണ‌ക്ഷൻ ഇല്ല. ഈ വിവരം ഇപ്പോൾ കാണുന്നതിന്, ഇന്റ‌ർനെറ്റിൽ കണ‌ക്റ്റുചെ‌യ്‌തിരിക്കുന്ന ഏതൊരു കമ്പ്യൂട്ടറിൽ നിന്നും %s എന്നതിലേക്ക് പോകുക."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ലോഡുചെയ്യുന്നു..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"പാസ്‌വേഡ് തിരഞ്ഞെടുക്കൂ"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"ഒരു സ്‌ക്രീൻ ലോക്ക് സജ്ജമാക്കുക"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"സുരക്ഷയ്‌ക്കായി, ഒരു പാസ്‌വേഡ് സജ്ജമാക്കുക"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"വിരലടയാളം ഉപയോഗിക്കാൻ, പാസ്‌വേഡ് സജ്ജമാക്കുക"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"പാറ്റേൺ തിരഞ്ഞെടുക്കൂ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"വിരലടയാളം ഉപയോഗിക്കാൻ, പാറ്റേൺ സജ്ജമാക്കുക"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"പിൻ തിരഞ്ഞെടുക്കൂ"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"സുരക്ഷയ്‌ക്കായി, ഒരു പിൻ സജ്ജമാക്കുക"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"വിരലടയാളം ഉപയോഗിക്കാൻ, പിൻ സജ്ജമാക്കുക"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"നിങ്ങളുടെ പാസ്‌വേഡ് സ്ഥിരീകരിക്കുക"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"നിങ്ങളുടെ പാസ്‌വേഡ് വീണ്ടും നൽകുക"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"നിങ്ങളുടെ പാറ്റേൺ സ്ഥിരീകരിക്കുക"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"നിങ്ങളുടെ പിൻ സ്ഥിരീകരിക്കുക"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"നിങ്ങളുടെ പിൻ വീണ്ടും നൽകുക"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"പാസ്‌വേഡുകൾ പൊരുത്തപ്പെടുന്നില്ല"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"പിൻ നമ്പറുകൾ പൊരുത്തപ്പെടുന്നില്ല"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"അൺലോക്ക് തിരഞ്ഞെടുക്കൽ"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"തുടരാൻ നിങ്ങളുടെ ഔദ്യോഗിക പാറ്റേൺ ഉപയോഗിക്കുക"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"തുടരാൻ നിങ്ങളുടെ ഔദ്യോഗിക പിൻ നൽകുക"</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">"തുടരാൻ നിങ്ങളുടെ ഉപകരണ പിൻ നൽകുക. ഉപകരണം പുനരാരംഭിച്ച് കഴിഞ്ഞാൽ ഇത് ആവശ്യമാണ്."</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">"തുടരാൻ നിങ്ങളുടെ ഔദ്യോഗിക പിൻ നൽകുക. ഉപകരണം പുനരാരംഭിച്ച് കഴിഞ്ഞാൽ ഇത് ആവശ്യമാണ്."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"തുടരാൻ നിങ്ങളുടെ ഔദ്യോഗിക പാസ്‌വേഡ് നൽകുക. ഉപകരണം പുനരാരംഭിച്ച് കഴിഞ്ഞാൽ ഇത് ആവശ്യമാണ്."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"അധിക സുരക്ഷയ്ക്ക്, നിങ്ങളുടെ ഉപകരണത്തിന്റെ പാറ്റേൺ ഉപയോഗിക്കുക"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"അധിക സുരക്ഷയ്ക്ക്, നിങ്ങളുടെ ഉപകരണത്തിന്റെ പിൻ നൽകുക"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"അധിക സുരക്ഷയ്ക്ക്, നിങ്ങളുടെ ഉപകരണത്തിന്റെ പാസ്‌വേഡ് നൽകുക"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"അധിക സുരക്ഷയ്ക്ക്, നിങ്ങളുടെ ഔദ്യോഗിക പാറ്റേൺ ഉപയോഗിക്കുക"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"അധിക സുരക്ഷയ്ക്ക്, നിങ്ങളുടെ ഔദ്യോഗിക പിൻ നൽകുക"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"അധിക സുരക്ഷയ്ക്ക്, നിങ്ങളുടെ ഔദ്യോഗിക പാസ്‌വേഡ് നൽകുക"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"ഫാക്‌ടറി ക്രമീകരണത്തിലേക്ക് നിങ്ങളുടെ ഫോൺ റീസെറ്റ് ചെയ്‌തു. ഫോൺ ഉപയോഗിക്കാനായി മുമ്പത്തെ പാറ്റേൺ നൽകുക."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"ഫാക്‌ടറി ക്രമീകരണത്തിലേക്ക് നിങ്ങളുടെ ഫോൺ റീസെറ്റ് ചെയ്‌തു. ഫോൺ ഉപയോഗിക്കാനായി മുമ്പത്തെ പിൻ നൽകുക."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"ഫാക്‌ടറി ക്രമീകരണത്തിലേക്ക് നിങ്ങളുടെ ഫോൺ റീസെറ്റ് ചെയ്‌തു. ഫോൺ ഉപയോഗിക്കാനായി മുമ്പത്തെ പാസ്‌വേഡ് നൽകുക."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"പാറ്റേൺ പരിശോധിക്കുക"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"പിൻ പരിശോധിക്കുക"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"പാസ്‌വേഡ് പരിശോധിക്കുക"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"പിൻ തെറ്റാണ്"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"പാസ്‌വേഡ് തെറ്റാണ്"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"പാറ്റേൺ തെറ്റാണ്"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"വിജറ്റ് സൃഷ്ടിച്ച് ആക്‌സസ്സ് അനുവദിക്കണോ?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"വിജറ്റ് സൃഷ്‌ടിച്ചതിനുശേഷം, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ദൃശ്യമാക്കുന്ന എല്ലാ ഡാറ്റയും അതിന് ആക്‌സസ്സുചെയ്യാനാകും."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> എന്നതിനെ വിജറ്റുകൾ സൃഷ്‌ടിച്ച് അവയുടെ ഡാറ്റ ആക്‌സസ്സുചെയ്യാൻ എല്ലായ്പ്പോഴും അനുവദിക്കുക"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>ദിവസം <xliff:g id="HOURS">%2$d</xliff:g>മണിക്കൂർ <xliff:g id="MINUTES">%3$d</xliff:g>മിനിറ്റ് <xliff:g id="SECONDS">%4$d</xliff:g>സെക്കൻഡ്"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>മണിക്കൂർ <xliff:g id="MINUTES">%2$d</xliff:g>മിനിറ്റ് <xliff:g id="SECONDS">%3$d</xliff:g>സെക്കൻഡ്"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>മിനിറ്റ് <xliff:g id="SECONDS">%2$d</xliff:g>സെക്കൻഡ്"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>സെ."</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"ഉപയോഗ വിവരക്കണക്ക്"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"ഉപയോഗ സ്ഥിതിവിവരക്കണക്ക്"</string>
     <string name="display_order_text" msgid="8592776965827565271">"ഇതുപ്രകാരം അടുക്കുക:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"സ്‌ക്രീൻ റീഡറുകൾ, ‌ഡിസ്‌പ്ലേ, ഇന്റരാക്ഷൻ നിയന്ത്രണങ്ങൾ"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"വീക്ഷണ ക്രമീകരണം"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"ആവശ്യങ്ങൾക്ക് അനുസരിച്ച് നിങ്ങൾക്ക് ഈ ഉപകരണം ഇഷ്ടാനുസൃതമാക്കാം. ഈ ഉപയോഗസഹായി ഫീച്ചറുകൾ പിന്നീട് ക്രമീകരണത്തിൽ മാറ്റാവുന്നതാണ്."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"ഫോണ്ട് വലുപ്പം വർദ്ധിപ്പിക്കുക"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"ഫോണ്ട് വലുപ്പം മാറ്റുക"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"സ്‌ക്രീൻ റീഡറുകൾ"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ഓഡിയോയും സ്‌ക്രീനിലെ ടെക്‌സ്‌റ്റും"</string>
     <string name="display_category_title" msgid="685461049938269166">"ഡി‌സ്‌പ്ലേ"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"സൂം ചെയ്യാൻ"</b>", വേഗത്തിൽ 3 തവണ സ്‌ക്രീൻ ടാപ്പുചെയ്യുക.\n"<ul><li>"സ്‌ക്രോൾ ചെയ്യാൻ രണ്ടോ അതിലധികമോ വിരലുകൾ ഇഴയ്‌ക്കുക"</li>\n<li>"സൂം ക്രമീകരിക്കാൻ രണ്ടോ അതിലധികമോ വിരലുകൾ പിഞ്ചുചെയ്യുക"</li></ul>\n\n<b>"താൽക്കാലികമായി സൂം ചെയ്യാൻ"</b>", സ്ക്രീനിൽ 3 തവണ വേഗത്തിൽ ടാപ്പുചെയ്യുകയും മൂന്നാമത്തെ ടാപ്പിൽ വിരൽ താഴേക്ക് അമർത്തിപ്പിടിക്കുകയും ചെയ്യുക.\n"<ul><li>"സ്‌ക്രീനിന് ചുറ്റും നീങ്ങുന്നതിന് നിങ്ങളുടെ വിരൽ ഇഴയ്ക്കുക"</li>\n<li>"സൂം ഔട്ട് ചെയ്യുന്നതിന് വിരൽ എടുക്കുക"</li></ul>\n\n"കീബോർഡിലും നാവിഗേഷൻ ബാറിലും നിങ്ങൾക്ക് സൂം ഇൻ ചെയ്യാൻ കഴിയില്ല."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"മാഗ്നിഫിക്കേഷൻ ഓണായിരിക്കുമ്പോൾ, വേഗത്തിൽ മാഗ്നിഫൈ ചെയ്യാനായി സ്‌ക്രീനിന് ചുവട്ടിലുള്ള ഉപയോഗസഹായി ബട്ടൺ ഉപയോഗിക്കുക.\n\n"<b>"സൂം ചെയ്യാൻ"</b>", ഉപയോഗസഹായി ബട്ടൺ ടാപ്പുചെയ്യുക, തുടർന്ന് സ്‌ക്രീനിൽ എവിടെയെങ്കിലും ടാപ്പുചെയ്യുക.\n"<ul><li>"സ്‌ക്രോൾ ചെയ്യാൻ രണ്ടോ അതിലധികമോ വിരലുകൾ ഇഴയ്‌ക്കുക"</li>\n<li>"സൂം ക്രമീകരിക്കാൻ രണ്ടോ അതിലധികമോ വിരലുകൾ പിഞ്ചുചെയ്യുക"</li></ul>\n\n<b>"താൽക്കാലികമായി സൂം ചെയ്യാൻ"</b>", ഉപയോഗസഹായി ബട്ടൺ ടാപ്പുചെയ്‌ത് സ്‌ക്രീനിൽ എവിടെയെങ്കിലും സ്‌പർശിച്ചുപിടിക്കുക.\n"<ul><li>"സ്‌ക്രീനിന് ചുറ്റും നീങ്ങുന്നതിന് നിങ്ങളുടെ വിരൽ ഇഴയ്ക്കുക"</li>\n<li>"സൂം ഔട്ട് ചെയ്യുന്നതിന് വിരൽ എടുക്കുക"</li></ul>\n\n"കീബോർഡിലും നാവിഗേഷൻ ബാറിലും നിങ്ങൾക്ക് സൂം ഇൻ ചെയ്യാൻ കഴിയില്ല."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"<xliff:g id="SERVICE">%1$s</xliff:g> സേവനത്തിലേക്ക് ഉപയോഗസഹായി ബട്ടൺ സജ്ജമാക്കിയിരിക്കുന്നു. മാഗ്നിഫിക്കേഷൻ ഉപയോഗിക്കുന്നതിന് ഉപയോഗസഹായി ബട്ടൺ സ്‌പർശിച്ചുപിടിച്ച് മാഗ്നിഫിക്കേഷൻ തിരഞ്ഞെടുക്കുക."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"ഉപയോഗസഹായി കുറുക്കുവഴി"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"വോളിയം കീ കുറുക്കുവഴി"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"കുറുക്കുവഴി സേവനം"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"ലോക്ക് സ്‌ക്രീനിൽ നിന്ന് അനുവദിക്കുക"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"കുറുക്കുവഴി ഓണായിരിക്കുമ്പോൾ, രണ്ട് വോളിയം ബട്ടണുകളും 3 സെക്കൻഡ് നേരം അമർത്തിപ്പിടിച്ച് നിങ്ങൾക്ക് ഉപയോഗസഹായി ഫീച്ചർ ആരംഭിക്കാം."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"കുറുക്കുവഴി ഓണായിരിക്കുമ്പോൾ, രണ്ട് വോളിയം കീകളും 3 സെക്കൻഡ് നേരം അമർത്തിപ്പിടിച്ച് നിങ്ങൾക്ക് ഉപയോഗസഹായി ഫീച്ചർ ആരംഭിക്കാം."</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">"സ്‌ക്രീൻ മാഗ്‌നിഫിക്കേഷൻ സ്വയമേവ അപ്‌ഡേറ്റുചെയ്യുക"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"അപ്ലിക്കേഷൻ സംക്രമണങ്ങളിൽ സ്‌ക്രീൻ മാഗ്‌നിഫിക്കേഷൻ അപ്‌ഡേറ്റുചെയ്യുക"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"പ്രകടനത്തെ ബാധിച്ചേക്കാം"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"പോയിന്റർനിന്നശേഷം ക്ലിക്കുചെയ്യൂ"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"ക്ലിക്കിന് മുമ്പുള്ള കാലതാമസം"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ഓൺ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ഓഫ്"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"ദ്രുത്ര ക്രമീകരണങ്ങളിൽ ദൃശ്യമാക്കുക"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g>-ൽ <xliff:g id="NUMBER">%1$d</xliff:g> എണ്ണം തിരഞ്ഞടുത്തു"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g>-ൽ <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"എല്ലാം തിരഞ്ഞെടുക്കുക"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"പ്ലാനുകൾ മാനേജുചെയ്യുക"</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>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"മൊബൈൽ നെറ്റ്‌വർക്കുകൾ"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"മീറ്റർ-മാപക വൈഫൈ നെറ്റ്‌വർക്ക്"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"മീറ്റർ-മാപക നെറ്റ്‌വർക്കുകൾ തിരഞ്ഞെടുക്കാൻ വൈഫൈ ഓണാക്കുക."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"സ്വയമേവ"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"മീറ്റർമാപകം അല്ലാത്തത്"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"മീറ്റർമാപകം"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"കാരിയർ ഡാറ്റ കണക്കാക്കുന്നത് ഉപകരണത്തിൽ നിന്നും വ്യത്യാസപ്പെട്ടിരിക്കാം."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"അടിയന്തര കോൾ"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"കോളിലേക്ക് മടങ്ങുക"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"കോൾ മാനേജർ"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"അടിയന്തര പ്രക്ഷേപണങ്ങൾ"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"അടിയന്തര അലേർട്ടുകൾ"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"നെറ്റ്‌വർക്ക് ഓപ്പറേറ്റർമാർ"</string>
     <string name="access_point_names" msgid="1381602020438634481">"ആക്‌സസ്സ് പോയിന്റ് പേരുകൾ"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"മെച്ചപ്പെടുത്തിയ 4G LTE മോഡ്"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"ഈ പ്രവർത്തനത്തിനുള്ള SIM"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"എപ്പോഴും ചോദിക്കുക"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"തിരഞ്ഞെടുക്കൽ ആവശ്യമാണ്"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"സിം തിരഞ്ഞെടുക്കൽ"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"ക്രമീകരണം"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">മറച്ച %d ഇനങ്ങൾ കാണിക്കുക</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"ആപ്പ് അറിയിപ്പുകൾ"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"അറിയിപ്പ് വിഭാഗം"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"പ്രാധാന്യം"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"ആപ്പ് തീരുമാനിക്കട്ടെ"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"ശ‌ബ്‌ദം അനുവദിക്കുക"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"അറിയിപ്പുകൾ ഒരിക്കലും കാണിക്കരുത്"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ശബ്ദപരമോ ദൃശ്യപരമോ ആയ തടസ്സമില്ല"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"ശബ്‌ദമില്ല"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"ശബ്ദമുണ്ടാക്കുക"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"ശബ്ദമുണ്ടാക്കുക, സ്ക്രീനിൽ കാണിക്കുക"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"സ്‌ക്രീനിൽ പോപ്പ്"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"കുറഞ്ഞത്"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"ഇടത്തരം"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"ഉയർന്ന പ്രാധാന്യം"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"അടിയന്തിരാവശ്യം"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"ശ‌ബ്‌ദം അനുവദിക്കുക"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"ഈ അറിയിപ്പുകൾ ശബ്ദമുണ്ടാക്കുകയോ വൈബ്രേറ്റുചെയ്യുകയോ നിലവിലെ സ്ക്രീനിലെ കാഴ്ചയിൽ കാണിക്കുകയോ അരുത്."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"തടസ്സങ്ങൾ അനുവദിക്കുക"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"ശബ്‌ദം, വൈബ്രേഷൻ അല്ലെങ്കിൽ സ്‌ക്രീനിൽ പോപ്പ് അറിയിപ്പുകൾ സൃഷ്‌ടിക്കാൻ ആപ്പിനെ അനുവദിക്കൂ"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"താഴ്ന്ന പ്രാധാന്യം"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"ഇടത്തരം പ്രാധാന്യം"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"ഉയർന്ന പ്രാധാന്യം"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip ചിത്രത്തിനുള്ളിൽ ചിത്രം"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"ചിത്രത്തിനുള്ളിൽ ചിത്രം"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"ചിത്രത്തിനുള്ളിൽ ചിത്രം അനുവദിക്കുക"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"ഈ ആപ്പ് തുറന്നിരിക്കുന്ന സമയത്തോ നിങ്ങളത് വിട്ടുകഴിഞ്ഞാലോ (ഉദാഹരണത്തിന്, ഒരു വീഡിയോ കാണുന്നത് തുടരുന്നതിന്) ഒരു ചിത്രത്തിനുള്ളിൽ ചിത്ര വിൻഡോ സൃഷ്ടിക്കാൻ ഈ ആപ്പിനെ അനുവദിക്കുക. നിങ്ങൾ ഉപയോഗിക്കുന്ന മറ്റ് ആപ്‌സിന്റെ മുകളിൽ ഈ വിൻഡോ പ്രദർശിപ്പിക്കുന്നു."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"ഈ ആപ്പ് തുറന്നിരിക്കുന്ന സമയത്തോ നിങ്ങളത് വിട്ടുകഴിഞ്ഞാലോ (ഉദാഹരണത്തിന്, ഒരു വീഡിയോ കാണുന്നത് തുടരുന്നതിന്) ഒരു ചിത്രത്തിനുള്ളിൽ ചിത്ര വിൻഡോ സൃഷ്‌ടിക്കാൻ ഈ ആപ്പിനെ അനുവദിക്കുക. നിങ്ങൾ ഉപയോഗിക്കുന്ന മറ്റ് ആപ്പുകളുടെ മുകളിൽ ഈ വിൻഡോ പ്രദർശിപ്പിക്കുന്നു."</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>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"ഫയലുകൾ കൈമാറുന്നു"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"ഫോട്ടോകൾ കൈമാറുന്നു (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"MIDI ആയി ഉപകരണം ഉപയോഗിക്കുന്നു"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS മിററിംഗ്"</string>
     <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>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"നൈറ്റ് ലൈറ്റ് ഷെഡ്യൂൾ സജ്ജമാക്കുക"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"എളുപ്പത്തിൽ ഉറങ്ങാൻ സ്‌ക്രീനിന് ആംബർ നിറം"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"നൈറ്റ് ലൈറ്റ് ഓണാണ്"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"സ്ക്രീനിന് ആംബർ ശോഭയാണുള്ളത്. എളുപ്പത്തിൽ ഉറങ്ങുന്നതിന് ഇത് നിങ്ങളെ സഹായിച്ചേക്കാം."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"നിര്‍ദ്ദേശങ്ങള്‍"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"കൂടുതൽ തണുത്ത ഡിസ്പ്ലേ വർണ്ണങ്ങൾ ഉപയോഗിക്കുക"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"വർണ്ണ മാറ്റം ബാധകമാക്കാൻ, സ്ക്രീൻ ഓഫാക്കുക"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"ടെലിഫോണി മോണിറ്ററിലെ മാറ്റം പ്രയോഗിക്കാൻ ഉപകരണം റീബൂട്ടുചെയ്യുക"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"ക്യാമറ HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"ക്യാമറ HAL HDR+ മാറ്റം പ്രയോഗിക്കാൻ, ഉപകരണം റീബൂട്ട് ചെയ്യുക"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"ക്യാമറ ലേസർ സെൻസർ"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"സ്വയമേവയുള്ള സിസ്റ്റം അപ്ഡേറ്റുകൾ"</string>
     <string name="usage" msgid="2977875522080448986">"ഉപയോഗം"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"മൊബൈൽ ഡാറ്റ ഉപയോഗം"</string>
@@ -3410,7 +3427,7 @@
     <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_2">%2$s</xliff:g> എന്നീ തീയതികൾക്ക് ഇടയിൽ <xliff:g id="ID_1">%1$s</xliff:g> ഉപയോഗിച്ചു"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<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">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"വൈപ്പുചെയ്ത് പരിവർത്തനം ചെയ്യുക"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"കുറുക്കുവഴിമാനേജർ നിരക്ക്-പരിമിതപ്പെടുത്തൽ പുനഃക്രമീകരിക്കുക"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"കുറുക്കുവഴിമാനേജർ നിരക്ക്-പരിമിതപ്പെടുത്തൽ പുനഃക്രമീകരിച്ചു"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"ലോക്ക് സ്ക്രീൻ അറിയിപ്പുകൾ നിയന്ത്രിക്കുക"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"ലോക്ക് സ്‌ക്രീനിൽ ‌വിവരം നിയന്ത്രിക്കുക"</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="8483187649355540109">"സഹായവും ‌നുറുങ്ങുകളും"</string>
@@ -3487,7 +3504,7 @@
     <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="2456198532288640046">"മറ്റ് ഉപകരണങ്ങൾക്ക് ദൃശ്യമല്ല"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"ഓഫ്"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> എന്നതിൽ കണക്‌റ്റുചെയ്‌തു"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"ഒന്നിലധികം ഉപകരണങ്ങളിൽ കണക്‌റ്റുചെയ്‌തു"</string>
     <string name="demo_mode" msgid="2798762752209330277">"സിസ്റ്റം UI ഡെമോ മോഡ്"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"ഇൻസ്‌റ്റ‌ന്റ് ആപ്പ്"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"ആപ്പുകൾ ഇൻസ്റ്റാൾ ചെയ്തിട്ടില്ലെങ്കിൽ പോലും, അവയിൽ ലിങ്കുകൾ തുറക്കുക"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"ഇൻസ്‌റ്റ‌ന്റ് ആപ്പ്"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"ഇൻസ്റ്റന്റ് ആപ്പ് അക്കൗണ്ട്"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"ഇൻസ്‌റ്റന്‍റ് ആപ്പ് മുൻഗണനകൾ"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ഇൻസ്‌റ്റാളുചെയ്‌ത അപ്ലിക്കേഷനുകൾ"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"നിങ്ങളുടെ സ്റ്റോറേജ് ഇപ്പോൾ മാനേജുചെയ്യുന്നത് സ്റ്റോറേജ് ​​മാനേജരാണ്"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> എന്ന ഉപയോക്താവിന്റെ അക്കൗണ്ടുകൾ"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"എപ്പോഴും ഓണായിരിക്കുന്ന VPN നിങ്ങളുടെ സ്വകാര്യ പ്രൊഫൈലിൽ ഓണായിരിക്കുന്നു"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"എല്ലായ്‌പ്പോഴും ഓണായിരിക്കുന്ന VPN നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലിൽ ഓണായിരിക്കുന്നു"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"ഗ്ലോബൽ HTTP പ്രോക്സി സെറ്റ്"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"പരിചിത ക്രെഡൻഷ്യൽ"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"വിശ്വാസയോഗ്യമായ ക്രെഡൻഷ്യലുകൾ"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"നിങ്ങളുടെ വ്യക്തിഗത പ്രൊഫൈലിലെ വിശ്വാസയോഗ്യമായ ക്രെഡൻഷ്യലുകൾ"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലിലെ വിശ്വാസയോഗ്യമായ ക്രെഡൻഷ്യലുകൾ"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">ചുരുങ്ങിയത് <xliff:g id="COUNT_1">%d</xliff:g> CA സർട്ടിഫിക്കറ്റുകൾ</item>
       <item quantity="one">ചുരുങ്ങിയത് <xliff:g id="COUNT_0">%d</xliff:g> CA സർട്ടിഫിക്കറ്റ്</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"കാരിയര്‍ പ്രൊവിഷനിംഗ് വിവരം"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"കാരിയർ പ്രൊവിഷനിംഗ് തുടങ്ങുക"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"പുതിയതും ആവേശമുണർത്തുന്നതുമായ കാര്യങ്ങൾ എന്തൊക്കെയാണ്?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"പ്രധാന 5 ഫീച്ചറുകൾ പരിശോധിക്കുക"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"നിങ്ങളുടെ പുതിയ ഫോണിനെ അറിയുക‌"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"നിങ്ങളുടെ ‌പുതിയ ‌ടാബ്‌ലെറ്റിനെ അറിയുക‌"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"നിങ്ങളുടെ പുതിയ ഉപകരണത്തെ അറിയുക"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"ഈ ഫീച്ചർ ഈ ഉപകരണത്തിൽ ലഭ്യമല്ല"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS രജിസ്‌ട്രേഷൻ നില"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"രജിസ്റ്റർ ചെയ്‌തു"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"രജിസ്‌റ്റർ ചെയ്‌തിട്ടില്ല"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index ce31a94..d3fe39e 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s таны зурвасуудад хандалт хийх хүсэлтэй байна. %2$s-д хандалт хийхийг зөвшөөрөх үү?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"СИМ хандалтын хүсэлт"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> нь таны СИМ картанд хандах хүсэлтэй байна. СИМ картанд хандалтыг нээж өгснөөр холболтын хугацааны туршид төхөөрөмжийн дата холболтыг идэвхгүй болгоно. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>-д хандалтыг нээх"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Бусад төхөөрөмжид <xliff:g id="DEVICE_NAME">^1</xliff:g>-р харагдана"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Бусад төхөөрөмжид “<xliff:g id="DEVICE_NAME">^1</xliff:g>”-р харагдана"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Таны төхөөрөмж"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Шинэ төхөөрөмж холбох"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Огноо &amp; цаг"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"Дараагийн"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Хурууны хээг алгасах уу?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Хурууны хээг тохируулахад хэдхэн минут болно. Та үүнийг алгасвал хурууны хээгээ дараа тохиргоо хэсэгт нэмэх боломжтой."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Дэлгэцийн түгжээг алгасах уу?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Төхөөрөмжийн хамгаалалтын онцлогийг асаахгүй. Та таблетаа гээсэн,  хулгайд алдсан эсвэл сэргээсэн тохиолдолд үүнийг хэн нэгэн этгээд ашиглахаас сэргийлэх боломжгүй."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Төхөөрөмжийн хамгаалалтын онцлогийг асаахгүй. Та төхөөрөмжөө гээсэн, хулгайд алдсан эсвэл сэргээсэн тохиолдолд үүнийг хэн нэгэн этгээд ашиглахаас сэргийлэх боломжгүй."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Төхөөрөмжийн хамгаалалтын онцлогийг асаахгүй. Та утсаа гээсэн, хулгайд алдсан эсвэл сэргээсэн тохиолдолд үүнийг хэн нэгэн этгээд ашиглахаас сэргийлэх боломжгүй."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Таны зөвшөөрөгдсөн хурууны хээний тоо гүйцсэн байна"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Өөр хурууны хээ нэмэх боломжгүй байна"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Бүх хурууны хээг устгах уу?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'-г устгах"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Энэ хурууны хээг устгах уу?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Ta цаашид хурууны хээгээр утасны түгжээ тайлах, худалдан авалт хийх болон апп-д нэвтрэх боломжгүй болно"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Ta цаашид хурууны хээгээр ажлын профайлын түгжээ тайлах, худалдан авалт хийх болон апп-д нэвтрэх боломжгүй болно"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Тийм, устгана уу"</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"Хамгаалалтыг сайжруулахын тулд дэлгэцийн нөөц түгжээг тохируулна уу."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Хамгаалалтыг сайжруулахын тулд дэлгэцийн нөөц түгжээг тохируулна уу."</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>
@@ -497,37 +502,37 @@
     <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_fingerprint" msgid="8212242533942400457">"Төхөөрөмж хамгаалах тохиргоо нь таны зурган түгжээгүйгээр ажиллах боломжгүй.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Төхөөрөмж хамгаалах онцлог нь таны зурган түгжээгүйгээр ажиллах боломжгүй.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Таны хадгалсан хурууны хээ нь энэ төхөөрөмжөөс мөн устах бөгөөд та утасныхаа түгжээг нээх, худалдан авалт хийх болон апп-д нэвтрэх боломжгүй.\""</string>
+</xliff:g>Таны хадгалсан хурууны хээг энэ төхөөрөмжөөс мөн устгах бөгөөд та утасныхаа түгжээг тайлах, худалдан авалт хийх эсвэл аппад нэвтрэх боломжгүй болно."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Төхөөрөмж хамгаалах тохиргоо нь таны ПИН-гүйгээр ажиллах боломжгүй."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Төхөөрөмж хамгаалах тохиргоо нь таны ПИН-гүйгээр ажиллах боломжгүй.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Төхөөрөмж хамгаалах онцлог нь таны ПИН-гүйгээр ажиллах боломжгүй.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Таны хадгалсан хурууны хээ нь энэ төхөөрөмжөөс мөн устах бөгөөд та утасныхаа түгжээг нээх, худалдан авалт хийх болон апп-д нэвтрэх боломжгүй.\""</string>
+</xliff:g>Таны хадгалсан хурууны хээг энэ төхөөрөмжөөс мөн устгах бөгөөд та утасныхаа түгжээг тайлах, худалдан авалт хийх эсвэл аппад нэвтрэх боломжгүй болно."</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Төхөөрөмж хамгаалах онцлог нь таны нууц үггүйгээр ажиллах боломжгүй.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Таны хадгалсан хурууны хээ нь энэ төхөөрөмжөөс мөн устах бөгөөд та утасныхаа түгжээг нээх, худалдан авалт хийх болон апп-д нэвтрэх боломжгүй.\""</string>
+</xliff:g>Таны хадгалсан хурууны хээг энэ төхөөрөмжөөс мөн устгах бөгөөд та утасныхаа түгжээг тайлах, худалдан авалт хийх эсвэл аппад нэвтрэх боломжгүй болно."</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Төхөөрөмж хамгаалах онцлог нь таны дэлгэцийн түгжээгүйгээр ажиллах боломжгүй.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Таны хадгалсан хурууны хээ нь энэ төхөөрөмжөөс мөн устах бөгөөд та утасныхаа түгжээг нээх, худалдан авалт хийх болон апп-д нэвтрэх боломжгүй.\""</string>
+</xliff:g>Таны хадгалсан хурууны хээг энэ төхөөрөмжөөс мөн устгах бөгөөд та утасныхаа түгжээг тайлах, худалдан авалт хийх эсвэл аппад нэвтрэх боломжгүй болно."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Профайл хамгаалах тохиргоо нь таны зурган түгжээгүйгээр ажиллах боломжгүй."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Профайл хамгаалах тохиргоо нь таны зурган түгжээгүйгээр ажиллах боломжгүй.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Профайл хамгаалах онцлог нь таны зурган түгжээгүйгээр ажиллах боломжгүй.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Таны хадгалсан хурууны хээ нь энэ профайлаас мөн устах бөгөөд та профайлынхаа түгжээг нээх, худалдан авалт хийх болон апп-д нэвтрэх боломжгүй.\""</string>
+</xliff:g>Таны хадгалсан хурууны хээг энэ профайлаас мөн устгах бөгөөд та профайлынхаа түгжээг тайлах, худалдан авалт хийх эсвэл аппад нэвтрэх боломжгүй болно."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Профайл хамгаалах тохиргоо нь таны PIN-гүйгээр ажиллах боломжгүй."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Профайл хамгаалах тохиргоо нь таны PIN-гүйгээр ажиллах боломжгүй.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Профайл хамгаалах онцлог нь таны ПИН-гүйгээр ажиллах боломжгүй.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Таны хадгалсан хурууны хээ нь энэ профайлаас мөн устах бөгөөд та профайлынхаа түгжээг нээх, худалдан авалт хийх болон апп-д нэвтрэх боломжгүй.\""</string>
+</xliff:g>Таны хадгалсан хурууны хээг энэ профайлаас мөн устгах бөгөөд та профайлынхаа түгжээг тайлах, худалдан авалт хийх эсвэл аппад нэвтрэх боломжгүй болно."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Профайл хамгаалах тохиргоо нь таны нууц үггүйгээр ажиллах боломжгүй."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Профайл хамгаалах тохиргоо нь таны нууц үггүйгээр ажиллах боломжгүй.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Профайл хамгаалах онцлог нь таны нууц үггүйгээр ажиллах боломжгүй.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Таны хадгалсан хурууны хээ нь энэ профайлаас мөн устах бөгөөд та профайлынхаа түгжээг нээх, худалдан авалт хийх болон апп-д нэвтрэх боломжгүй.\""</string>
+</xliff:g>Таны хадгалсан хурууны хээг энэ профайлаас мөн устгах бөгөөд та профайлынхаа түгжээг тайлах, худалдан авалт хийх эсвэл аппад нэвтрэх боломжгүй болно."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Профайл хамгаалах тохиргоо нь таны дэлгэцийн түгжээгүйгээр ажиллахгүй."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Профайл хамгаалах тохиргоо нь таны дэлгэцийн түгжээгүйгээр ажиллах боломжгүй.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Профайл хамгаалах тохиргоо нь таны дэлгэцийн түгжээгүйгээр ажиллах боломжгүй.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Таны хадгалсан хурууны хээ нь энэ профайлаас мөн устах бөгөөд та профайлынхаа түгжээг нээх, худалдан авалт хийх болон апп-д нэвтрэх боломжгүй.\""</string>
+</xliff:g>Таны хадгалсан хурууны хээг энэ профайлаас мөн устгах бөгөөд та профайлынхаа түгжээг тайлах, худалдан авалт хийх эсвэл аппад нэвтрэх боломжгүй болно."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Тийм, устгана уу"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Тайлах хээг өөрчлөх"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Тайлах PIN өөрчлөх"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Цифр өсөх, буурах, давхцахыг зөвшөөрдөггүй"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Цуцлах"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Устгах"</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>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS боломжтой"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS боломжтой)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Сүлжээний нууц үгээ оруулна уу"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Оператор компанийн Wi‑Fi сүлжээ"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g>-р холбогдох"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Байршлын нарийвчлалыг сайжруулах болон бусад зорилгоор <xliff:g id="APP_NAME">%1$s</xliff:g> нь Wi-Fi хаалттай байгаа хэдий ч сүлжээний сканийг идэвхжүүлэхийг хүсч байна.\n\nҮүнийг скан хийхийг хүсч байгаа бүх апп-д зөвшөөрөх үү?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Үүнийг унтраахын тулд дээрх цэсний Дэлгэрэнгүй рүү очно уу."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Зөвшөөрөх"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Холбогдох"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Сүлжээнд холбогдож чадсангүй"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Мартах"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Өөрчлөх"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Сүлжээг мартаж чадсангүй"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Хадгалах"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Сүлжээг хадгалж чадсангүй"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi‑Fi дэлгэрэнгүй"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC хаяг"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP хаяг"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Сүлжээний мэдээлэл"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet маск"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 хаяг"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Урилгыг цуцлах уу?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Та <xliff:g id="PEER_NAME">%1$s</xliff:g>-тай холбох урилгыг цуцлахыг хүсэж байна уу?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Энэ бүлгэмийг устгах уу?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Зөөврийн Wi‑Fi сүлжээний цэг"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi хотспот"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Интернэт эсвэл агуулгыг бусад төхөөрөмжтэй хуваалцаагүй"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Энэ таблетын интернэт холболтыг сүлжээний цэгээр хуваалцаж байна"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Энэ утасны интернэт холболтыг сүлжээний цэгээр хуваалцаж байна"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Апп агуулга хуваалцаж байна. Интернэт холболтыг хуваалцахын тулд сүлжээний цэгийг унтрааж дахин асаана уу"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi-н нэр"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Сүлжээний цэгийн нэр"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-г асааж байна..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Бусад төхөөрөмж <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-д холбогдох боломжтой"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi нууц үг"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Сүлжээний цэгийн нууц үг"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP Band"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Бусад төхөөрөмждөө Wi‑Fi холболт үүсгэхийн тулд сүлжээний цэгийг ашиглана уу. Сүлжээний цэг нь таны мобайл датаны холболтоор интернэтэд холбогдоно. Мобайл датаны нэмэлт төлбөр гарна."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Апп ойролцоох төхөөрөмжтэй агуулга хуваалцахын тулд сүлжээний цэг үүсгэх боломжтой."</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi дуудлага асаалттай байгаа үед таны сонголт болон аль дохио илүү хүчтэй байгаагаас шалтгаалан Wi-Fi сүлжээ болон таны операторын сүлжээгээр дамжуулан таны утас дуудлагуудыг хянаж дамжуулна. Энэ горимыг асаахаасаа өмнө өөрийнхөө операторын төлбөр болон бусад дэлгэрэнгүй мэдээллүүдийг шалгаж үзээрэй."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Онцгой байдлын хаягийг шинэчлэх"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"WiFi-р 911-н дуудлага хийх үед яаралтай тусламжийн үйлчилгээнийхнээс танд тусламж үзүүлэх байршлын хаяг"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"Wi-Fi-р яаралтай дуудлага хийх үед яаралтай тусламжийн үйлчилгээнээс танд тусламж үзүүлэх байршлын хаяг"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дэлгэц"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Дуу"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Дууны хэмжээ"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Хайх"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Хайлтын тохиргоо болон түүхийг удирдах"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Илэрц алга"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Түүхийг устгах"</string>
     <string name="display_settings" msgid="7965901687241669598">"Дэлгэц"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Дэлгэцийг автоматаар эргүүлэх"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Тод өнгө"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Үндсэн APN тохиргоог сэргээж байна"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Үндсэн рүү сэргээх"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Үндсэн APN тохиргоог дахин шинэчилж дууслаа."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Шинэчлэх"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Сүлжээний тохиргоог дахин тохируулах"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Сонголтыг шинэчлэх"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Сүлжээ, апп эсвэл төхөөрөмжийг шинэчлэх боломжтой"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi, мобайл &amp; Bluetooth-г шинэчлэх"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Энэ нь \n\n"<li>"Wi‑Fi"</li>\n<li>"мобайл дата"</li>\n<li>"Bluetooth"</li>" зэрэг сүлжээний бүх тохиргоог шинэчилнэ"</string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Дахин тохируулах"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Бүх сүлжээний тохиргоог дахин тохируулах уу? Энэ үйлдлийг буцаах боломжгүй!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Дахин тохируулах уу?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Энэ хэрэглэгчид сүлжээний тохиргоо хийх боломжгүй байна"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Сүлжээний тохиргоог дахин тохируулсан байна"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Үйлдвэрээс гарсан төлөвт"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> бүртгэлийг шинэчилнэ</item>
-      <item quantity="one">1 бүртгэлийг шинэчилнэ</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Дотоод сангийн бүх өгөгдлийг шинэчлэх болно"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Бүх өгөгдлийг устгах (үйлдвэрийн тохиргоонд шинэчлэх)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Энэ таны таблетын "<b>"дотоод сангаас"</b>"таны \n\n"<li>"Google акаунт"</li>\n<li>"Системийн болон апп өгөгдөл болон тохиргоо"</li>\n<li>"Татаж авсан апп-уудыг"</li>" оруулан бүх өгөгдлийг устгах болно"</string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Энэ таны утасны "<b>"дотоод сангаас"</b>" таны \n\n"<li>"Google бүртгэл"</li>\n<li>"Системийн болон апп өгөгдөл болон тохиргоо"</li>\n<li>"Татаж авсан аппуудыг"</li>" оруулан бүх өгөгдлийг устгах болно"</string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Та одоогоор дараах акаунтуудаар нэвтэрсэн байна:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Аюулгүй байдлын мэдээлэл"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Танд дата холболт байхгүй байна. Энэ мэдээллийг одоо харахын тулд Интернэтэд холбогдсон дурын компьютерээс %s руу очно уу."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Ачаалж байна..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Нууц үгээ сонгоно уу"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Дэлгэцийн түгжээ тохируулах"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Аюулгүйн үүднээс нууц үг тохируулах"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Хурууны хээ ашиглахын тулд нууц үг тохируулах"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Өөрийн хээг сонгоно уу"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Хурууны хээ ашиглахын тулд загвар тохируулах"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Өөрийн PIN-г сонгоно уу"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Аюулгүйн үүднээс ПИН тохируулах"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Хурууны хээ ашиглахын тулд ПИН тохируулах"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Нууц үгээ баталгаажуулна уу"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Нууц үгээ дахин оруулах"</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_pin_header" msgid="7744513791910572550">"ПИН-ээ дахин оруулах"</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>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Үргэлжлүүлэхийн тулд ажлын зурган түгжээг оруулна уу"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Үргэлжлүүлэхийн тулд ажлын ПИН кодоо оруулна уу"</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">"Үргэлжлүүлэхийн тулд төхөөрөмжийнхөө ПИН-г оруулна уу. Төхөөрөмжийг асаасны дараа шаарддаг."</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">"Үргэлжлүүлэхийн тулд ажлынхаа ПИН-г оруулна уу. Төхөөрөмжийг асаасны дараа шаарддаг."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Үргэлжлүүлэхийн тулд ажлынхаа нууц үгийг оруулна уу. Төхөөрөмжийг асаасны дараа шаарддаг."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Хамгаалалтыг сайжруулахын тулд төхөөрөмжийнхөө зурган түгжээг ашиглана уу"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Хамгаалалтыг сайжруулахын тулд төхөөрөмжийнхөө ПИН-ийг оруулна уу"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Хамгаалалтыг сайжруулахын тулд төхөөрөмжийнхөө нууц үгийг оруулна уу"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Хамгаалалтыг сайжруулахын тулд ажлынхаа зурган түгжээг ашиглана уу"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Хамгаалалтыг сайжруулахын тулд ажлынхаа ПИН-ийг оруулна уу"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Хамгаалалтыг сайжруулахын тулд ажлынхаа нууц үгийг оруулна уу"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Таны утсыг үйлдвэрийн тохиргоонд шинэчилсэн байна. Энэ утсыг ашиглахын тулд өмнөх загвараа оруулна уу."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Таны утсыг үйлдвэрийн тохиргоонд шинэчилсэн байна. Энэ утсыг ашиглахын тулд өмнөх ПИН-ээ оруулна уу."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Таны утсыг үйлдвэрийн тохиргоонд шинэчилсэн байна. Энэ утсыг ашиглахын тулд өмнөх нууц үгээ оруулна уу."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Загварыг баталгаажуулах"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"ПИН баталгаажуулах"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Нууц үг баталгаажуулах"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"ПИН код буруу байна"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Нууц үг буруу байна"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Зурган түгжээ буруу байна"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Виджэт үүсгээд хандалт хийхийг зөвшөөрөх үү?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Таныг виджетийг үүсгэсний дараа <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> үүний харуулах бүх өгөгдөлд хандалт хийж чадна."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>-д виджэт үүсгэж өгөгдөлд нь хандалт хийхийг байнга зөвшөөрөх"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>ө <xliff:g id="HOURS">%2$d</xliff:g>ц <xliff:g id="MINUTES">%3$d</xliff:g>м <xliff:g id="SECONDS">%4$d</xliff:g>с"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>ц <xliff:g id="MINUTES">%2$d</xliff:g>м <xliff:g id="SECONDS">%3$d</xliff:g>с"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>м <xliff:g id="SECONDS">%2$d</xliff:g>с"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>с"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"Ашиглалтын статистик"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Ашиглалтын статистик"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Эрэмбэлэх:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Дэлгэц уншигч, дэлгэц, харилцан үйлдлийн хяналт"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Харааны тохиргоо"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Та энэ төхөөрөмжийг өөрийнхөө шаардлагад нийцүүлэн тохируулах боломжтой. Эдгээр сонголтуудыг дараа нь Тохиргоо хэсэгт өөрчлөх боломжтой."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Фонтын хэмжээг ихэсгэх"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Фонтын хэмжээг өөрчлөх"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Дэлгэц уншигч"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Аудио &amp; дэлгэцийн текст"</string>
     <string name="display_category_title" msgid="685461049938269166">"Дэлгэц"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><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_screen_magnification_navbar_summary" msgid="1996584694050087161">"Томруулах сонголт асаалттай үед хурдан томруулахын тулд дэлгэцийн доор байрлах Хүртээмжийн товчлуурыг ашиглана уу.\n\n"<b>"Томруулахын тулд"</b>" Хүртээмжийн товчлуурыг товшоод, дэлгэцийг дарна уу.\n"<ul><li>"Гүйлгэхийн тулд 2 эсвэл олон хуруугаараа чирнэ үү"</li>\n<li>"Томруулах хэмжээг тохируулахын тулд 2 эсвэл олон хуруугаараа чимхэнэ үү"</li></ul>\n\n<b>"Түр хугацаанд томруулахын тулд"</b>" Хүртээмжийн товчлуурыг товшиж, дэлгэцийг удаан дарна уу.\n"<ul><li>"Дэлгэцийг судлахын тулд чирнэ үү"</li>\n<li>"Жижигрүүлэхийн тулд хуруугаа өргөнө үү"</li></ul>\n\n"Та гар, навигацийн самбарт томруулах боломжгүй."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Хүртээмжийн товчлуурыг <xliff:g id="SERVICE">%1$s</xliff:g> болгож тохируулсан. Томруулахын тулд Хүртээмжийн товчлуурыг удаан дараад, томруулахыг сонгоно уу."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Хандалтын товчилбор"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Дууны түвшний түлхүүрийн товчлол"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Товчлолын үйлчилгээ"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Түгжигдсэн дэлгэцээс зөвшөөрөх"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Товчлолыг асаасан үед хүртээмжийн онцлогийг эхлүүлэхийн тулд дууны ихэсгэх багасгах товчлуурыг 3 секунд дарах боломжтой."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Товчлолыг асаасан үед хүртээмжийн онцлогийг эхлүүлэхийн тулд дууны түвшинг ихэсгэх багасгах товчлуурыг 3 секунд дарах боломжтой."</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">"Дэлгэц томруулахыг автоматаар шинэчлэх"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Апп шилжилт дээр дэлгэц томруулахыг шинэчлэх"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Үзүүлбэрт нөлөөлж болзошгүй"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Заагч хөдлөхөө больсны дараа товшино уу"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Дарахаас өмнө хүлээх"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ИДЭВХТЭЙ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ИДЭВХГҮЙ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Шуурхай Тохиргоонд харуулах"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g>-с <xliff:g id="NUMBER">%1$d</xliff:g> нь сонгосон"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g>-с <xliff:g id="NUMBER">%1$s</xliff:g> нь"</string>
     <string name="select_all" msgid="1562774643280376715">"Бүгдийг сонгох"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Төлөвлөгөөг удирдах"</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>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мобайл сүлжээнүүд"</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_metered_auto" msgid="1262028400911918865">"Автомат"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Хязгаартай"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Хязгааргүй"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Операторын дата хэмжилт таны төхөөрөмжийнхөөс өөр байж болно."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Яаралтай дуудлага"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Дуудлагаруу буцах"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Дуудлагын менежер"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Онцгой байдлын нэвтрүүлэг"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Яаралтай байдлын сэрэмжлүүлэг"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Сүлжээний операторууд"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Хандалтын цэгийн нэрс"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Сайжруулсан 4G LTE горим"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Үндсэн SIM"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Тухай бүрт асуух"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Сонгох шаардлагатай"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"SIM-н сонголт"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Тохиргоо"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">Нуусан %d зүйлийг харуулах</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Aпп мэдэгдлүүд"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Мэдэгдлийн ангилал"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Ач холбогдол"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Апп-р шийдүүлнэ үү"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Дууг зөвшөөрөх"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Мэдэгдлийг хэзээ ч харуулахгүй"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Дуугүй, эсвэл үзэхэд саадгүй"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Дуугүй"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Дуу гаргах"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Дуу гаргаж, дэлгэцэд гэнэт гаргах"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Дэлгэцэд гаргах"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Бага"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Дунд"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Их"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Яаралтай"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Дууг зөвшөөрөх"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Эдгээр мэдэгдлүүдийг одоогийн дэлгэцэд харахдаа дуугүй, чичиргээгүй болон яаралтай гаргаж ирэхгүй болгож тохируулна уу."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Саатлыг зөвшөөрөх"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Апп дуу гаргах, чичиргэх, дэлгэц дээр мэдэгдэл гаргахыг зөвшөөрөх"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Бага ач холбогдолтой"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Дунд зэргийн ач холбогдолтой"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Өндөр ач холбогдолтой"</string>
@@ -2920,7 +2931,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip зураг дотор"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Дэлгэцэн доторх дэлгэц"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Дэлгэцэн доторх дэлгэцийг зөвшөөрөх"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Апп нээлттэй эсвэл таныг энэ апп-с гарсны дараа (жишээ нь видео үргэлжлүүлэн үзэхийн тулд) дэлгэцэн доторх дэлгэцийн цонх үүсгэхийг энэ аппад зөвшөөрнө үү. Энэ цонх нь таны ашиглаж буй бусад апп дээр харагдана."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Апп нээлттэй үед эсвэл таныг энэ аппаас гарсны дараа (жишээ нь видео үргэлжлүүлэн үзэхийн тулд) зураг доторх зургийн цонх үүсгэхийг энэ аппад зөвшөөрнө үү. Энэ цонх нь таны ашиглаж буй бусад аппад харагдана."</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>
@@ -3223,6 +3234,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Файлыг шилжүүлж байна"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Зургийг шилжүүлж байна (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Төхөөрөмжийг MIDI-р ашиглах"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS тусгал үүсгэх"</string>
     <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>
@@ -3365,6 +3377,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="night_display_suggestion_title" msgid="6602129097059325291">"Шөнийн гэрлийн хуваарийг тохируулах"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Улбар шар туяатай дэлгэц таныг унтахад тусална"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Шөнийн гэрэл асаалттай байна"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Дэлгэц улбар шар туяатай байна. Энэ нь таныг унтахад тусална."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Санал зөвлөмж"</string>
@@ -3383,6 +3397,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Илүү хүйтэн дэлгэцийн өнгө ашиглах"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Өнгөний өөрчлөлтийг оруулахын тулд дэлгэцийг унтраана уу"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Утасны хяналтын өөрчлөлтийг хэрэгжүүлэхийн тулд төхөөрөмжийг дахин асаана уу"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Камер HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Камер HAL HDR+ өөрчлөлтийг хэрэгжүүлэхийн тулд төхөөрөмжийг дахин асаана уу"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Камерын лазер мэдрэгч"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Системийн автомат шинэчлэлтүүд"</string>
     <string name="usage" msgid="2977875522080448986">"Хэрэглээ"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Мобайл дата ашиглалт"</string>
@@ -3408,7 +3425,7 @@
     <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="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g>-д <xliff:g id="ID_1">%1$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">
@@ -3477,7 +3494,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Арчаад, хөрвүүлэх"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager үнэлгээ хязгаарлалтыг дахин тохируулах"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager үнэлгээ хязгаарлалтыг дахин тохируулсан"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Дэлгэцийн түгжээний мэдэгдлийг хянах"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Түгжигдсэн дэлгэцийн мэдээллийг хянах"</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="8483187649355540109">"Дэмжлэг &amp; зөвлөгөө"</string>
@@ -3485,7 +3502,7 @@
     <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="2456198532288640046">"Бусад төхөөрөмжид боломжгүй"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Идэвхгүй"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g>-д холбогдсон"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Олон төхөөрөмжтэй холбогдсон"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Системийн UI демо горим"</string>
@@ -3587,7 +3604,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Шуурхай апп"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Аппыг суулгаагүй байсан ч холбоосыг апп-д нээх"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Шуурхай апп"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Шуурхай аппын бүртгэл"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Шуурхай аппын сонголт"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Суулгасан апп"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Таны санг одоо сангийн менежер удирдаж байна"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g>-н бүртгэл"</string>
@@ -3634,7 +3651,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Тогтмол асаалттай VPN-г таны хувийн профайлд асаасан"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Тогтмол асаалттай VPN-г таны амжлын профайлд асаасан"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Дэлхий нийтийн HTTP прокси тохиргоо"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Итгэмжилсэн үнэмлэх"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Итгэмжит мандат үнэмлэх"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Таны хувийн профайлд суулгасан итгэмжит мандат үнэмлэх"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Таны ажлын профайлд суулгасан итгэмжит мандат үнэмлэх"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Хамгийн багадаа <xliff:g id="COUNT_1">%d</xliff:g> CA сертификат</item>
       <item quantity="one">Хамгийн багадаа <xliff:g id="COUNT_0">%d</xliff:g> CA сертификат</item>
@@ -3697,7 +3716,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Оператор компанийн хангалтын мэдээлэл"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Оператор компанийн хангалтыг асаах"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Шинэ соргог зүйл юу байна?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Шилдэг 5 онцлогийг харна уу"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Шинэ утастай танилцах"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Шинэ таблеттай танилцах"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Шинэ төхөөрөмжтэй танилцах"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Энэ онцлог энэ төхөөрөмжид боломжгүй"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS бүртгэлийн байдал"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Бүртгэсэн"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Бүртгээгүй"</string>
diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml
index b6b08ae..ee425e8 100644
--- a/res/values-mr/arrays.xml
+++ b/res/values-mr/arrays.xml
@@ -358,7 +358,7 @@
     <item msgid="8571369610363539266">"फोन स्थिती वाचा"</item>
     <item msgid="4542463358215230845">"व्हॉइसमेल जोडा"</item>
     <item msgid="864565065016166003">"सिप वापरा"</item>
-    <item msgid="1958009349883195116">"केल्या जाणार्‍या कॉलवर प्रक्रिया करीत आहे"</item>
+    <item msgid="1958009349883195116">"केल्या जाणार्‍या कॉलवर प्रक्रिया करत आहे"</item>
     <item msgid="8526563410140613458">"फिंगरप्रिंट"</item>
     <item msgid="7864822459293570891">"शरीर सेन्सर"</item>
     <item msgid="6798698496904810960">"सेल ब्रॉडकास्ट वाचा"</item>
@@ -426,7 +426,7 @@
   <string-array name="vpn_states">
     <item msgid="8621078286418985762">"डिस्कनेक्ट केले"</item>
     <item msgid="6692305604213080515">"प्रारंभ करत आहे…"</item>
-    <item msgid="8001704909356800092">"कनेक्ट करीत आहे..."</item>
+    <item msgid="8001704909356800092">"कनेक्ट करत आहे..."</item>
     <item msgid="4039737283841672166">"कनेक्ट केले"</item>
     <item msgid="4042143101664725090">"टाइमआउट"</item>
     <item msgid="7664124146786465092">"अयशस्वी"</item>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index ab76c1b..f208fd9 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -64,7 +64,7 @@
     <string name="radioInfo_phone_ringing" msgid="4883724645684297895">"रिंग जात आहे"</string>
     <string name="radioInfo_phone_offhook" msgid="5873835692449118954">"कॉल प्रगतीवर आहे"</string>
     <string name="radioInfo_data_disconnected" msgid="1959735267890719418">"डिस्कनेक्ट केले"</string>
-    <string name="radioInfo_data_connecting" msgid="8404571440697917823">"कनेक्ट करीत आहे"</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>
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ला आपल्या संदेशामध्ये प्रवेश करण्याची आवश्यकता आहे. %2$s ला प्रवेश करण्याची अनुमती द्यायची?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"सिम प्रवेश विनंती"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> आपल्या सिम कार्डवर प्रवेश करू इच्छित आहे. सिम कार्डवर प्रवेश मंजूर केल्यामुळे कनेक्शनच्या कालावधीसाठी आपल्या डिव्हाइसवरील डेटा कनेक्टिव्हिटी अक्षम होईल. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> वर प्रवेश द्या"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"अन्‍य डिव्‍हाइसला \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' म्‍हणून दिसत आहे"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"इतर डिव्‍हाइसना \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' म्‍हणून दिसत आहे"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"तुमचे डिव्हाइस"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"नवीन डिव्हाइस जोडा"</string>
     <string name="date_and_time" msgid="9062980487860757694">"तारीख आणि वेळ"</string>
@@ -198,7 +198,7 @@
     <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_dcrtinfo_label" msgid="4062076024399431876">"डेटा कनेक्शन रीअल-टाइम माहिती:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"डेटा सेवा:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"रोमिंग:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"पुढील"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"फिंगरप्रिंट वगळायचे?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"फिंगरप्रिंट सेटअप केवळ एक किंवा दोन मिनिटे घेतो. तुम्ही हे वगळल्यास, तुम्ही नंतर सेटिंग्जमध्ये तुमचे फिंगरप्रिंट जोडू शकता."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"स्क्रीन लॉक वगळायचे?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"डिव्हाइस संरक्षण वैशिष्ट्ये चालू होणार नाहीत. हा टॅब्लेट हरवल्यास, चोरी झाल्यास किंवा रीसेट केल्यास तुम्ही इतरांना तो वापरण्यापासून प्रतिबंधित करू शकणार नाही."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"डिव्हाइस संरक्षण वैशिष्ट्ये सुरू होणार नाहीत. हे डिव्हाइस हरवल्यास, चोरी झाल्यास किंवा रीसेट केल्यास तुम्ही इतरांना तो वापरण्यापासून प्रतिबंधित करू शकणार नाही."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"डिव्हाइस संरक्षण वैशिष्ट्ये सुरू होणार नाहीत. हा फोन हरवल्यास, चोरी झाल्यास किंवा रीसेट केल्यास तुम्ही इतरांना तो वापरण्यापासून प्रतिबंधित करू शकणार नाही."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"आपण जास्तीत जास्त फिंगरप्रिंट जोडले आहेत"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"आणखी फिंगरप्रिंट जोडू शकत नाही"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"सर्व फिंगरप्रिंट काढायचे?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' काढा"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"तुम्हाला ही फिंगरप्रिंट हटवायची आहे का?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"आपण आपले फिंगरप्रिंट आपला फोन अनलॉक करण्‍यासाठी, खरेद्या प्रमाणित करण्‍यासाठी किंवा त्यांच्यासह अॅप्समध्‍ये साइन इन करण्‍यासाठी वापरू शकणार नाही"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"आपण आपले फिंगरप्रिंट आपले कार्य प्रोफाइल अनलॉक करण्‍यासाठी, खरेद्या प्रमाणित करण्‍यासाठी किंवा कार्य अॅप्समध्‍ये साइन इन करण्‍यासाठी वापरू शकणार नाही"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"होय, काढा"</string>
@@ -419,14 +424,14 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"टॅबलेट एंक्रिप्ट करा"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"फोन एंक्रिप्ट करा"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"एंक्रिप्ट केले"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"तुम्ही तुमची खाती, सेटिंग्ज, डाउनलोड केलेले अ‍ॅप्स आणि त्यांचा डेटा, मीडिया आणि इतर फायली एंक्रिप्ट करू शकता. तुम्ही आपला टॅब्लेट एंक्रिप्ट केल्यानंतर, तुम्ही स्क्रीन लॉक (म्हणजे, एक पॅटर्न किंवा अंकीय पिन किंवा संकेतशब्द) सेट केला आहे हे गृहित धरून, प्रत्येकवेळी तुम्ही टॅब्लेट चालू करता तेव्हा त्याचे एंक्रिप्ट करण्‍यासाठी आपल्‍याला स्क्रीन अनलॉक करण्‍याची आवश्यकता असेल. एंक्रिप्ट करण्‍याचा अन्य एकमेव मार्ग आपला सर्व डेटा मिटवून, फॅक्‍टरी डेटा रीसेट करणे हा होय.\n\nएंक्रिप्शनला एक तास किंवा अधिक वेळ लागू शकतो. तुम्ही संपूर्ण प्रक्रियेत चार्ज केलेल्या बॅटरीसह प्रारंभ करणे आणि आपला टॅब्लेट प्लग इन केलेला ठेवणे आवश्यक आहे. तुम्ही त्यात व्यत्यय आणल्यास, तुम्ही आपला काही किंवा सर्व डेटा गमवाल."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"तुम्ही तुमची खाती, सेटिंग्ज, डाउनलोड केलेली अ‍ॅप्स आणि त्यांचा डेटा, मीडिया आणि इतर फायली एंक्रिप्ट करू शकता. तुम्ही आपला फोन एंक्रिप्ट केल्यानंतर, तुम्ही स्क्रीन लॉक (म्हणजे, एक पॅटर्न किंवा अंकीय पिन किंवा संकेतशब्द) सेट केला आहे हे गृहित धरून, प्रत्येकवेळी तुम्ही फोन चालू करता तेव्हा त्याचे एंक्रिप्ट करण्‍यासाठी आपल्‍याला स्क्रीन अनलॉक करण्‍याची आवश्यकता असेल. एंक्रिप्ट करण्‍याचा अन्य एकमेव मार्ग आपला सर्व डेटा मिटवून, फॅक्‍टरी डेटा रीसेट करणे हा होय.\n\nएंक्रिप्टीकरणास एक तास किंवा अधिक वेळ लागू शकतो. तुम्ही संपूर्ण प्रक्रियेत चार्ज केलेल्या बॅटरीसह प्रारंभ करणे आणि आपला फोन प्लग इन केलेला ठेवणे आवश्यक आहे. तुम्ही त्यात व्यत्यय आणल्यास, तुम्ही आपला काही किंवा सर्व डेटा गमवाल."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"तुम्ही तुमची खाती, सेटिंग्ज, डाउनलोड केलेले अ‍ॅप्स आणि त्यांचा डेटा, मीडिया आणि इतर फायली एंक्रिप्ट करू शकता. तुम्ही आपला टॅब्लेट एंक्रिप्ट केल्यानंतर, तुम्ही स्क्रीन लॉक (म्हणजे, एक पॅटर्न किंवा अंकीय पिन किंवा पासवर्ड) सेट केला आहे हे गृहित धरून, प्रत्येकवेळी तुम्ही टॅब्लेट चालू करता तेव्हा त्याचे एंक्रिप्ट करण्‍यासाठी आपल्‍याला स्क्रीन अनलॉक करण्‍याची आवश्यकता असेल. एंक्रिप्ट करण्‍याचा अन्य एकमेव मार्ग आपला सर्व डेटा मिटवून, फॅक्‍टरी डेटा रीसेट करणे हा होय.\n\nएंक्रिप्शनला एक तास किंवा अधिक वेळ लागू शकतो. तुम्ही संपूर्ण प्रक्रियेत चार्ज केलेल्या बॅटरीसह प्रारंभ करणे आणि आपला टॅब्लेट प्लग इन केलेला ठेवणे आवश्यक आहे. तुम्ही त्यात व्यत्यय आणल्यास, तुम्ही आपला काही किंवा सर्व डेटा गमवाल."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"तुम्ही तुमची खाती, सेटिंग्ज, डाउनलोड केलेली अ‍ॅप्स आणि त्यांचा डेटा, मीडिया आणि इतर फायली एंक्रिप्ट करू शकता. तुम्ही आपला फोन एंक्रिप्ट केल्यानंतर, तुम्ही स्क्रीन लॉक (म्हणजे, एक पॅटर्न किंवा अंकीय पिन किंवा पासवर्ड) सेट केला आहे हे गृहित धरून, प्रत्येकवेळी तुम्ही फोन चालू करता तेव्हा त्याचे एंक्रिप्ट करण्‍यासाठी आपल्‍याला स्क्रीन अनलॉक करण्‍याची आवश्यकता असेल. एंक्रिप्ट करण्‍याचा अन्य एकमेव मार्ग आपला सर्व डेटा मिटवून, फॅक्‍टरी डेटा रीसेट करणे हा होय.\n\nएंक्रिप्टीकरणास एक तास किंवा अधिक वेळ लागू शकतो. तुम्ही संपूर्ण प्रक्रियेत चार्ज केलेल्या बॅटरीसह प्रारंभ करणे आणि आपला फोन प्लग इन केलेला ठेवणे आवश्यक आहे. तुम्ही त्यात व्यत्यय आणल्यास, तुम्ही आपला काही किंवा सर्व डेटा गमवाल."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"टॅबलेट एंक्रिप्ट करा"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"फोन एंक्रिप्ट करा"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"आपली बॅटरी चार्ज करा आणि पुन्हा प्रयत्न करा."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"आपला चार्जर प्लग इन करा आणि पुन्हा प्रयत्न करा."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"कोणताही लॉक स्क्रीन पिन किंवा संकेतशब्द नाही"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"आपण एनक्रिप्शन सुरु करण्यापूर्वी आपल्याला एक लॉक स्क्रीन पिन ‍किंवा संकेतशब्द सेट करण्याची आवश्यकता आहे."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"कोणताही लॉक स्क्रीन पिन किंवा पासवर्ड नाही"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"आपण एनक्रिप्शन सुरु करण्यापूर्वी आपल्याला एक लॉक स्क्रीन पिन ‍किंवा पासवर्ड सेट करण्याची आवश्यकता आहे."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"एंक्रिप्ट करायचे?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"एंक्रिप्शन कार्य परत न करता येणारे आहे आणि आपण त्यात व्यत्यय आणल्यास, आपला डेटा गमावेल. एंक्रिप्शनला एखादा तास किंवा जास्त वेळ लागतो, यादरम्यान टॅबलेट कित्येक वेळा रीस्टार्ट होईल."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"एंक्रिप्शन कार्य परत न करता येणारे आहे आणि आपण त्यात व्यत्यय आणल्यास, आपला डेटा गमावेल. एंक्रिप्शनला एखादा तास किंवा जास्त वेळ लागतो, यादरम्यान फोन कित्येक वेळा रीस्टार्ट होईल."</string>
@@ -438,7 +443,7 @@
     <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"आपला टॅबलेट अनलॉक करण्‍यासाठी, तो बंद करा आणि नंतर चालू करा."</string>
     <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"आपला फोन अनलॉक करण्‍यासाठी, तो बंद करा आणि नंतर चालू करा."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"चेतावणी: अनलॉक करण्‍याच्या आणखी <xliff:g id="COUNT">^1</xliff:g> अयशस्‍वी प्रयत्नांनंतर तुमचे डिव्हाइस पुसले जाईल."</string>
-    <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"आपला संकेतशब्द टाइप करा"</string>
+    <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"आपला पासवर्ड टाइप करा"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"एंक्रिप्शन अयशस्वी"</string>
     <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"कूटबद्धीकरणात व्यत्यय आला आणि हे पूर्ण होऊ शकत नाही. परिणामस्वरूप, आपल्या टॅबलेटवरील डेटा यापुढे प्रवेशयोग्य राहणार नाही. \n\n आपला टॅबलेट वापरून पुन्हा सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करण्याची आवश्यकता आहे. रीसेट केल्यानंतर आपण आपला टॅबलेट सेट करता, तेव्हा आपल्याकडे आपल्या Google खात्यावर बॅकअप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
     <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"कूटबद्धीकरणात व्यत्यय आला आणि पूर्ण होऊ शकत नाही. परिणामस्वरूप, आपल्या फोनवरील डेटा यापुढे प्रवेशयोग्य नाही.\n\nआपला फोन वापरणे पुन्हा सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करण्याची आवश्यकता आहे. रीसेट केल्यानंतर जेव्हा आपण आपला फोन सेट करता, तेव्हा आपल्याकडे आपल्या Google खात्यावर बॅकअप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"अतिरिक्त सुरक्षिततेसाठी, बॅकअप स्क्रीन लॉक सेट करा."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"अतिरिक्त सुरक्षिततेसाठी, बॅकअप स्क्रीन लॉक सेट करा."</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>
@@ -467,7 +472,7 @@
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / निष्क्रिय झाल्याच्या <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> नंतर"</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">"पॅटर्न, पिन वा संकेतशब्द सुरक्षा बदला किंवा अक्षम करा"</string>
+    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"पॅटर्न, पिन वा पासवर्ड सुरक्षा बदला किंवा अक्षम करा"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"स्क्रीन लॉक करण्यासाठी एक पद्धत निवडा"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"काहीही नाही"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
@@ -477,13 +482,13 @@
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"मध्यम सुरक्षा"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"पिन"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"मध्यम ते उच्च सुरक्षा"</string>
-    <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"संकेतशब्द"</string>
+    <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"पासवर्ड"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"उच्च सुरक्षितता"</string>
     <string name="unlock_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="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"फिंगरप्रिंट + पिन"</string>
-    <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"फिंगरप्रिंट + संकेतशब्द"</string>
+    <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"फिंगरप्रिंट + पासवर्ड"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="1441077909803666681">"फिंगरप्रिंट न वापरता सुरु ठेवा"</string>
     <string name="fingerprint_unlock_title" msgid="2826226740306003991">"आपण आपल्या फिंगरप्रिंटचा वापर करून आपला फोन अनलॉक करू शकता. सुरक्षिततेसाठी, या पर्यायाकरिता एक बॅक अप स्क्रीन लॉक आवश्यक आहे."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"प्रशासक, कूटबद्धीकरण धोरण किंवा क्रेडेन्शियल संचयनाद्वारे अक्षम केलेले"</string>
@@ -491,47 +496,47 @@
     <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_pin" msgid="3541326261341386690">"पिन"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"संकेतशब्द"</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_fingerprint" msgid="8212242533942400457">"तुमच्या नमून्याशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"तुमच्या नमुन्याशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>तुमचे सेव्ह केलेले फिंगरप्रिंट देखील या डि‍व्हाइसवरून दूर केले जातील आणि तुम्ही तुमचा फोन अनलॉक करण्यास, खरेदींना अधिकृत करण्यास किंवा त्यांच्यासह अॅप्समध्ये साइन इन करण्यास सक्षम राहणार नाही.\""</string>
+</xliff:g>तुमचे सेव्ह केलेले फिंगरप्रिंट देखील या डि‍व्हाइसवरून दूर केले जातील आणि तुम्ही तुमचा फोन अनलॉक करण्यास, खरेदींना अधिकृत करण्यास किंवा त्यांच्यासह अॅप्समध्ये साइन इन करण्यास सक्षम राहणार नाही."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"तुमच्या पिनशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"तुमच्या पिनशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"तुमच्या पिनशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>तुमचे सेव्ह केलेले फिंगरप्रिंट देखील या डिव्हाइसवरून दूर केले जातील आणि तुम्ही तुमचा फोन अनलॉक करण्यास, खरेदींना अधिकृत करण्यास किंवा त्यांच्यासह अॅप्समध्ये साइन इन करण्यास सक्षम राहणार नाही.\""</string>
+</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या डिव्हाइस मधून काढल्या जातील आणि तुम्ही तुमचा फोन अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून अॅप्समध्ये साइन इन करू शकणार नाही."</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"तुमच्या पासवर्डशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>तुमचे सेव्ह केलेले फिंगरप्रिंट देखील या डि‍व्हाइसवरून दूर केले जातील आणि तुम्ही तुमचा फोन अनलॉक करण्यास, खरेदींना अधिकृत करण्यास किंवा त्यांच्यासह अॅप्समध्ये साइन इन करण्यास सक्षम राहणार नाही.\""</string>
+</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या डिव्हाइस मधून काढल्या जातील आणि तुम्ही तुमचा फोन अनलॉक करू शकणार नाही, खरेदींना अधिकृत करू शकणार नाही किंवा त्या वापरून अॅप्समध्ये साइन इन करू शकणार नाही."</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"तुमच्या स्क्रीन लॉकशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>तुमचे सेव्ह केलेले फिंगरप्रिंट देखील या डि‍व्हाइसवरून दूर केले जातील आणि तुम्ही तुमचा फोन अनलॉक करण्यास, खरेदींना अधिकृत करण्यास किंवा त्यांच्यासह अॅप्समध्ये साइन इन करण्यास सक्षम राहणार नाही.\""</string>
+</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या डिव्हाइस मधून काढल्या जातील आणि तुम्ही तुमचा फोन अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून अॅप्समध्ये साइन इन करू शकणार नाही."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"आपल्या नमुन्याशिवाय प्रोफाईल संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"आपल्या नमुन्याशिवाय प्रोफाईल संरक्षण वैशिष्ट्ये कार्य करणार नाहीत.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"तुमच्या नमुन्याशिवाय प्रोफाइल संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>आपले जतन केलेले फिंगरप्रिंट देखील या प्रोफाईल मधून काढले जातील आणि आपण आपले प्रोफाईल अनलॉक करण्यात, खरेदींना अधिकृत करण्यात किंवा त्यांच्यासह अॅप्समध्ये साइन इन करण्यात सक्षम असणार नाही.\""</string>
+</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या प्रोफाइलमधून काढल्या जातील आणि तुम्ही तुमची प्रोफाइल अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून अॅप्समध्ये साइन इन करू शकणार नाही."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"आपल्या पिनशिवाय प्रोफाईल संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"आपल्या पिनशिवाय प्रोफाईल संरक्षण वैशिष्ट्ये कार्य करणार नाहीत.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"तुमच्या पिनशिवाय प्रोफाइल संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>आपले जतन केलेले फिंगरप्रिंट देखील या प्रोफाईल मधून काढले जातील आणि आपण आपले प्रोफाईल अनलॉक करण्यात, खरेदींना अधिकृत करण्यात किंवा त्यांच्यासह अॅप्समध्ये साइन इन करण्यात सक्षम असणार नाही.\""</string>
+</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या प्रोफाइलमधून काढल्या जातील आणि तुम्ही तुमची प्रोफाइल अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून अॅप्समध्ये साइन इन करू शकणार नाही."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"आपल्या संकेतशब्दाशिवाय प्रोफाईल संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"आपल्या संकेतशब्दाशिवाय प्रोफाईल संरक्षण वैशिष्ट्ये कार्य करणार नाहीत.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"तुमच्या पासवर्डशिवाय प्रोफाइल संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>आपले जतन केलेले फिंगरप्रिंट देखील या प्रोफाईल मधून काढले जातील आणि आपण आपले प्रोफाईल अनलॉक करण्यात, खरेदींना अधिकृत करण्यात किंवा त्यांच्यासह अॅप्समध्ये साइन इन करण्यात सक्षम असणार नाही.\""</string>
+</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या प्रोफाइलमधून काढल्या जातील आणि तुम्ही तुमची प्रोफाइल अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून अॅप्समध्ये साइन इन करू शकणार नाही."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"आपल्या स्क्रीनलॉक शिवाय प्रोफाईल संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"आपल्या स्क्रीन लॉक शिवाय प्रोफाईल संरक्षण वैशिष्ट्ये कार्य करणार नाहीत.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"तुमच्या स्क्रीन लॉकशिवाय प्रोफाइल संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>आपले जतन केलेले फिंगरप्रिंट देखील या प्रोफाईल मधून काढले जातील आणि आपण आपले प्रोफाईल अनलॉक करण्यात, खरेदींना अधिकृत करण्यात किंवा त्यांच्यासह अॅप्समध्ये साइन इन करण्यात सक्षम असणार नाही.\""</string>
+</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या प्रोफाइलमधून काढल्या जातील आणि तुम्ही तुमची प्रोफाइल अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून अॅप्समध्ये साइन इन करू शकणार नाही."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"होय, काढा"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"अनलॉक पॅटर्न बदला"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"अनलॉक पिन बदला"</string>
-    <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"संकेतशब्द अनलॉक करा बदला"</string>
+    <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"पासवर्ड अनलॉक करा बदला"</string>
     <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"पुन्हा प्रयत्न करा. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> पैकी <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> प्रयत्न."</string>
     <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"तुमचा डेटा हटवला जाईल"</string>
     <string name="lock_last_pattern_attempt_before_wipe_device" msgid="1688030823464420974">"तुम्‍ही पुढच्‍या प्रयत्‍नात एखादा चुकीचा पॅटर्न टाकल्‍यास, या डिव्‍हाइसचा डेटा हटवला जाईल"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"अंकांच्या चढत्या, उतरत्या किंवा पुनरावृत्त क्रमाला अनुमती नाही"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ठीक"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"रद्द करा"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"साफ करा"</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>
@@ -678,7 +684,7 @@
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"कास्‍ट करा"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"वायरलेस डिस्प्ले सुरू करा"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"कोणतीही जवळपासची डिव्हाइसेस आढळली नाहीत."</string>
-    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"कनेक्ट करीत आहे"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"कनेक्ट करत आहे"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"कनेक्ट केले"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"वापरात आहे"</string>
     <string name="wifi_display_status_not_available" msgid="5714978725794210102">"अनुपलब्ध"</string>
@@ -768,7 +774,7 @@
     <string name="wifi_advanced_toggle_description_expanded" msgid="2380600578544493084">"ड्रॉप-डाउन सूची प्रगत पर्याय. संकुचित करण्‍यासाठी दोनदा-टॅप करा."</string>
     <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"ड्रॉप-डाउन सूची प्रगत पर्याय. विस्तृत करण्‍यासाठी दोनदा-टॅप करा."</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"वाय-फाय संरक्षित सेटअप"</string>
-    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS प्रारंभ करीत आहे…"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS प्रारंभ करत आहे…"</string>
     <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"तुमच्या राउटरवरील वाय‑फाय संरक्षित सेटअप बटण दाबा. त्यास \"WPS\" म्हटले जाऊ शकते किंवा या चिन्हाने चिन्हांकित केले जाऊ शकते:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"तुमच्या Wi‑Fi राउटरवर पिन <xliff:g id="NUMBER">%1$s</xliff:g> एंटर करा. सेटअप पूर्ण होण्यास दोन मिनिटे वेळ लागू शकतो."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS यशस्वी झाले. नेटवर्कशी कनेक्ट करत आहे..."</string>
@@ -781,14 +787,14 @@
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"दुसरे WPS सत्र सापडले होते. कृपया काही मिनिटांमध्ये पुन्हा प्रयत्न करा."</string>
     <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"वाय-फाय डिस्‍केनक्‍ट केले. WPS सेटअप रद्द झाले."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"नेटवर्क नाव"</string>
-    <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID प्रविष्ट करा"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID एंटर करा"</string>
     <string name="wifi_security" msgid="6603611185592956936">"सुरक्षितता"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"सिग्नल सामर्थ्य"</string>
     <string name="wifi_status" msgid="4824568012414605414">"स्थिती"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"लिंक गती"</string>
     <string name="wifi_frequency" msgid="7791090119577812214">"वारंवारता"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP पत्ता"</string>
-    <string name="passpoint_label" msgid="6381371313076009926">"द्वारे जतन केले"</string>
+    <string name="passpoint_label" msgid="6381371313076009926">"द्वारे सेव्ह केले"</string>
     <string name="passpoint_content" msgid="8447207162397870483">"<xliff:g id="NAME">%1$s</xliff:g> क्रेडेंशियल"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP पद्धत"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"टप्पा 2 प्रमाणीकरण"</string>
@@ -797,8 +803,8 @@
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"वापरकर्ता प्रमाणपत्र"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"ओळख"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"अनामित ओळख"</string>
-    <string name="wifi_password" msgid="5948219759936151048">"संकेतशब्द"</string>
-    <string name="wifi_show_password" msgid="6461249871236968884">"संकेतशब्द दर्शवा"</string>
+    <string name="wifi_password" msgid="5948219759936151048">"पासवर्ड"</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"पासवर्ड दर्शवा"</string>
     <string name="wifi_ap_band_config" msgid="1611826705989117930">"AP बँड निवडा"</string>
     <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz बँड"</string>
     <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz बँड"</string>
@@ -815,7 +821,9 @@
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"एक डोमेन निर्दिष्ट करणे आवश्यक आहे."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS उपलब्ध"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS उपलब्ध)"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"आपला नेटवर्क संकेतशब्द प्रविष्ट करा"</string>
+    <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"आपला नेटवर्क पासवर्ड एंटर करा"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"वाहक वाय-फाय नेटवर्क"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> ने कनेक्ट करा"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"स्थान अचूकता सुधारण्यासाठी आणि इतर हेतूंसाठी, <xliff:g id="APP_NAME">%1$s</xliff:g> ला नेटवर्क स्कॅनिंग चालू करण्याची आवश्यकता आहे, वाय-फाय बंद असताना देखील.\n\nस्कॅन करू इच्छित सर्व अॅप्सना अनुमती द्यायची?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"हे बंद करण्यासाठी, ओव्हरफ्लो मेनू मधील प्रगत वर जा."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"अनुमती द्या"</string>
@@ -826,13 +834,14 @@
     <string name="no_internet_access_text" msgid="7133561752896706392">"या नेटवर्कवर इंटरनेट अॅक्सेस नाही. कनेक्‍ट केलेले राहायचे?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"या नेटर्वकसाठी पुन्हा विचारू नका"</string>
     <string name="lost_internet_access_title" msgid="6228530645663584505">"वाय-फाय इंटरनेटशी कनेक्ट केलेले नाही"</string>
-    <string name="lost_internet_access_text" msgid="9029649339816197345">"वाय-फायचे कनेक्शन खराब असताना तुम्ही मोबाइल नेटवर्कवर स्विच करू शकता. डेटा वापर शुल्क लागू होऊ शकतात."</string>
+    <string name="lost_internet_access_text" msgid="9029649339816197345">"वाय-फायचे कनेक्शन खराब असताना तुम्ही मोबाइल नेटवर्कवर स्विच करू शकता. डेटा वापर शुल्क लागू होऊ शकते."</string>
     <string name="lost_internet_access_switch" msgid="2262459569601190039">"मोबाइलवर स्विच करा"</string>
     <string name="lost_internet_access_cancel" msgid="338273139419871110">"वाय‑फाय वर सुरु ठेवा"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"पुन्हा कधीही दर्शवू नका"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"कनेक्ट करा"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"नेटवर्कशी कनेक्‍ट करण्‍यात अयशस्वी"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"विसरा"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"बदल करा"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"नेटवर्क विसरण्यात अयशस्वी"</string>
     <string name="wifi_save" msgid="3331121567988522826">"सेव्ह करा"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"नेटवर्क जतन करण्यात अयशस्वी"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"प्रगत वाय-फाय"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC पत्ता"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP पत्ता"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"नेटवर्क माहिती"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"सबनेट मास्क"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 पत्‍ते"</string>
@@ -877,21 +887,20 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"आमंत्रण रद्द करायचे?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"आपण <xliff:g id="PEER_NAME">%1$s</xliff:g> सह कनेक्ट होण्याचे आमंत्रण रद्द करु इच्छिता?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"हा समूह विसरायचा?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"पोर्टेबल वाय-फाय हॉटस्पॉट"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"वाय-फाय हॉटस्पॉट"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"इंटरनेट किंवा आशय इतर डिव्हाइससोबत शेअर करत नाही"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"या टॅबलेटचे इंटरनेट कनेक्शन हॉटस्पॉटने शेअर करत आहे"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"या फोनचे इंटरनेट कनेक्शन हॉटस्पॉटने शेअर करत आहे"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"अ‍ॅप आशय शेअर करत आहे. इंटरनेट कनेक्शन शेअर करण्यासाठी, हॉटस्‍पॉट बंद करा, नंतर चालू करा"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"वाय-फायचे नाव"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"हॉटस्पॉट नाव"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> चालू करत आहे..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"इतर डिव्हाइस <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>शी कनेक्ट होऊ शकतात"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"वाय-फाय पासवर्ड"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"हॉटस्पॉट पासवर्ड"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP Band"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"तुमच्या इतर डीव्हाइससाठी वाय-फाय नेटवर्क तयार करण्यासाठी हॉटस्पॉटचा वापर करा. हॉटस्पॉट हे तुमच्या मोबाइल डेटा कनेक्शनमधून इंटरनेट पुरवते. अतिरिक्त मोबाइल डेटा शुल्क लागू होऊ शकते."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"जवळपासच्या डिव्हाइससोबत आशय शेअर करण्यासाठी अ‍ॅप्स हॉटस्पॉट तयार करू शकतात."</string>
-    <string name="wifi_tether_starting" msgid="1322237938998639724">"हॉटस्पॉट चालू करीत आहे…"</string>
-    <string name="wifi_tether_stopping" msgid="4835852171686388107">"हॉटस्पॉट बंद करीत आहे…"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"हॉटस्पॉट चालू करत आहे…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"हॉटस्पॉट बंद करत आहे…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> सक्रिय आहे"</string>
     <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"पोर्टेबल वाय-फाय हॉटस्पॉट एरर"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"वाय-फाय हॉटस्पॉट सेट करा"</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"वाय-फाय कॉलिंग चालू असताना, आपला फोन तुमच्या प्राधान्यावर आणि कोणता सिग्नल मजबूत आहे याच्या आधारावर, वाय-फाय नेटवर्क किंवा तुमच्या वाहकाच्या नेटवर्कद्वारे कॉल राउट करू शकतो. हे वैशिष्ट्य चालू करण्यापूर्वी, फी आणि इतर तपशीलांच्या संबंधात तुमच्या वाहकास विचारा."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"आणीबाणी पत्ता अपडेट करा"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"वायफाय वापरून आपण 911 वर कॉल केल्यास आपले स्थान म्हणून आणीबाणी सेवांनी वापरलेला पत्ता"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"तुम्ही वाय-फायवरून एखादा आपात्कालीन कॉल केल्यास तुमचे स्थान म्हणून आपात्कालीन सेवा तुमचा वापरत असलेला पत्ता"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"डिस्प्ले"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ध्वनी"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"आवाज"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"शोध"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"शोध सेटिंग्ज आणि इतिहास व्यवस्थापित करा"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"कोणतेही परिणाम नाहीत"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"इतिहास साफ करा"</string>
     <string name="display_settings" msgid="7965901687241669598">"डिस्प्ले"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"स्वयं-फिरणारी स्क्रीन"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"गडद रंग"</string>
@@ -1148,7 +1158,7 @@
     <string name="status_operator" msgid="2274875196954742087">"नेटवर्क"</string>
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"वाय-फाय MAC पत्ता"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"ब्लूटूथ पत्ता"</string>
-    <string name="status_serial_number" msgid="2257111183374628137">"सीरीअल नंबर"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"सिरीअल नंबर"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"अनुपलब्ध"</string>
     <string name="status_up_time" msgid="7294859476816760399">"चालू असल्याचा कालावधी"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"सक्रिय वेळ"</string>
@@ -1249,7 +1259,7 @@
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> एक्सप्लोर करा"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"इतर गोष्टींमध्ये अ‍ॅप्सद्वारे सेव्ह केलेल्या शेअर केलेल्या फायली, इंटरनेट किंवा ब्लूटूथ वरून डाउनलोड केलेल्या फायली, Android फायली आणि इत्यादीचा समावेश होतो. \n\n<xliff:g id="NAME">^1</xliff:g> चा दृश्यमान अाशय पाहण्यासाठी, एक्सप्लोर करा टॅप करा."</string>
     <string name="storage_detail_dialog_system" msgid="862835644848361569">"सिस्टममध्ये अशा फायली आहेत ज्यांचा वापर Android आवृत्ती <xliff:g id="VERSION">%s</xliff:g> चालवण्यासाठी केला जातो"</string>
-    <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<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_detail_dialog_user" msgid="3267254783294197804">"<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>
     <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"डिव्‍हाइसेस मध्‍ये फोटो आणि इतर मीडिया हलविण्‍यासाठी."</string>
@@ -1260,7 +1270,7 @@
     <string name="storage_wizard_format_confirm_public_title" msgid="4905690038882041566">"पोर्टेबल संचयन म्हणून फॉर्मेट करा"</string>
     <string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"यास <xliff:g id="NAME_0">^1</xliff:g> फॉर्मेट करणे आवश्यक आहे. \n\n"<b>"फॉर्मेट केल्यामुळे <xliff:g id="NAME_1">^1</xliff:g> वर सध्या संचयित केलेला सर्व डेटा मिटविला जातो."</b>" डेटा गमावला जाणे टाळण्यासाठी, त्याचा बॅकअप घेण्याचा विचार करा."</string>
     <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"मिटवा आणि फॉर्मेट करा"</string>
-    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> फॉर्मेट करीत आहे…"</string>
+    <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> फॉर्मेट करत आहे…"</string>
     <string name="storage_wizard_format_progress_body" msgid="4445041233802828430">"फॉर्मेट करताना <xliff:g id="NAME">^1</xliff:g> काढू नका."</string>
     <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"डेटा नवीन संचयनावर हलवा"</string>
     <string name="storage_wizard_migrate_body" msgid="890751699549542345">"या नवीन <xliff:g id="NAME">^1</xliff:g> वर आपण आपले फोटो, फायली आणि काही अ‍ॅप्स हलवू शकता. \n\nहलविण्‍यास सुमारे <xliff:g id="TIME">^2</xliff:g> लागेल आणि अंतर्गत संचयनावर <xliff:g id="SIZE">^3</xliff:g> मोकळे करेल. काही अ‍ॅप्स सुरु असताना कार्य करणार नाहीत."</string>
@@ -1273,7 +1283,7 @@
     <string name="storage_wizard_migrate_details" msgid="3709728824651136227">"हलवण्‍यादरम्यान: \n• <xliff:g id="NAME">^1</xliff:g>काढू नका. \n• काही अ‍ॅप्स योग्यरीत्या कार्य करणार नाहीत. \n• डिव्हाइस चार्ज केलेले ठेवा."</string>
     <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> तयार आहे"</string>
     <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"आपले <xliff:g id="NAME">^1</xliff:g> फोटो आणि इतर मीडियासह वापरण्‍यासाठी तयार आहे."</string>
-    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"आपले नवीन <xliff:g id="NAME">^1</xliff:g> कार्य करीत आहे. \n\nया डिव्‍हाइसवर फोटो, फायली आणि अ‍ॅप डेटा हलविण्‍यासाठी, सेटिंग्ज &gt; संचयनावर जा."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"आपले नवीन <xliff:g id="NAME">^1</xliff:g> कार्य करत आहे. \n\nया डिव्‍हाइसवर फोटो, फायली आणि अ‍ॅप डेटा हलविण्‍यासाठी, सेटिंग्ज &gt; संचयनावर जा."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> हलवा"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> आणि त्याचा डेटा <xliff:g id="NAME_0">^2</xliff:g> वर हलविण्‍यास केवळ काही क्षण लागतील. हलविणे पूर्ण होईपर्यंत आपण अ‍ॅप वापरण्‍यास सक्षम असणार नाहीत. \n\nहलविण्‍यादरम्यान <xliff:g id="NAME_1">^2</xliff:g> काढू नका."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> हलवित आहे…"</string>
@@ -1290,7 +1300,7 @@
     <string name="apn_http_proxy" msgid="1826885957243696354">"प्रॉक्सी"</string>
     <string name="apn_http_port" msgid="3763259523984976226">"पोर्ट"</string>
     <string name="apn_user" msgid="455637547356117761">"वापरकर्तानाव"</string>
-    <string name="apn_password" msgid="5412301994998250968">"संकेतशब्द"</string>
+    <string name="apn_password" msgid="5412301994998250968">"पासवर्ड"</string>
     <string name="apn_server" msgid="2436185314756372858">"सर्व्हर"</string>
     <string name="apn_mmsc" msgid="3670124402105585737">"MMSC"</string>
     <string name="apn_mms_proxy" msgid="5374082621073999275">"MMS प्रॉक्सी"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"डीफॉल्ट APN सेटिंग्ज पुनर्संचयित करत आहे."</string>
     <string name="menu_restore" msgid="8260067415075573273">"डीफॉल्टवर रीसेट करा"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"डीफॉल्ट APN सेटिंग्ज रीसेट करणे पूर्ण झाले."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"रीसेट करा"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"नेटवर्क सेटिंग्ज रीसेट केले"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"रीसेट पर्याय"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"नेटवर्क, अॅप्स आणि डिव्हाइस रीसेट केले जाऊ शकतात"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"वायफाय मोबाइल आणि ब्लूटुथ रीसेट करा"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"हे यांसह सर्व नेटवर्क सेटिंग्‍ज रीसेट करेल:\n\n"<li>"वाय‑फाय"</li>\n<li>"मोबाइल डेटा"</li>\n<li>"ब्लूटुथ"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"सेटिंग्ज रीसेट करा"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"सर्व नेटवर्क सेटिंग्ज रीसेट करायच्या? आपण ही क्रिया पूर्ववत करू शकत नाही!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"रीसेट करायचे?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"या वापरकर्त्यासाठी नेटवर्क रीसेट उपलब्ध नाही"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"नेटवर्क सेटिंग्ज रीसेट केल्या गेल्या आहेत"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"फॅक्‍टरी डेटा रीसेट"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> खाते रीसेट केले जाईल</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> खाती रीसेट केली जातील</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"अंतर्गत स्टोरेज आणि सर्व डेटा रीसेट केला जाईल"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"सर्व डेटा मिटवा (फॅक्टरी रीसेट)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"हे आपल्या टॅब्लेटच्या "<b>"अंतर्गत संचयना"</b>" वरील सर्व डेटा मिटवेल,                                                                     यासह:\n\n"<li>"आपले Google खाते"</li>\n<li>"सिस्टम आणि अॅप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेले अॅप्स"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"हे आपल्या फोनच्या "<b>"अंतर्गत स्टोरेज"</b>" वरील सर्व डेटा मिटवेल, यासह:\n\n"<li>"आपले Google खाते"</li>\n<li>"सिस्टम आणि अॅप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेले अॅप्स"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"आपण खालील खात्यांवर सध्या साइन इन केले आहे:\n"</string>
@@ -1462,35 +1468,42 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"सुरक्षितता माहिती"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"आपल्याकडे डेटा कनेक्शन नाही. ही माहिती आता पाहण्यासाठी, इंटरनेटशी कनेक्ट केलेल्या कोणत्याही संगणकावरून %s वर जा."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"लोड करत आहे..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"आपला संकेतशब्द निवडा"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"स्क्रीन लॉक सेट करा"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"सुरक्षिततेसाठी पासवर्ड सेट करा."</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"फिंगरप्रिंट वापरण्यासाठी पासवर्ड सेट करा"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"आपला पॅटर्न निवडा"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"फिंगरप्रिंट वापरण्यासाठी पॅटर्न सेट करा"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"आपला पिन निवडा"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"सुरक्षिततेसाठी पिन सेट करा"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"फिंगरप्रिंट वापरण्यासाठी पिन सेट करा"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"आपल्या संकेतशब्दाची पुष्टी करा"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"तुमचा पासवर्ड पुन्‍हा टाका"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"आपल्या नमुन्याची पुष्टी करा"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"आपल्या पिन ची पुष्टी करा"</string>
-    <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"संकेतशब्द जुळत नाहीत"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"तुमचा पिन पुन्हा टाका"</string>
+    <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"पासवर्ड जुळत नाहीत"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"पिन जुळत नाहीत"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"अनलॉक निवड"</string>
-    <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"संकेतशब्द सेट केला गेला आहे"</string>
+    <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"पासवर्ड सेट केला गेला आहे"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"पिन सेट केला आहे"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"पॅटर्न सेट केला गेला आहे"</string>
     <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"सुरु ठेवण्यासाठी तुमच्या डिव्हाइस पॅटर्नचा वापर करा"</string>
     <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"सुरु ठेवण्यासाठी तुमचे डिव्हाइस पिन एंटर करा"</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">"सुरु ठेवण्यासाठी आपला कार्य पिन प्रविष्ट करा"</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">"सुरू ठेवण्यासाठी तुमचा डिव्हाइस पिन एंटर करा. डिव्हाइस रीस्टार्ट झाल्यानंतर आवश्यक आहे."</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">"सुरू ठेवण्यासाठी तुमचा कार्य पिन एंटर करा. डिव्हाइस रीस्टार्ट झाल्यानंतर आवश्यक आहे."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"सुरू ठेवण्यासाठी तुमचा कार्य पासवर्ड एंटर करा. डिव्हाइस रीस्टार्ट झाल्यानंतर आवश्यक आहे."</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"सुरु ठेवण्यासाठी आपला कार्य पिन एंटर करा"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"सुरु ठेवण्यासाठी आपला कार्य पासवर्ड एंटर करा"</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"वाढीव सुरक्षिततेसाठी, तुमच्या डीव्हाइसचा पॅटर्न वापरा"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"वाढीव सुरक्षिततेसाठी, तुमच्या डिव्हाइसचा पिन टाका"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"वाढीव सुरक्षिततेसाठी, तुमच्या डिव्हाइसचा पासवर्ड टाका"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"वाढीव सुरक्षिततेसाठी, तुमच्या कामाचा पॅटर्न वापरा"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"वाढीव सुरक्षिततेसाठी, तुमच्या कामाचा पिन टाका"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"वाढीव सुरक्षिततेसाठी, तुमच्या कामाचा पासवर्ड टाका"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"तुमचा फोन फॅक्टरी सेटिंग्जवर रीसेट केला होता. हा फोन वापरण्यासाठी, तुमचा याआधीचा पॅटर्न टाका."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"तुमचा फोन फॅक्टरी सेटिंग्जवर रीसेट केला होता. हा फोन वापरण्यासाठी, तुमचा याआधीचा पिन टाका."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"तुमचा फोन फॅक्टरी सेटिंग्जवर रीसेट केला होता. हा फोन वापरण्यासाठी, तुमचा याआधीचा पासवर्ड टाका."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"पॅटर्नची पडताळणी करा"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"पिनची पडताळणी करा"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"पासवर्डची पडताळणी करा"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"चुकीचा पिन"</string>
-    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"चुकीचा संकेतशब्द"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"चुकीचा पासवर्ड"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"चुकीचा पॅटर्न"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"डिव्हाइस सुरक्षितता"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"अनलॉक पॅटर्न बदला"</string>
@@ -1726,7 +1739,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"\".\" घालण्यासाठी Space की दोनदा दाबा"</string>
     <string name="show_password" msgid="4837897357002495384">"संकेतशब्‍द दर्शवा"</string>
     <string name="show_password_summary" msgid="3365397574784829969">"आपण टाइप कराल त्‍याप्रमाणे वर्णे थोडक्‍यात प्रदर्शित करा"</string>
-    <string name="spellchecker_security_warning" msgid="9060897418527708922">"हा शब्दलेखन तपासक आपण संकेतशब्द आणि क्रेडिट कार्ड नंबर यासारख्या वैयक्तिक डेटासह, टाइप करता तो सर्व मजकूर संकलित करण्यात सक्षम होऊ शकतो. हा <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> अॅपवरून येतो. हा शब्दलेखन तपासक वापरायचा?"</string>
+    <string name="spellchecker_security_warning" msgid="9060897418527708922">"हा शब्दलेखन तपासक आपण पासवर्ड आणि क्रेडिट कार्ड नंबर यासारख्या वैयक्तिक डेटासह, टाइप करता तो सर्व मजकूर संकलित करण्यात सक्षम होऊ शकतो. हा <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> अॅपवरून येतो. हा शब्दलेखन तपासक वापरायचा?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"सेटिंग्ज"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"भाषा"</string>
     <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"कीबोर्ड आणि इनपुट"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"विजेट तयार करायचा आणि प्रवेश करण्यास अनुमती द्यायची?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"आपण विजेट तयार केल्यानंतर, ते प्रदर्शित करत असलेल्या सर्व डेटामध्ये <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> प्रवेश करु शकतो."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ना विजेट तयार करण्याची आणि त्यांच्या डेटामध्ये प्रवेश करण्याची नेहमी अनुमती द्या"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>दि <xliff:g id="HOURS">%2$d</xliff:g>ता <xliff:g id="MINUTES">%3$d</xliff:g>मि <xliff:g id="SECONDS">%4$d</xliff:g>ता"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>ता <xliff:g id="MINUTES">%2$d</xliff:g>मि <xliff:g id="SECONDS">%3$d</xliff:g>से"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>मि <xliff:g id="SECONDS">%2$d</xliff:g>से"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>से"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"वापर आकडेवारी"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"वापर आकडेवारी"</string>
     <string name="display_order_text" msgid="8592776965827565271">"या क्रमानुसार लावा:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"स्क्रीन रीडर, डिस्प्ले, परस्‍परसंवाद नियंत्रणे"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"दृष्टी सेटिंग्ज"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"तुमच्या गरजा पूर्ण करण्यासाठी तुम्ही हे डिव्हाइस कस्टमाइझ करू शकता. नंतर सेटिंग्जमध्ये ही अॅक्सेसयोग्यता वैशिष्ट्ये बदलू शकता."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"फॉंटचा आकार वाढवा"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"फाँटचा आकार बदला"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"स्क्रीन वाचक"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ऑडिओ आणि स्क्रीनवरील मजकूर"</string>
     <string name="display_category_title" msgid="685461049938269166">"डिस्प्ले"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><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_screen_magnification_navbar_summary" msgid="1996584694050087161">"मोठे करणे चालू केले असताना, त्वरित मोठे करण्यासाठी, स्क्रीनच्या तळाशी असलेले प्रवेशयोग्यता बटण वापरा.\n\n"<b>"झूम करण्यासाठी"</b>", प्रवेशयोग्यता बटण टॅप करा, नंतर स्क्रीनवर कुठेही टॅप करा.\n"<ul><li>"स्क्रोल करण्यासाठी 2 किंवा अधिक बोटे ड्रॅग करा"</li>\n<li>"झूम समायोजित करण्यासाठी 2 किंवा अधिक बोटे पिंच करा"</li></ul>\n\n<b>"तात्पुरते झूम करण्यासाठी"</b>", प्रवेशयोग्यता बटण दाबा, नंतर स्क्रीनवर कुठेही स्पर्श करा आणि धरून ठेवा.\n"<ul><li>"स्क्रीनवर अवतीभवती हलवण्यासाठी ड्रॅग करा"</li>\n<li>"झूम कमी करण्यासाठी बोट उचला"</li></ul>\n\n"आपण कीबोर्ड किंवा नेव्हिगेशन बारचा झूम वाढवू शकत नाही."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"प्रवेशयोग्यता बटण <xliff:g id="SERVICE">%1$s</xliff:g> वर सेट केले आहे. मोठे करणे वापरण्यासाठी, प्रवेशयोग्यता बटणाला स्पर्श करा आणि धरून ठेवा, नंतर मोठे करणे निवडा."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"प्रवेशयोग्यता शॉर्टकट"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"आवाज की शॉर्टकट"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"शॉर्टकट सेवा"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"लॉक स्‍क्रीनवरून अनुमती द्या"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"शॉर्टकट चालू असताना, प्रवेशयोग्यता वैशिष्ट्य सुरू करण्यासाठी आपण दोन्ही आवाज बटणे 3 सेकंद दाबू शकता."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"शॉर्टकट चालू असताना, प्रवेशयोग्यता वैशिष्ट्य सुरू करण्यासाठी तुम्ही आवाज बटणे 3 सेकंद दाबू शकता."</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">"स्क्रीन विस्तृतीकरण स्वयं अद्ययावत करा"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"अॅप संक्रमणांवर स्क्रीन विस्तृतीकरण अद्ययावत करा"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"कार्यप्रदर्शन प्रभावित करू शकते"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"पॉइंटर हलविणे थांबविल्यानंतर क्लिक करा"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"क्लिक करण्यापूर्वी विलंब करा"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"चालू"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"बंद"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"द्रुत सेटिंग्जमध्ये दर्शवा"</string>
@@ -1947,8 +1952,8 @@
     <string name="print_restart" msgid="8373999687329384202">"रीस्टार्ट"</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>
+    <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>
     <string name="print_failed_state_title_template" msgid="1436099128973357969">"प्रिंटर एरर <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_blocked_state_title_template" msgid="9065391617425962424">"प्रिंटरने <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> अवरोधित केले"</string>
     <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"शोध बॉक्स दर्शविला"</string>
@@ -2182,8 +2187,8 @@
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"वर"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"बंद"</string>
-    <string name="gadget_state_turning_on" msgid="3395992057029439039">"चालू करीत आहे"</string>
-    <string name="gadget_state_turning_off" msgid="2395546048102176157">"बंद करीत आहे"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"चालू करत आहे"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"बंद करत आहे"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"वाय-फाय"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"ब्लूटूथ"</string>
     <string name="gadget_location" msgid="2974757497945178165">"स्थान"</string>
@@ -2214,10 +2219,10 @@
     <string name="credential_for_wifi" msgid="6228425986551591864">"वाय-फाय साठी इंस्टॉल केले"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"क्रेडेंशियल स्टोरेजसाठी पासवर्ड टाइप करा."</string>
-    <string name="credentials_old_password" msgid="7553393815538684028">"वर्तमान संकेतशब्द:"</string>
+    <string name="credentials_old_password" msgid="7553393815538684028">"वर्तमान पासवर्ड:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"सर्व सामग्री काढायची?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"पासवर्डमध्ये कमीत कमी 8 वर्ण असणे आवश्यक आहे."</string>
-    <string name="credentials_wrong_password" msgid="2541932597104054807">"अयोग्य संकेतशब्द."</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"अयोग्य पासवर्ड."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"अयोग्य पासवर्ड. क्रेडेन्शियल स्टोरेज मिटवले जाण्यापूर्वी आपल्याकडे एक आणखी संधी आहे."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"अयोग्य पासवर्ड. क्रेडेन्शियल स्टोरेज मिटवले जाण्यापूर्वी आपल्याकडे आणखी <xliff:g id="NUMBER">%1$d</xliff:g> संधी आहेत."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"क्रेडेन्शियल स्टोरेज मिटवले आहे."</string>
@@ -2288,7 +2293,7 @@
     <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"असुरक्षित नेटवर्कवर कनेक्ट करा"</string>
     <string name="wifi_setup_status_edit_network" msgid="4765340816724760717">"नेटवर्क कॉन्फिगरेशन टाइप करा"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"नवीन नेटवर्कवर कनेक्ट करा"</string>
-    <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"कनेक्ट करीत आहे..."</string>
+    <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"कनेक्ट करत आहे..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"पुढील चरणावर जा"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="6796317704783144190">"EAP समर्थित नाही."</string>
     <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"तुम्ही सेटअप दरम्यान EAP Wi‑Fi कनेक्शन कॉंफिगर करु शकत नाही, तुम्ही ते सेटिंग्ज &gt; वायरलेस &amp; नेटवर्क मध्ये करु शकता."</string>
@@ -2296,7 +2301,7 @@
     <string name="wifi_setup_description_connected" msgid="6649168170073219153">"सेटअप सुरू ठेवण्यासाठी "<b>"पुढील"</b>" वर टॅप करा.\n\nएका वेगळ्या वाय‑फाय नेटवर्कशी कनेक्ट करण्यासाठी "<b>"परत"</b>" वर टॅप करा."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"संकालन सक्षम केले"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"संकालन अक्षम केले"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"आता संकालन करीत आहे"</string>
+    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"आता संकालन करत आहे"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"सिंक एरर."</string>
     <string name="sync_failed" msgid="1696499856374109647">"संकालन अयशस्वी"</string>
     <string name="sync_active" msgid="8476943765960863040">"संकालन सक्रिय"</string>
@@ -2316,7 +2321,7 @@
     <string name="sync_disabled" msgid="8511659877596511991">"संकालन बंद आहे"</string>
     <string name="sync_error" msgid="5060969083117872149">"सिंक एरर"</string>
     <string name="last_synced" msgid="4242919465367022234">"अंतिम संकालन केले: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
-    <string name="sync_in_progress" msgid="5151314196536070569">"आता संकालन करीत आहे…"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"आता संकालन करत आहे…"</string>
     <string name="settings_backup" msgid="2274732978260797031">"बॅक अप सेटिंग्ज"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"माझ्या सेटिंग्जचा बॅकअप घ्या"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"आता संकालन करा"</string>
@@ -2329,7 +2334,7 @@
     <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Google संकालनामध्ये स्वागत आहे!"</font>" \nआपण जेथे आहात तेथून आपल्या संपर्क, भेटी आणि अधिक मध्ये प्रवेश करण्याची अनुमती देण्यासाठी डेटा संकालन करण्याकरिता एक Google दृष्टिकोन."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"अॅप संकालन सेटिंग्ज"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"डेटा आणि संकालन"</string>
-    <string name="preference_change_password_title" msgid="8955581790270130056">"संकेतशब्द बदला"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"पासवर्ड बदला"</string>
     <string name="header_account_settings" msgid="5382475087121880626">"खाते सेटिंग्ज"</string>
     <string name="remove_account_label" msgid="5921986026504804119">"खाते काढा"</string>
     <string name="header_add_an_account" msgid="756108499532023798">"खाते जोडा"</string>
@@ -2345,11 +2350,11 @@
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"या आयटमसाठी सध्या सिंक अक्षम केले आहे. हे सेटिंग बदलण्यासाठी, पार्श्वभूमीवरील डेटा आणि आपोआप होणारे सिंक तात्पुरते चालू करा."</string>
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC पत्ता"</string>
-    <string name="enter_password" msgid="8035706727471334122">"Android प्रारंभ करण्‍यासाठी, आपला संकेतशब्द प्रविष्‍ट करा"</string>
+    <string name="enter_password" msgid="8035706727471334122">"Android प्रारंभ करण्‍यासाठी, आपला पासवर्ड प्रविष्‍ट करा"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android प्रारंभ करण्‍यासाठी, आपला पिन प्रविष्‍ट करा"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android प्रारंभ करण्‍यासाठी, आपल्या नमुन्याची रेखाटणी करा"</string>
     <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"चुकीचा पॅटर्न"</string>
-    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"चुकीचा संकेतशब्द"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"चुकीचा पासवर्ड"</string>
     <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"चुकीचा पिन"</string>
     <string name="checking_decryption" msgid="8287458611802609493">"तपासत आहे..."</string>
     <string name="starting_android" msgid="4001324195902252681">"Android प्रारंभ करत आहोत..."</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g> पैकी <xliff:g id="NUMBER">%1$d</xliff:g> निवडले"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g> पैकी <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"सर्व निवडा"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"योजना व्यवस्थापित करा"</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>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"मोबाईल नेटवर्क"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"मीटर केलेली वाय-फाय नेटवर्क"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"मीटर केलेली नेटवर्क निवडण्‍यासाठी, वाय-फाय चालू करा."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"स्वयंचलित"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"मीटरने मोजले"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"मीटरने मोजले नाही"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"वाहक डेटा गणना आपल्या डिव्हाइसपेक्षा भिन्न असू शकते."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"आणीबाणीचा कॉल"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"कॉल वर परत"</string>
@@ -2461,7 +2470,7 @@
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS सर्व्हर (उदा. 8.8.8.8)"</string>
     <string name="vpn_routes" msgid="3818655448226312232">"अग्रेषण मार्ग (उदा. 10.0.0.0/8)"</string>
     <string name="vpn_username" msgid="1863901629860867849">"वापरकर्तानाव"</string>
-    <string name="vpn_password" msgid="6756043647233596772">"संकेतशब्द"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"पासवर्ड"</string>
     <string name="vpn_save_login" msgid="6350322456427484881">"खाते माहिती सेव्ह करा"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(वापरले नाही)"</string>
     <string name="vpn_no_ca_cert" msgid="8776029412793353361">"(सर्व्हर सत्यापित करू नका)"</string>
@@ -2470,7 +2479,7 @@
     <string name="vpn_always_on_invalid_reason_server" msgid="477304620899799383">"नेहमी-चालू VPN केवळ अंकीय सर्व्हर पत्त्यांना समर्थित करतात"</string>
     <string name="vpn_always_on_invalid_reason_no_dns" msgid="2226648961940273294">"नेहमी-चालू VPN साठी DNS सर्व्हर निर्दिष्ट करणे आवश्यक आहे"</string>
     <string name="vpn_always_on_invalid_reason_dns" msgid="3551394495620249972">"नेहमी-चालू VPN साठी DNS सर्व्हर पत्ते अंकीय असणे आवश्यक आहे"</string>
-    <string name="vpn_always_on_invalid_reason_other" msgid="5959352052515258208">"प्रविष्ट केलेली माहिती नेहमी-चालू VPN ला समर्थित करत नाही"</string>
+    <string name="vpn_always_on_invalid_reason_other" msgid="5959352052515258208">"एंटर केलेली माहिती नेहमी-चालू VPN ला समर्थित करत नाही"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"रद्द करा"</string>
     <string name="vpn_done" msgid="8678655203910995914">"डिसमिस करा"</string>
     <string name="vpn_save" msgid="4233484051644764510">"सेव्ह करा"</string>
@@ -2528,10 +2537,10 @@
     <string name="user_credential_removed" msgid="6514189495799401838">"क्रेडेंशियल काढले: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
     <string name="user_credential_none_installed" msgid="3729607560420971841">"कोणतेही वापरकर्ता क्रेडेंशियल इंस्टॉल केलेले नाहीत"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"शब्दलेखन तपासक"</string>
-    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"येथे आपला वर्तमान पूर्ण बॅकअप संकेतशब्द टाइप करा"</string>
-    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"येथे पूर्ण बॅकअप साठी एक नवीन संकेतशब्द टाइप करा"</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"येथे आपला वर्तमान पूर्ण बॅकअप पासवर्ड टाइप करा"</string>
+    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"येथे पूर्ण बॅकअप साठी एक नवीन पासवर्ड टाइप करा"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"येथे आपला नवीन पूर्ण बॅकअप पासवर्ड परत टाइप करा"</string>
-    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"बॅकअप संकेतशब्द सेट करा"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"बॅकअप पासवर्ड सेट करा"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"रद्द करा"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"अतिरिक्त सिस्टम अपडेट"</string>
     <string name="selinux_status_disabled" msgid="924551035552323327">"अक्षम"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"कॉल व्यवस्थापक"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"आणीबाणी प्रसारणे"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"आणीबाणीच्या सूचना"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"नेटवर्क ऑपरेटर"</string>
     <string name="access_point_names" msgid="1381602020438634481">"प्रवेश बिंदू नावे"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"वर्धित 4G LTE मोड"</string>
@@ -2700,13 +2709,13 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"डेटा सिम निवडण्यासाठी टॅप करा"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"कॉल साठी हे नेहमी वापरा"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"डेटासाठी एक सिम निवडा"</string>
-    <string name="data_switch_started" msgid="2040761479817166311">"डेटा सिम स्‍विच करीत आहे, यास सुमारे एक मिनिट लागेल..."</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"डेटा सिम स्‍विच करत आहे, यास सुमारे एक मिनिट लागेल..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"यासह कॉल करा"</string>
     <string name="sim_select_card" msgid="211285163525563293">"एक सिम कार्ड निवडा"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"सिम <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"सिम रिक्त"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"सिम नाव"</string>
-    <string name="sim_name_hint" msgid="7038643345238968930">"सिम नाव प्रविष्ट करा"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"सिम नाव एंटर करा"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"सिम स्लॉट %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"वाहक"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"संख्या"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"यासाठी प्राधान्यकृत सिम"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"प्रत्येक वेळी विचारा"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"निवड आवश्यक"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"सिम निवड"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"सेटिंग्ज"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="one">%d लपविलेला आयटम दर्शवा</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"अॅप सूचना"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"सूचना प्रकार"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"महत्त्व"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"अॅपला ठरवू द्या"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"ध्वनीला अनुमती द्या"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"सूचना कधीही दर्शवू नका"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"कोणताही ध्वनी किंवा व्हिज्युअल व्यत्यय नाही"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"कोणताही ध्वनी नाही"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"ध्वनी करा"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"ध्वनी करा आणि स्क्रीनवर पॉप करा"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"स्क्रीनवरील पॉप"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"कमी"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"मध्‍यम"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"जास्त"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"तातडीचे"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"ध्वनीला अनुमती द्या"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"ध्वनी, कंपन करू नका किंवा वर्तमान स्क्रीनवर दृश्यामध्ये या सूचना दर्शवू नका."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"व्‍यत्‍ययांना अनुमती द्या"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"अॅपचा आवाज येऊ द्या, कंपन करू द्या आणि/किंवा स्‍क्रीनवर पॉप सूचना येऊ द्या"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"कमी महत्त्व"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"मध्यम महत्त्व"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"सर्वाधिक महत्व"</string>
@@ -2922,10 +2933,10 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"चि. म. चि. चित्रामध्ये"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"चित्रा मध्‍ये चित्र"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"चित्रामध्‍ये चित्राची अनुमती द्या"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"अ‍ॅप खुले असताना किंवा आपण ते सोडल्यानंतर या अ‍ॅपला चित्रामध्ये चित्र विंडो तयार करण्याची अनुमती द्या (उदाहरणार्थ, व्हिडिओ पाहणे सुरू ठेवणे). ही विंडो आपण वापरत असलेल्या इतर अ‍ॅप्सच्या वर प्रदर्शित होते."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"अ‍ॅप खुले असताना किंवा तुम्ही ते सोडल्यानंतर या अ‍ॅपला चित्रामध्ये चित्र विंडो तयार करण्याची परवानगी द्या (उदाहरणार्थ, व्हिडिओ पाहणे सुरू ठेवणे). ही विंडो तुम्ही वापरत असलेल्या इतर अ‍ॅप्सच्या वरती दिसते."</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="loading_notification_apps" msgid="5031818677010335895">"अॅप्स लोड करत आहे..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android या अ‍ॅपच्या सूचना या डिव्हाइसवर दिसणे ब्लॉक करत आहे"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android या प्रकारच्या सूचना या डिव्हाइसवर दिसणे ब्लॉक करत आहे"</string>
     <string name="notification_channels" msgid="5346841743182627500">"श्रेण्या"</string>
@@ -3066,10 +3077,10 @@
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"नाही"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"पिन आवश्यक?"</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">"या डिव्हाइसचा प्रारंभ करण्यासाठी आपण आपला पिन प्रविष्ट करता, तेव्हा <xliff:g id="SERVICE">%1$s</xliff:g> सारख्या सेवांची प्रवेशयोग्यता उपलब्धता असणार नाही."</string>
+    <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"पासवर्ड आवश्यक?"</string>
+    <string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"या डिव्हाइसचा प्रारंभ करण्यासाठी आपण आपला पिन एंटर करता, तेव्हा <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>
-    <string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"या डिव्हाइसचा प्रारंभ करण्यासाठी आपण आपला संकेतशब्द प्रविष्ट करता, तेव्हा <xliff:g id="SERVICE">%1$s</xliff:g> सारख्या सेवांची प्रवेशयोग्यता उपलब्ध असणार नाही."</string>
+    <string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"या डिव्हाइसचा प्रारंभ करण्यासाठी आपण आपला पासवर्ड एंटर करता, तेव्हा <xliff:g id="SERVICE">%1$s</xliff:g> सारख्या सेवांची प्रवेशयोग्यता उपलब्ध असणार नाही."</string>
     <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"टीप: रीबूट केल्यानंतर, तुम्ही आपला फोन अनलॉक करे पर्यंत हे अॅप सुरू होऊ शकत नाही"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI माहिती"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"IMEI सापेक्ष माहिती"</string>
@@ -3190,7 +3201,7 @@
     </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ऑप्टिमाइझ न केलेले"</string>
     <string name="high_power_on" msgid="6216293998227583810">"ऑप्टिमाइझ न केलेले"</string>
-    <string name="high_power_off" msgid="3393904131961263278">"बॅटरी वापर ऑप्टिमाइझ करीत आहे"</string>
+    <string name="high_power_off" msgid="3393904131961263278">"बॅटरी वापर ऑप्टिमाइझ करत आहे"</string>
     <string name="high_power_system" msgid="7362862974428225301">"बॅटरी ऑप्टिमायझेशन उपलब्ध नाही"</string>
     <string name="high_power_desc" msgid="6283926163708585760">"बॅटरी ऑप्टिमायझेशन वापरू नका. आपली बॅटरी अधिक द्रुतपणे संपवू शकते."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"अॅप नेहमी पार्श्वभूमीत चालू द्यायचे?"</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"फायली हस्तांतरित करणे"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"फोटो हस्तांतरित करणे (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"डिव्हाइस MIDI म्हणून वापरणे"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS मिररिंग"</string>
     <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>
@@ -3302,7 +3314,7 @@
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"आपली स्क्रीन अनलॉक न करता कॅमेरा द्रुतपणे उघडा"</string>
     <string name="screen_zoom_title" msgid="5233515303733473927">"डिस्प्ले आकार"</string>
     <string name="screen_zoom_short_summary" msgid="7291960817349834688">"स्क्रीन वरील आयटम आणखी मोठे किंवा आणखी लहान करा"</string>
-    <string name="screen_zoom_keywords" msgid="9176477565403352552">"डिस्प्ले घनता, स्क्रीन झूम, मापन, मापन करीत आहे"</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_make_smaller_desc" msgid="4622359904253364742">"आणखी लहान करा"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"रात्रीच्या प्रकाशाचे वेळापत्रक सेट करा"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"आपल्याला झोप येण्यात मदत होण्यासाठी स्क्रीनची रंगछटा पिवळसर तपकिरी करा"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"रात्रीचा प्रकाश चालू आहे"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"स्क्रीनची रंगछटा पिवळसर तपकिरी आहे. यामुळे आपल्याला झोप येण्यात मदत होईल."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"सूचना"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"आणखी छान डिस्प्ले रंग वापरा"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"रंग बदल लागू करण्यासाठी, स्क्रीन बंद करा"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"टेलिफोनी मॉनिटर बदल लागू करण्‍यासाठी, डिव्हाइस रीबूट करा"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"कॅमेरा HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"कॅमेरा HAL HDR+ बदल लागू करण्यासाठी डिव्हाइस रीबूट करा"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"कॅमेरा लेझर सेंसर"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"स्वयंचलित सिस्टम अपडेट"</string>
     <string name="usage" msgid="2977875522080448986">"वापर"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"मोबाइल डेटा वापर"</string>
@@ -3410,7 +3427,7 @@
     <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_2">%2$s</xliff:g> मध्‍ये <xliff:g id="ID_1">%1$s</xliff:g> वापरला"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<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">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"पुसा आणि रुपांतरित करा"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager दर-मर्यादित करणे रीसेट करा"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager दर-मर्यादित करणे रीसेट केले गेले आहे"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"लॉक स्क्रीन सूचना नियंत्रित करा"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"लॉक स्क्रीनवरील माहिती नियंत्रित करा"</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="8483187649355540109">"साहाय्य आणि टिपा"</string>
@@ -3487,14 +3504,14 @@
     <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="2456198532288640046">"इतर डिव्हाइसेसना दृश्यमान नाही"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"बंद"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g>शी कनेक्ट केले"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"एकाधिक डिव्हाइसशी कनेक्ट केले"</string>
     <string name="demo_mode" msgid="2798762752209330277">"सिस्टम UI डेमो मोड"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"द्रुत सेटिंग्ज विकासक टाइल"</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_24_7_content_description" msgid="3772776213036994533">"आम्ही आपल्यासाठी 24/7 येथे आहोत"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"आम्ही तुमच्यासाठी 24/7 येथे आहोत"</string>
+    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"आम्ही तुमच्यासाठी 24/7 येथे आहोत"</string>
     <string name="support_escalation_summary" msgid="8473084168776014405">"कोणत्याही समस्येचे निराकरण करण्यात मदत करण्यासाठी आमचा सहाय्य कार्यसंघ येथे आहे"</string>
     <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"आमचा सहाय्य कार्यसंघ दररोज, दिवसभर येथे आहे"</string>
     <string name="support_escalation_closed_summary" msgid="2240967274380168303">"मदत शोधा किंवा साहाय्य तासांदरम्यान (स्थानिक वेळ) परत या:&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
@@ -3504,7 +3521,7 @@
     <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
     <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
     <string name="support_international_phone_title" msgid="1308334014138718455">"परदेशी प्रवास करीत आहात?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"आंतरराष्ट्रीय शुल्क लागू होऊ शकतात"</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>
@@ -3589,9 +3606,9 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"इन्स्टंट अ‍ॅप्स"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"अ‍ॅप्समध्ये दुवे उघडा, ते इंस्टॉल केलेले नसले तरीही"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"इन्स्टंट अ‍ॅप्स"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"इन्स्टंट अ‍ॅप्स खाते"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"इंस्टंट अ‍ॅप्स प्राधान्ये"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"इंस्टॉल केलेले अॅप्स"</string>
-    <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"आपला संचय आता संचय व्यवस्थापक व्यवस्थापित करीत आहे"</string>
+    <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"आपला संचय आता संचय व्यवस्थापक व्यवस्थापित करत आहे"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> साठी खाती"</string>
     <string name="configure_section_header" msgid="7391183586410814450">"कॉन्फिगर करा"</string>
     <string name="auto_sync_account_title" msgid="898796354710116383">"डेटा स्वयंचलितपणे संकालित करा"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"आपल्‍या वैयक्तिक प्रोफाइलमध्‍ये नेहमी VPN चालू असणे सक्रिय आहे"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"आपल्‍या कार्य प्रोफाइलमध्‍ये नेहमी VPN चालू असणे सक्रिय आहे"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"जागतिक HTTP प्रॉक्‍सी सेट आहे"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"विश्वासू क्रेडेंशियल"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"विश्वसनीय क्रेडेंशिअल"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"तुमच्‍या खाजगी प्रोफाइलमधील विश्वसनीय क्रेडेंशिअल"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"तुमच्‍या कार्य प्रोफाइलमधील विश्वसनीय क्रेडेंशिअल"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">किमान <xliff:g id="COUNT_1">%d</xliff:g> CA प्रमाणपत्र</item>
       <item quantity="other">किमान <xliff:g id="COUNT_1">%d</xliff:g> CA प्रमाणपत्रे</item>
@@ -3644,7 +3663,7 @@
     <string name="enterprise_privacy_lock_device" msgid="8791656477097208540">"प्रशासक डिव्हाइस लॉक करू शकतो आणि पासवर्ड रीसेट करू शकतो"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"प्रशासक डिव्हाइसवरील सर्व डेटा हटवू शकतो"</string>
     <string name="enterprise_privacy_failed_password_wipe_device" msgid="1001255609345002878">"सर्व डिव्हाइस डेटा हटवण्यापूर्वी अयशस्वी झालेले पासवर्ड प्रयत्न"</string>
-    <string name="enterprise_privacy_failed_password_wipe_work" msgid="4040565826652951057">"सर्व कार्य प्रोफाइल डेटा हटवण्यापूर्वी अयशस्वी झालेले संकेतशब्द प्रयत्न"</string>
+    <string name="enterprise_privacy_failed_password_wipe_work" msgid="4040565826652951057">"सर्व कार्य प्रोफाइल डेटा हटवण्यापूर्वी अयशस्वी झालेले पासवर्ड प्रयत्न"</string>
     <plurals name="enterprise_privacy_number_failed_password_wipe" formatted="false" msgid="5279099270351036696">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> प्रयत्न</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> प्रयत्न</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"वाहक तरतूद माहिती"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"वाहक तरतूद ट्रिगर करा"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"नवीन आणि रोमांचक असे काय आहे?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"टॉप 5 वैशिष्ट्ये पहा"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"तुमच्या नवीन फोनबद्दल माहिती देणार्‍या सफरीवर चला"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"तुमच्या नवीन टॅबलेटबद्दल माहिती देणार्‍या सफरीवर चला"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"तुमच्या नवीन डीव्हाइसबद्दल माहिती देणार्‍या सफरीवर चला"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"हे वैशिष्‍ट्य या डिव्हाइसवर उपलब्ध नाही"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS नोंदणी स्थिती"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"नोंदवलेले"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"नोंदवलेले नाही"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 21083cf..1dc869f 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ingin mengakses mesej anda. Berikan akses kepada %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Permintaan akses SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> mahu mengakses kad SIM anda. Pemberian akses kepada kad SIM akan melumpuhkan sambungan data pada peranti anda untuk tempoh sambungan itu. Berikan akses kepada <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Kelihatan kepada peranti lain sebagai \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\'"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Kelihatan kepada peranti lain sebagai “<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Peranti anda"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Gandingkan peranti baharu"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Tarikh &amp; masa"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Seterusnya"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Langkau cap jari?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Persediaan cap jari hanya mengambil masa seminit dua. Jika anda melangkau langkah ini, anda boleh menambah cap jari kemudian dalam tetapan."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Langkau kunci skrin?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Ciri perlindungan peranti tidak akan dihidupkan. Anda tidak akan dapat menghalang orang lain daripada menggunakan tablet ini jika tablet hilang, dicuri atau ditetapkan semula."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Ciri perlindungan peranti tidak akan dihidupkan. Anda tidak akan dapat menghalang orang lain daripada menggunakan peranti ini jika peranti hilang, dicuri atau ditetapkan semula."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Ciri perlindungan peranti tidak akan dihidupkan. Anda tidak akan dapat menghalang orang lain daripada menggunakan telefon ini jika telefon hilang, dicuri atau ditetapkan semula."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Anda telah menambahkan bilangan maksimum cap jari"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Tidak boleh menambahkan lagi cap jari"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Alih keluar semua cap jari?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Alih keluar \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Adakah anda mahu memadamkan cap jari ini?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Anda tidak akan dapat menggunakan cap jari untuk membuka kunci telefon, membenarkan pembelian atau log masuk ke apl"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Anda tidak akan dapat menggunakan cap jari untuk membuka kunci profil kerja anda, membenarkan pembelian atau log masuk ke apl kerja"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Ya, alih keluar"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Lindungi tablet anda"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Lindungi peranti anda"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Lindungi telefon anda"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Untuk keselamatan tambahan, sediakan kunci skrin sandaran."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Untuk keselamatan tambahan, sediakan kunci skrin sandaran."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Halang orang lain daripada menggunakan tablet ini tanpa kebenaran anda dengan mengaktifkan ciri perlindungan peranti. Pilih kunci skrin yang anda ingin gunakan."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Halang orang lain daripada menggunakan peranti ini tanpa kebenaran anda dengan mengaktifkan ciri perlindungan peranti. Pilih kunci skrin yang anda ingin gunakan."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Halang orang lain daripada menggunakan telefon ini tanpa kebenaran anda dengan mengaktifkan ciri perlindungan peranti. Pilih kunci skrin yang anda ingin gunakan."</string>
@@ -497,37 +502,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Alih keluar perlindungan peranti?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Alih keluar perlindungan profil?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Ciri perlindungan peranti tidak akan berfungsi tanpa corak anda."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Ciri perlindungan peranti tidak akan berfungsi tanpa corak anda.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Ciri perlindungan peranti tidak akan berfungsi tanpa corak anda.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Cap jari anda yang disimpan akan turut dialih keluar daripada peranti ini dan anda tidak akan dapat membuka kunci telefon, membenarkan pembelian atau log masuk ke apl dengan maklumat tersebut.\""</string>
+</xliff:g>Cap jari anda yang disimpan akan turut dialih keluar daripada peranti ini dan anda tidak akan dapat membuka telefon, membenarkan pembelian atau log masuk ke apl dengan cap jari."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Ciri perlindungan peranti tidak akan berfungsi tanpa PIN anda."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Ciri perlindungan peranti tidak akan berfungsi tanpa PIN anda.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Ciri perlindungan peranti tidak akan berfungsi tanpa PIN anda.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Cap jari anda yang disimpan akan turut dialih keluar daripada peranti ini dan anda tidak akan dapat membuka kunci telefon, membenarkan pembelian atau log masuk ke apl dengan maklumat tersebut.\""</string>
+</xliff:g>Cap jari anda yang disimpan akan turut dialih keluar daripada peranti ini dan anda tidak akan dapat membuka telefon, membenarkan pembelian atau log masuk ke apl dengan cap jari."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Ciri perlindungan peranti tidak akan berfungsi tanpa kata laluan anda."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Ciri perlindungan peranti tidak akan berfungsi tanpa kata laluan anda.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Ciri perlindungan peranti tidak akan berfungsi tanpa kata laluan anda.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Cap jari anda yang disimpan akan turut dialih keluar daripada peranti ini dan anda tidak akan dapat membuka kunci telefon, membenarkan pembelian atau log masuk ke apl dengan maklumat tersebut.\""</string>
+</xliff:g>Cap jari anda yang disimpan akan turut dialih keluar daripada peranti ini dan anda tidak akan dapat membuka telefon, membenarkan pembelian atau log masuk ke apl dengan cap jari."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Ciri perlindungan peranti tidak akan berfungsi tanpa kunci skrin anda."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Ciri perlindungan peranti tidak akan berfungsi tanpa kunci skrin anda.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Ciri perlindungan peranti tidak akan berfungsi tanpa kunci skrin anda.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Cap jari anda yang disimpan akan turut dialih keluar daripada peranti ini dan anda tidak akan dapat membuka kunci telefon, membenarkan pembelian atau log masuk ke apl dengan maklumat tersebut.\""</string>
+</xliff:g>Cap jari anda yang disimpan akan turut dialih keluar daripada peranti ini dan anda tidak akan dapat membuka telefon, membenarkan pembelian atau log masuk ke apl dengan cap jari."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Ciri perlindungan profil tidak akan berfungsi tanpa corak anda."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Ciri perlindungan profil tidak akan berfungsi tanpa corak anda.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Ciri perlindungan profil tidak akan berfungsi tanpa corak anda.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Cap jari anda yang disimpan akan turut dialih keluar daripada profil ini dan anda tidak akan dapat membuka profil, membenarkan pembelian atau log masuk ke apl dengan cap jari.\""</string>
+</xliff:g>Cap jari anda yang disimpan akan turut dialih keluar daripada profil ini dan anda tidak akan dapat membuka profil, membenarkan pembelian atau log masuk ke apl dengan cap jari."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Ciri perlindungan profil tidak akan berfungsi tanpa PIN anda."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Ciri perlindungan profil tidak akan berfungsi tanpa PIN anda.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Ciri perlindungan profil tidak akan berfungsi tanpa PIN anda.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Cap jari anda yang disimpan akan turut dialih keluar daripada profil ini dan anda tidak akan dapat membuka profil, membenarkan pembelian atau log masuk ke apl dengan cap jari.\""</string>
+</xliff:g>Cap jari anda yang disimpan akan turut dialih keluar daripada profil ini dan anda tidak akan dapat membuka profil, membenarkan pembelian atau log masuk ke apl dengan cap jari."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Ciri perlindungan profil tidak akan berfungsi tanpa kata laluan anda."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Ciri perlindungan profil tidak akan berfungsi tanpa kata laluan anda.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Ciri perlindungan profil tidak akan berfungsi tanpa kata laluan anda.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Cap jari anda yang disimpan akan turut dialih keluar daripada profil ini dan anda tidak akan dapat membuka profil, membenarkan pembelian atau log masuk ke apl dengan cap jari.\""</string>
+</xliff:g>Cap jari anda yang disimpan akan turut dialih keluar daripada profil ini dan anda tidak akan dapat membuka profil, membenarkan pembelian atau log masuk ke apl dengan cap jari."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Ciri perlindungan profil tidak akan berfungsi tanpa kunci skrin anda."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Ciri perlindungan profil tidak akan berfungsi tanpa kunci skrin anda.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Ciri perlindungan profil tidak akan berfungsi tanpa kunci skrin anda.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Cap jari anda yang disimpan akan turut dialih keluar daripada profil ini dan anda tidak akan dapat membuka profil, membenarkan pembelian atau log masuk ke apl dengan cap jari.\""</string>
+</xliff:g>Cap jari anda yang disimpan akan turut dialih keluar daripada profil ini dan anda tidak akan dapat membuka profil, membenarkan pembelian atau log masuk ke apl dengan cap jari."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Ya, alih keluar"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Tukar corak buka kunci"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Tukar PIN buka kunci"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Angka menaik, menurun atau jujukan berulang tidak dibenarkan"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Batal"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Kosongkan"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Batal"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Seterusnya"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Persediaan selesai."</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tersedia"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tersedia)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Masukkan kata laluan rangkaian anda"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Rangkaian Wi-Fi pembawa"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Sambung melalui <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Untuk memperbaik ketepatan lokasi dan untuk tujuan lain, <xliff:g id="APP_NAME">%1$s</xliff:g> ingin menghidupkan imbasan rangkaian, walaupun semasa Wi-Fi dimatikan.\n\nBenarkan fungsi ini untuk semua apl yang ingin mengimbas?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Untuk mematikan, pergi ke Lanjutan dlm menu limpahan."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Benarkan"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Sambung"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Gagal menyambung ke rangkaian."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Lupakan"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Ubah suai"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Gagal melupakan rangkaian"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Simpan"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Gagal menyimpan rangkaian"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi Lanjutan"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Alamat MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Alamat IP"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Maklumat rangkaian"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Tapisan subrangkaian"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Alamat IPv6"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Batalkan jemputan?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Adakah anda mahu membatalkan jemputan untuk berhubung dengan <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Lupakan kumpulan ini?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Liputan Wi-Fi mudah alih"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Tempat liputan Wi-Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Tidak berkongsi sambungan Internet atau kandungan dengan peranti lain"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Berkongsi sambungan Internet tablet ini melalui tempat liputan"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Berkongsi sambungan Internet telefon ini melalui tempat liputan"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Apl berkongsi kandungan. Untuk berkongsi sambungan Internet, matikan dan hidupkan tempat liputan."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nama Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Nama tempat liputan"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Menghidupkan <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Peranti lain boleh bersambung ke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Kata laluan Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Kata laluan tempat liputan"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Jalur AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Gunakan tempat liputan untuk membuat rangkaian Wi-Fi bagi peranti anda yang lain. Tempat liputan menyediakan Internet menggunakan sambungan data mudah alih anda. Caj data mudah alih tambahan mungkin dikenakan."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Apl boleh membuat tempat liputan untuk berkongsi kandungan dengan peranti berdekatan."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Alamat digunakan oleh perkhidmatan kecemasan sebagai lokasi anda jika anda membuat panggilan kecemasan menggunakan Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Paparan"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Bunyi"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Kelantangan"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Carian"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Urus tetapan dan sejarah carian"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Tiada hasil carian"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Kosongkan sejarah"</string>
     <string name="display_settings" msgid="7965901687241669598">"Paparan"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Skrin autoputar"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Warna terang"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Memulihkan tetapan lalai APN."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Tetapkan semula kepada lalai"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Penetapan semula tetapan lalai APN selesai."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Tetapkan semula"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Tetapan semula tetapan rangkaian"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Pilihan tetapan semula"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Rangkaian, apl atau peranti boleh ditetapkan semula"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Tetapkan semula Wi-Fi, mudah alih &amp; Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Tindakan ini akan menetapkan semula semua tetapan rangkaian, termasuk:\n\n"<li>"Wi‑Fi"</li>\n<li>"Data mudah alih"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Tetapkan semula tetapan"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Tetapkan semula semua tetapan rangkaian? Anda tidak boleh membuat asal tindakan ini!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Tetapkan semula?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Tetapan semula rangkaian tidak tersedia untuk pengguna ini"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Tetapan rangkaian telah ditetapkan semula"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Tetapan semula data kilang"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> akaun akan ditetapkan semula</item>
-      <item quantity="one">1 akaun akan ditetapkan semula</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Storan dalaman &amp; semua data akan ditetapkan semula"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Padamkan semua data (tetapan semula kilang)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Ini akan memadamkan semua data dari "<b>"storan dalaman"</b>" tablet anda, termasuk:\n\n"<li>"Akaun Google anda"</li>\n<li>"Data dan tetapan sistem dan aplikasi"</li>\n<li>"Aplikasi yang dimuat turun"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Ini akan memadamkan semua data daripada "<b>"storan dalaman"</b>" telefon anda, termasuk:\n\n"<li>"Akaun Google anda"</li>\n<li>"Data dan tetapan sistem dan aplikasi"</li>\n<li>"Aplikasi yang dimuat turun"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Anda melog masuk ke dalam akaun berikut buat masa ini:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Maklumat keselamatan"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Anda tidak mempunyai sambungan data. Untuk melihat maklumat ini sekarang, pergi ke %s dari sebarang komputer yang disambungkan ke Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Memuatkan..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Pilih kata laluan anda"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Tetapkan kunci skrin"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Sebagai langkah keselamatan, tetapkan kata laluan"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Ttpkn kta lluan utk gnakan cp jari"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Pilih corak anda"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Buat corak utk guna cap jari"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Pilih PIN anda"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Sebagai langkah keselamatan, tetapkan PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Ttpkn PIN utk gunakan cap jari"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Sahkan kata laluan anda"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Masukkan semula kata laluan anda"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Sahkan corak anda"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Sahkan PIN anda"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Masukkan semula PIN anda"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Kata laluan tidak sepadan"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN tidak sepadan"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Pilihan buka kunci"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Gunakan corak kerja anda untuk meneruskan"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Masukkan PIN kerja anda untuk meneruskan"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Masukkan kata laluan kerja anda untuk meneruskan"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Gunakan corak peranti anda untuk meneruskan. Ini diperlukan selepas peranti dimulakan semula."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Masukkan PIN peranti anda untuk meneruskan. Ini diperlukan selepas peranti dimulakan semula."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Masukkan kata laluan peranti anda untuk meneruskan. Ini diperlukan selepas peranti dimulakan semula."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Gunakan corak kerja anda untuk meneruskan. Ini diperlukan selepas peranti dimulakan semula."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Masukkan PIN kerja anda untuk meneruskan. Ini diperlukan selepas peranti dimulakan semula."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Masukkan  kata laluan kerja anda untuk meneruskan. Ini diperlukan selepas peranti dimulakan semula."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Untuk keselamatan tambahan, gunakan corak peranti anda"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Untuk keselamatan tambahan, masukkan PIN peranti anda"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Untuk keselamatan tambahan, masukkan kata laluan peranti anda"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Untuk keselamatan tambahan, gunakan corak kerja anda"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Untuk keselamatan tambahan, masukkan PIN kerja anda"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Untuk keselamatan tambahan, masukkan kata laluan kerja anda"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Telefon ditetapkan semula kpd tetapan kilang. Untuk menggunakan telefon, masukkan corak terdahulu."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Telefon ditetapkan semula kepada tetapan kilang. Untuk menggunakan telefon, masukkan PIN terdahulu."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Telefon dittpkn semula kpd tetapan kilang. Utk menggunakan telefon, masukkan kata laluan terdahulu."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Sahkan corak"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Sahkan PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Sahkan kata laluan"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN salah"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Kata laluan salah"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Corak salah"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Buat widget dan benarkan akses?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Selepas anda membuat widget, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> boleh mengakses semua data yang dipaparkan."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Sentiasa benarkan <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> untuk membuat widget dan mengakses datanya"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>h <xliff:g id="HOURS">%2$d</xliff:g>j <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>j <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>h <xliff:g id="HOURS">%2$d</xliff:g>j <xliff:g id="MINUTES">%3$d</xliff:g>m"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>j <xliff:g id="MINUTES">%2$d</xliff:g>m"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Statistik penggunaan"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Statistik penggunaan"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Isih mengikut:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Pembaca skrin, paparan, kawalan interaksi"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Tetapan Penglihatan"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Anda boleh menyesuaikan peranti ini mengikut keperluan anda. Ciri kebolehaksesan ini boleh diubah kemudian dalam Tetapan."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Besarkan saiz fon"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Tukar saiz fon"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Pembaca skrin"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio &amp; teks pada skrin"</string>
     <string name="display_category_title" msgid="685461049938269166">"Paparan"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Untuk mengezum"</b>", ketik skrin 3 kali dengan cepat.\n"<ul><li>"Seret sekurang-kurangnya 2 jari untuk menatal"</li>\n<li>"Cubit menggunakan sekurang-kurangnya 2 jari untuk melaraskan zum"</li></ul>\n\n<b>"Untuk mengezum sementara"</b>", ketik skrin 3 kali dengan cepat dan tahan jari anda pada ketikan yang ketiga.\n"<ul><li>"Seret untuk beralih-alih di sekitar skrin"</li>\n<li>"Angkat jari untuk mengezum keluar"</li></ul>\n\n"Anda tidak boleh mengezum masuk pada papan kekunci dan bar navigasi."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Apabila pembesaran dihidupkan, gunakan butang Kebolehaksesan di bahagian bawah skrin untuk membuat pembesaran dengan cepat.\n\n"<b>"Untuk mengezum"</b>", ketik butang Kebolehaksesan, kemudian ketik di mana-mana pada skrin.\n"<ul><li>"Seret sekurang-kurangnya 2 jari untuk menatal"</li>\n<li>"Cubit menggunakan sekurang-kurangnya 2 jari untuk melaraskan zum"</li></ul>\n\n<b>"Untuk mengezum sementara"</b>", ketik butang Kebolehaksesan, kemudian sentuh &amp; tahan di mana-mana pada skrin.\n"<ul><li>"Seret untuk beralih-alih di sekitar skrin"</li>\n<li>"Angkat jari untuk mengezum keluar"</li></ul>\n\n"Anda tidak boleh mengezum masuk pada papan kekunci atau bar navigasi."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Butang Kebolehaksesan ditetapkan kepada <xliff:g id="SERVICE">%1$s</xliff:g>. Untuk menggunakan pembesaran, sentuh &amp; tahan butang Kebolehaksesan, kemudian pilih pembesaran."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Pintasan kebolehaksesan"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Pintasan kekunci kelantangan"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Perkhidmatan pintasan"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Benarkan dari skrin kunci"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Apabila pintasan dihidupkan, anda boleh menekan kedua-dua butang kelantangan selama 3 saat untuk memulakan ciri kebolehaksesan."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Apabila pintasan dihidupkan, anda boleh menekan kedua-dua kekunci kelantangan selama 3 saat untuk memulakan ciri kebolehaksesan."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Teks kontras tinggi"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Auto kemas kini pembesaran skrin"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Kemas kini pembesaran skrin pada peralihan apl"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Mungkin menjejaskan prestasi"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klik selepas penuding berhenti bergerak"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Lengah sebelum klik"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"HIDUP"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"MATI"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Tunjukkan dalam Tetapan Pantas"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"pilihan <xliff:g id="NUMBER">%1$d</xliff:g> dari <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> dari <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Pilih semua"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Urus pelan"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Penggunaan data"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Penggunaan data apl"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Cara pengiraan data pembawa mungkin berbeza dengan peranti anda."</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Rangkaian mudah alih"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Rangkaian Wi-Fi bermeter"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Untuk memilih rangkaian bermeter, hidupkan Wi-Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatik"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Bermeter"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Tidak bermeter"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Cara pengiraan data pembawa mungkin berbeza dengan peranti anda."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Panggilan kecemasan"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Kembali ke panggilan"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Panggil Pengurus"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Siaran kecemasan"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Makluman kecemasan"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Pengendali rangkaian"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Nama titik capaian"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Mod 4G LTE Dipertingkat"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"SIM pilihan untuk"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Tanya setiap kali"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Pemilihan diperlukan"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Pilihan SIM"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Tetapan"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">Tunjukkan %d item yang tersembunyi</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Pemberitahuan apl"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategori pemberitahuan"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Kepentingan"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Biarkan apl yang menentukan"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Benarkan bunyi"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Jangan sekali-kali tunjukkan pemberitahuan"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Tiada gangguan bunyi atau visual"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Tiada bunyi"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Berbunyi"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Berbunyi dan paparkan pada skrin"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Paparkan pada skrin"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Rendah"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Sederhana"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Tinggi"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Segera"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Benarkan bunyi"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Jangan berbunyi, bergetar atau mengintai pemberitahuan ini sehingga kelihatan pada skrin semasa."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Benarkan gangguan"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Benarkan apl membuat bunyi, bergetar dan/atau memaparkan pemberitahuan pada skrin"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Kepentingan rendah"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Kepentingan sederhana"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Kepentingan tinggi"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip gambar dalam"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Gambar dalam gambar"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Benarkan gambar dalam gambar"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Benarkan apl ini membuat tetingkap gambar dalam gambar semasa apl ini dibuka atau setelah anda meninggalkan apl (contohnya, untuk meneruskan tontonan video). Tetingkap ini dipaparkan di sebelah atas apl lain yang anda gunakan."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Benarkan apl ini membuat tetingkap gambar dalam gambar semasa apl ini dibuka atau setelah anda meninggalkan apl (contohnya, untuk meneruskan tontonan video). Tetingkap ini dipaparkan di sebelah atas apl lain yang anda gunakan."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Akses Jangan Ganggu"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Tiada sebarang apl yang terpasang meminta akses Jangan Ganggu"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Memuatkan apl..."</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Memindahkan fail"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Memindahkan foto (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Menggunakan peranti sebagai MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Pencerminan SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Semakan latar belakang"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Akses latar belakang penuh"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Gunakan teks daripada skrin"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Tetapkan jadual Cahaya Malam"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Warna skrin ambar membantu anda tidur"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Cahaya Malam dihidupkan"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Warna skrin ialah kuning jingga. Ini dapat membantu anda tidur."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Cadangan"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gunakan warna paparan yang lebih sejuk"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Untuk mengenakan perubahan warna, matikan skrin"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Untuk menggunakan perubahan telephony monitor, but semula peranti"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Camera HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Untuk menggunakan perubahan Camera HAL HDR+, but semula peranti"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Penderia Laser Kamera"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Kemas kini sistem automatik"</string>
     <string name="usage" msgid="2977875522080448986">"Penggunaan"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Penggunaan data mudah alih"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Amaran data"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Tetapkan had data"</string>
     <string name="data_limit" msgid="1885406964934590552">"Had data"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> digunakan antara <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> digunakan <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurasikan"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Apl lain yang termasuk dalam penggunaan"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Padamkan dan tukar"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Tetapkan semula had kadar ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Had kadar ShortcutManager telah ditetapkan semula"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Kawal pemberitahuan skrin kunci"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Kawal maklumat pada 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="8483187649355540109">"Sokongan &amp; petua"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Tiada apl terpasang yang telah meminta akses SMS Premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"SMS Premium bukan percuma dan cajnya akan ditambahkan pada bil pembawa anda. Jika anda mendayakan kebenaran untuk apl, anda akan dapat menghantar SMS premium menggunakan apl itu."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Akses SMS Premium"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Tidak kelihatan kepada peranti lain"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Mati"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Dihubungkan ke <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Dihubungkan ke berbilang peranti"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Mod tunjuk cara UI sistem"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Apl segera"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Buka pautan dalam apl, meskipun tidak dipasang"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Apl segera"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Akaun apl segera"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Pilihan Apl Segera"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Apl yang dipasang"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Storan anda kini diurus oleh pengurus storan"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Akaun untuk <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"VPN sentiasa hidup dihidupkan dalam profil peribadi anda"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"VPN sentiasa hidup dihidupkan dalam profil kerja anda"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proksi HTTP global ditetapkan"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Bukti kelayakan dipercayai"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Bukti kelayakan dipercayai"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Bukti kelayakan dipercayai dalam profil peribadi anda"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Bukti kelayakan dipercayai dalam profil kerja anda"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Minimum <xliff:g id="COUNT_1">%d</xliff:g> sijil CA</item>
       <item quantity="one">Minimum <xliff:g id="COUNT_0">%d</xliff:g> sijil CA</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Maklumat Peruntukan Pembawa"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Cetus Peruntukan Pembawa"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Apakah yang baharu dan menarik?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Lihatlah 5 ciri teratas"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Teroka telefon baharu anda"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Teroka tablet baharu anda"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Teroka peranti baharu anda"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Video ini tidak tersedia pada peranti ini"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Keadaan pendaftaran IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Berdaftar"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Tidak didaftarkan"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index e43115d..cd01e04 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s သည် သင်၏ စာများကို ရယူအသုံးပြုလိုသည်။ %2$s ကို အသုံးပြုခွင့် ပေးမည်လား?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM ကဒ် သုံးခွင့် တောင်းဆိုမှု"</string>
     <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="bluetooth_device_name_summary" msgid="4757990010751789977">"အခြားစက်ပစ္စည်းများက \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' အဖြစ် မြင်တွေ့ရပါလိမ့်မည်"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"အခြားစက်ပစ္စည်းများက \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' အဖြစ် မြင်ရပါမည်"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"သင်၏ စက်ပစ္စည်းများ"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"စက်ပစ္စည်းအသစ်ကို တွဲချိတ်ရန်"</string>
     <string name="date_and_time" msgid="9062980487860757694">"ရက်စွဲနှင့် အချိန်"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"ရှေ့သို့"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"လက်ဗွေထည့်သွင်းမှု ကျော်မလား။"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"လက်ဗွေသတ်မှတ်မှုသည် မိနစ်အနည်းငယ်သာ ကြာပါသည်။ ၎င်းကိုကျော်လိုက်လျှင် သင့်လက်ဗွေကို နောင်တွင် ဆက်တင်များ၌ ထည့်သွင်းနိုင်ပါသည်။"</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"မျက်နှာပြင်လော့ခ် ကျော်မလား။"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"စက်ပစ္စည်းကာကွယ်ရန် ဝန်ဆောင်မှုများ ပွင့်မည်မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင်၊ ခိုးခံရလျှင် သို့မဟုတ် ပြင်ဆင်သတ်မှတ်ခံရလျှင် ဤတက်ဘလက်ကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည်မဟုတ်ပါ။"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"စက်ပစ္စည်းကာကွယ်ရန် ဝန်ဆောင်မှုများ ပွင့်မည်မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင်၊ ခိုးခံရလျှင် သို့မဟုတ် ပြင်ဆင်သတ်မှတ်ခံရလျှင် ဤစက်ပစ္စည်းကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည်မဟုတ်ပါ။"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"စက်ပစ္စည်းကာကွယ်ရန် ဝန်ဆောင်မှုများ ပွင့်မည်မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင်၊ ခိုးခံရလျှင် သို့မဟုတ် ပြင်ဆင်သတ်မှတ်ခံရလျှင် ဤဖုန်းကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည်မဟုတ်ပါ။"</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"အများဆုံးထည့်နိုင်သည့် လက်ဗွေရာအရေအတွက်အထိ ထည့်သွင်းပြီးဖြစ်သည်"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"နောက်ထပ်လက်ဗွေရာများ ထည့်၍မရတော့ပါ"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"လက်ဗွေ အားလုံးကို ဖယ်ရှားရမလား?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' ကိုဖယ်ရှားရန်"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"ဤလက်ဗွေရာကို ဖျက်လိုပါသလား။"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"သင့်လက်ဗွေကို အသုံးပြု၍ ဖုန်းကို လော့ခ်ဖွင့်ခြင်း၊ ဝယ်ယူမှုများကို ခွင့်ပြုပေးခြင်း သို့မဟုတ် ၎င်းဖြင့် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ခြင်းများ ပြုလုပ်၍ ရမည်မဟုတ်ပါ"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"သင့်လက်ဗွေကို အသုံးပြု၍ အလုပ်ပရိုဖိုင်ကို လော့ခ်ဖွင့်ခြင်း၊ ဝယ်ယူမှုများကို ခွင့်ပြုပေးခြင်း သို့မဟုတ် ၎င်းဖြင့် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ခြင်းများ ပြုလုပ်၍ ရမည်မဟုတ်ပါ"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"ဖယ်ရှားပါ"</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"လုံခြုံရေး ပိုမိုကောင်းမွန်စေရန် မျက်နှာပြင်လော့ခ်ချခြင်း အရန်နည်းလမ်းတစ်ခုကို သတ်မှတ်ပါ။"</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"လုံခြုံရေး ပိုမိုကောင်းမွန်စေရန် မျက်နှာပြင်လော့ခ်ချခြင်း အရန်နည်းလမ်းတစ်ခုကို သတ်မှတ်ပါ။"</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>
@@ -497,37 +502,37 @@
     <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_fingerprint" msgid="8212242533942400457">"ကိရိယာအား ကာကွယ်ရေး အင်္ဂါရပ်များမှာ သင်၏ ပုံစံမရှိဘဲ အလုပ်မလုပ်နိုင်ပါ။ <xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"စက်ပစ္စည်းကို အကာအကွယ်ပေးသည့် ဝန်ဆောင်မှုများမှာ သင်၏ ပုံစံမပါဘဲ အလုပ်မလုပ်နိုင်ပါ။<xliff:g id="EMPTY_LINE">
 
-</xliff:g> သင်၏ သိမ်းဆည်းထားသည့် လက်ဗွေများကိုပါ ကိရိယာထဲမှ ဖယ်ရှားလိုက်လျက် သင်သည် ၎င်းတို့ဖြင့် သင်၏ ဖုန်းကို သော့ဖွင့်ခြင်း၊ ဈေးဝယ်မှုကို အတည်ပြုခြင်း၊ သို့မဟုတ် အက်ပ်များထဲသို့ လက်မှတ်ထိုးဝင်ခြင်းကို မလုပ်နိုင်တော့ပါ။\""</string>
+</xliff:g>သိမ်းဆည်းထားသော သင့်လက်ဗွေများကိုပါ ဤပရိုဖိုင်မှ ဖယ်ရှားလိုက်မည် ဖြစ်ပြီး သင်၏ပရိုဖိုင်ကို ဖွင့်ခြင်း၊ ဝယ်ယူမှုများကို ခွင့်ပြုခြင်း သို့မဟုတ် ၎င်းတို့ဖြင့် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ခြင်းများ ပြုလုပ်နိုင်တော့မည် မဟုတ်ပါ။"</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">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"စက်ပစ္စည်းကို အကာအကွယ်ပေးသည့် ဝန်ဆောင်မှုများမှာ သင်၏ ပင်နံပါတ်မပါဘဲ အလုပ်မလုပ်နိုင်ပါ။<xliff:g id="EMPTY_LINE">
 
-</xliff:g> သင်၏ သိမ်းဆည်းထားသည့် လက်ဗွေများကိုပါ ကိရိယာထဲမှ ဖယ်ရှားလိုက်လျက် သင်သည် ၎င်းတို့ဖြင့် သင်၏ ဖုန်းကို သော့ဖွင့်ခြင်း၊ ဈေးဝယ်မှုကို အတည်ပြုခြင်း၊ သို့မဟုတ် အက်ပ်များထဲသို့ လက်မှတ်ထိုးဝင်ခြင်းကို မလုပ်နိုင်တော့ပါ။\""</string>
+</xliff:g>သိမ်းဆည်းထားသော သင့်လက်ဗွေများကိုပါ ဤပရိုဖိုင်မှ ဖယ်ရှားလိုက်မည် ဖြစ်ပြီး သင်၏ပရိုဖိုင်ကို ဖွင့်ခြင်း၊ ဝယ်ယူမှုများကို ခွင့်ပြုခြင်း သို့မဟုတ် ၎င်းတို့ဖြင့် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ခြင်းများ ပြုလုပ်နိုင်တော့မည် မဟုတ်ပါ။"</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"စက်ပစ္စည်းကို အကာအကွယ်ပေးသည့် ဝန်ဆောင်မှုများမှာ သင်၏ စကားဝှက်မပါဘဲ အလုပ်မလုပ်နိုင်ပါ။<xliff:g id="EMPTY_LINE">
 
-</xliff:g> သင်၏ သိမ်းဆည်းထားသည့် လက်ဗွေများကိုပါ ကိရိယာထဲမှ ဖယ်ရှားလိုက်လျက် သင်သည် ၎င်းတို့ဖြင့် သင်၏ ဖုန်းကို သော့ဖွင့်ခြင်း၊ ဈေးဝယ်မှုကို အတည်ပြုခြင်း၊ သို့မဟုတ် အက်ပ်များထဲသို့ လက်မှတ်ထိုးဝင်ခြင်းကို မလုပ်နိုင်တော့ပါ။\""</string>
+</xliff:g>သိမ်းဆည်းထားသော သင့်လက်ဗွေများကိုပါ ဤပရိုဖိုင်မှ ဖယ်ရှားလိုက်မည် ဖြစ်ပြီး သင်၏ပရိုဖိုင်ကို ဖွင့်ခြင်း၊ ဝယ်ယူမှုများကို ခွင့်ပြုခြင်း သို့မဟုတ် ၎င်းတို့ဖြင့် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ခြင်းများ ပြုလုပ်နိုင်တော့မည် မဟုတ်ပါ။"</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"စက်ပစ္စည်းကို အကာအကွယ်ပေးသည့် ဝန်ဆောင်မှုများမှာ မျက်နှာပြင်လော့ခ်မပါဘဲ အလုပ်မလုပ်နိုင်ပါ။<xliff:g id="EMPTY_LINE">
 
-</xliff:g> သင်၏ သိမ်းဆည်းထားသည့် လက်ဗွေများကိုပါ ကိရိယာထဲမှ ဖယ်ရှားလိုက်လျက် သင်သည် ၎င်းတို့ဖြင့် သင်၏ ဖုန်းကို သော့ဖွင့်ခြင်း၊ ဈေးဝယ်မှုကို အတည်ပြုခြင်း၊ သို့မဟုတ် အက်ပ်များထဲသို့ လက်မှတ်ထိုးဝင်ခြင်းကို မလုပ်နိုင်တော့ပါ။\""</string>
+</xliff:g>သိမ်းဆည်းထားသော သင့်လက်ဗွေများကိုပါ ဤပရိုဖိုင်မှ ဖယ်ရှားလိုက်မည် ဖြစ်ပြီး သင်၏ပရိုဖိုင်ကို ဖွင့်ခြင်း၊ ဝယ်ယူမှုများကို ခွင့်ပြုခြင်း သို့မဟုတ် ၎င်းတို့ဖြင့် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ခြင်းများ ပြုလုပ်နိုင်တော့မည် မဟုတ်ပါ။"</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"သင့်ပုံစံမပါဘဲ ပရိုဖိုင်ကာကွယ်မှုအင်္ဂါရပ် အလုပ်လုပ်မည်မဟုတ်ပါ။"</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"သင့်ပုံစံမပါဘဲ ပရိုဖိုင်ကာကွယ်မှုအင်္ဂါရပ် အလုပ်လုပ်မည်မဟုတ်ပါ။ <xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"ပရိုဖိုင်ကို အကာအကွယ်ပေးသည့် ဝန်ဆောင်မှုများမှာ သင်၏ ပုံစံမပါဘဲ အလုပ်မလုပ်နိုင်ပါ။<xliff:g id="EMPTY_LINE">
 
-</xliff:g>သိမ်းဆည်းထားသည့် သင့်လက်ဗွေများကိုလည်း ဤပရိုဖိုင်မှ ဖယ်ရှားလိုက်မည်ဖြစ်ပြီး ၎င်းတို့ဖြင့် သင့်ပရိုဖိုင်ကိုသော့ဖွင့်ခြင်း၊ ဝယ်ယူမှုများကို ခွင့်ပြုခြင်း၊ သို့မဟုတ် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ခြင်းများ ပြုလုပ်၍ရမည်မဟုတ်ပါ။\""</string>
+</xliff:g>သိမ်းဆည်းထားသော သင့်လက်ဗွေများကိုပါ ဤပရိုဖိုင်မှ ဖယ်ရှားလိုက်မည် ဖြစ်ပြီး သင်၏ပရိုဖိုင်ကို ဖွင့်ခြင်း၊ ဝယ်ယူမှုများကို ခွင့်ပြုခြင်း သို့မဟုတ် ၎င်းတို့ဖြင့် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ခြင်းများ ပြုလုပ်နိုင်တော့မည် မဟုတ်ပါ။"</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"သင့်ပင်နံပါတ်မပါဘဲ ပရိုဖိုင်ကာကွယ်မှုအင်္ဂါရပ် အလုပ်လုပ်မည်မဟုတ်ပါ။"</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"သင့်ပင်နံပါတ်မပါဘဲ ပရိုဖိုင်ကာကွယ်မှုအင်္ဂါရပ် အလုပ်လုပ်မည်မဟုတ်ပါ။ <xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"ပရိုဖိုင်ကို အကာအကွယ်ပေးသည့် ဝန်ဆောင်မှုများမှာ သင်၏ ပင်နံပါတ်မပါဘဲ အလုပ်မလုပ်နိုင်ပါ။<xliff:g id="EMPTY_LINE">
 
-</xliff:g>သိမ်းဆည်းထားသည့် သင့်လက်ဗွေများကိုလည်း ဤပရိုဖိုင်မှ ဖယ်ရှားလိုက်မည်ဖြစ်ပြီး ၎င်းတို့ဖြင့် သင့်ပရိုဖိုင်ကိုသော့ဖွင့်ခြင်း၊ ဝယ်ယူမှုများကို ခွင့်ပြုခြင်း၊ သို့မဟုတ် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ခြင်းများ ပြုလုပ်၍ရမည်မဟုတ်ပါ။\""</string>
+</xliff:g>သိမ်းဆည်းထားသော သင့်လက်ဗွေများကိုပါ ဤပရိုဖိုင်မှ ဖယ်ရှားလိုက်မည် ဖြစ်ပြီး သင်၏ပရိုဖိုင်ကို ဖွင့်ခြင်း၊ ဝယ်ယူမှုများကို ခွင့်ပြုခြင်း သို့မဟုတ် ၎င်းတို့ဖြင့် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ခြင်းများ ပြုလုပ်နိုင်တော့မည် မဟုတ်ပါ။"</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"သင့်စကားဝှက်မပါဘဲ ပရိုဖိုင်ကာကွယ်မှုအင်္ဂါရပ် အလုပ်လုပ်မည်မဟုတ်ပါ။"</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"သင့်စကားဝှက်မပါဘဲ ပရိုဖိုင်ကာကွယ်မှုအင်္ဂါရပ် အလုပ်လုပ်မည်မဟုတ်ပါ။ <xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"ပရိုဖိုင်ကို အကာအကွယ်ပေးသည့် ဝန်ဆောင်မှုများမှာ သင်၏ စကားဝှက်မပါဘဲ အလုပ်မလုပ်နိုင်ပါ။<xliff:g id="EMPTY_LINE">
 
-</xliff:g>သိမ်းဆည်းထားသည့် သင့်လက်ဗွေများကိုလည်း ဤပရိုဖိုင်မှ ဖယ်ရှားလိုက်မည်ဖြစ်ပြီး ၎င်းတို့ဖြင့် သင့်ပရိုဖိုင်ကိုသော့ဖွင့်ခြင်း၊ ဝယ်ယူမှုများကို ခွင့်ပြုခြင်း၊ သို့မဟုတ် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ခြင်းများ ပြုလုပ်၍ရမည်မဟုတ်ပါ။\""</string>
+</xliff:g>သိမ်းဆည်းထားသော သင့်လက်ဗွေများကိုပါ ဤပရိုဖိုင်မှ ဖယ်ရှားလိုက်မည် ဖြစ်ပြီး သင်၏ပရိုဖိုင်ကို ဖွင့်ခြင်း၊ ဝယ်ယူမှုများကို ခွင့်ပြုခြင်း သို့မဟုတ် ၎င်းတို့ဖြင့် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ခြင်းများ ပြုလုပ်နိုင်တော့မည် မဟုတ်ပါ။"</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"သင့်မျက်နှာပြင်သော့ခတ်မှုမပါဘဲ ပရိုဖိုင်ကာကွယ်မှုအင်္ဂါရပ် အလုပ်လုပ်မည်မဟုတ်ပါ။"</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"သင့်မျက်နှာပြင်သော့ခတ်မှုမပါဘဲ ပရိုဖိုင်ကာကွယ်မှုအင်္ဂါရပ် အလုပ်လုပ်မည်မဟုတ်ပါ။ <xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"ပရိုဖိုင်ကို အကာအကွယ်ပေးသည့် ဝန်ဆောင်မှုများမှာ မျက်နှာပြင်လော့ခ်မပါဘဲ အလုပ်မလုပ်နိုင်ပါ။<xliff:g id="EMPTY_LINE">
 
-</xliff:g>သိမ်းဆည်းထားသည့် သင့်လက်ဗွေများကိုလည်း ဤပရိုဖိုင်မှ ဖယ်ရှားလိုက်မည်ဖြစ်ပြီး ၎င်းတို့ဖြင့် သင့်ပရိုဖိုင်ကိုသော့ဖွင့်ခြင်း၊ ဝယ်ယူမှုများကို ခွင့်ပြုခြင်း၊ သို့မဟုတ် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ခြင်းများ ပြုလုပ်၍ရမည်မဟုတ်ပါ။\""</string>
+</xliff:g>သိမ်းဆည်းထားသော သင့်လက်ဗွေများကိုပါ ဤပရိုဖိုင်မှ ဖယ်ရှားလိုက်မည် ဖြစ်ပြီး သင်၏ပရိုဖိုင်ကို ဖွင့်ခြင်း၊ ဝယ်ယူမှုများကို ခွင့်ပြုခြင်း သို့မဟုတ် ၎င်းတို့ဖြင့် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ခြင်းများ ပြုလုပ်နိုင်တော့မည် မဟုတ်ပါ။"</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"ဖယ်ရှားပါ"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"သော့ဖွင့်ရန်ပုံဖော်မှုအား ပြောင်းမည်"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ပင်နံပါတ်ပြောင်းမည်"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"အစဉ်လိုက်ဖြစ်နေသော ဂဏန်း အငယ်မှအကြီး၊ အကြီးမှအငယ် သို့မဟုတ် ထပ်နေသည့် နံပါတ်စဉ်များကို ခွင့်မပြုပါ"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"အိုကေ"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"မလုပ်တော့"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"ရှင်းထုတ်ရန်"</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>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPSရရှိုနိုင်သည်"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPSရရှိုနိုင်သည်)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"သင်၏ ကွန်ရက် စကားဝှက်ကို ထည့်သွင်းရန်"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"ဖုန်းကုမ္ပဏီ Wi‑Fi ကွန်ရက်"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> မှတစ်ဆင့် ချိတ်ဆက်ရန်"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"တည်နေရာ တိကျမှုနှင့် တခြားရည်ရွယ်ချက်များအတွက် ပိုကောင်းစေရန် <xliff:g id="APP_NAME">%1$s</xliff:g> သည် ဝိုင်ဖိုင်ပိတ်ထားချိန်မှာပင်လျှင် ကွန်ရက်ရှာဖွေမှုကို ဖွင့်လိုသည်။\n\n အခြား ရှာဖွေလိုသော အပလီကေးရှင်းအားလုံးကို ခွင့်ပြုရမည်လား?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ဒါကို ပိတ်ရန်၊ လျှံစီး မီနူးထဲက အဆင့်မြင့် ဆီကို သွားပါ။"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ခွင့်ပြုရန်"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"ချိတ်ဆက်ရန်"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ကွန်ရက်ကို ချိတ်ဆက်ရန် မအောင်မြင်ခဲ့ပါ"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"မေ့ပစ်ရန်"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"ပြင်ဆင်ရန်"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"ကွန်ရက် မေ့ပစ်ရန် မအောင်မြင်ခဲ့ပါ"</string>
     <string name="wifi_save" msgid="3331121567988522826">"သိမ်းရန်"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"ကွန်ရက်ကို မှတ်သားရန် မအောင်မြင်ခဲ့ပါ"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"အဆင့်မြင့် Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC လိပ်စာ"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"အိုင်ပီလိပ်စာ"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"ကွန်ရက် အချက်အလက်"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet ကွင်းဆက်နံပါတ်"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 လိပ်စာများ"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ဖိတ်ကြားချက် ဖျက်သိမ်းမည်လား?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g> နှင့် ချိတ်ဆက်ရန် ဖိတ်ကြားချက်ကို သင်ဖျက်သိမ်းချင်သလား?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ဤအုပ်စုကိုမေ့ပစ်မည်လား?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"ခရီးဆောင် Wi-Fi  ဟော့စပေါ့"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi ဟော့စပေါ့"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"အင်တာနက် သို့မဟုတ် ပါဝင်သည့်အကြောင်းအရာများကို အခြားစက်ပစ္စည်းများနှင့် မျှဝေထားခြင်းမရှိပါ"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"ဤတက်ဘလက်၏ အင်တာနက်ကို ဟော့စပေါ့မှ တစ်ဆင့် မျှဝေနေပါသည်"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"ဤဖုန်း၏ အင်တာနက်ကို ဟော့စပေါ့မှ တစ်ဆင့် မျှဝေနေပါသည်"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"အက်ပ်သည် ပါဝင်သည့်အကြောင်းအရာများကို မျှဝေနေပါသည်။ အင်တာနက်ကို မျှဝေရန် ဟော့စပေါ့ကို ပိတ်ပြီး ပြန်ဖွင့်ပါ"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi အမည်"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"ဟော့စပေါ့အမည်"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ကို ဖွင့်နေပါသည်..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"အခြားစက်ပစ္စည်းများက <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> နှင့် ချိတ်ဆက်နိုင်ပါသည်"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi‑Fi စကားဝှက်"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"ဟော့စပေါ့စကားဝှက်"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP လိုင်း"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"သင်၏ အခြားစက်ပစ္စည်းများအတွက် Wi‑Fi ကွန်ရက်ကို ဖွင့်ပေးရန် ဟော့စပေါ့ကို အသုံးပြုပါ။ ဟော့စပေါ့က သင်၏ မိုဘိုင်းဒေတာဆက်သွယ်မှုကို အသုံးပြုပြီး အင်တာနက်ကို ဖန်တီးပေးနိုင်ပါသည်။ မိုဘိုင်းဒေတာသုံးစွဲခ ပိုကုန်ကျနိုင်ပါသည်။"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ပါဝင်သည့်အကြောင်းအရာများကို အနီးတစ်ဝိုက်ရှိ စက်ပစ္စည်းများနှင့် မျှဝေရန်အတွက် အက်ပ်များက ဟော့စပေါ့တစ်ခု ဖွင့်နိုင်ပါသည်။"</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"သင့်ရွေးချယ်မှု သိုမ့ဟုတ်  စစ်ဂနယ် အားရှိမှုပေါ် မူတည်လျှက်၊ ဝိုင်ဖိုင်ခေါ်ဆိုမှု ဖွင့်ထားပါက၊ သင့်ဖုန်းသည် ဝိုင်ဖိုင်ကွန်ယက်များ သို့မဟုတ် သင့် မိုဘိုင်းဝန်ဆောင်မှုဌာန၏ ကွန်ယက်မှတဆင့် ခေါ်ဆိုမှုများအား ပေးပို့နိုင်သည်။ ဤလုပ်ဆောင်နိုင်ချက်အား မဖွင့်မီ၊ ကျသင့်ငွေနှင့် အခြားအသေးစိတ်များအတွက် သင့် မိုဘိုင်းဝန်ဆောင်မှုဌာနအား မေးမြန်းပါ။"</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"အရေးပေါ်လိပ်စာကို အပ်ဒိတ်လုပ်ပါ"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"WiFi ကို အသုံးပြု၍ ၉၁၁ သို့ ဖုန်းခေါ်ဆိုသည့်အခါ သင့်တည်နေရာအဖြစ် အရေးပေါ်ဝန်ဆောင်မှုများမှ အသုံးပြုသည့် လိပ်စာ"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"Wi‑Fi သုံး၍ အရေးပေါ်ဖုန်းခေါ်သောအခါ အရေးပေါ်ဝန်ဆောင်မှုများက သင့်တည်နေရာအဖြစ် အသုံးပြုသော လိပ်စာ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ဖန်သားပြင်"</string>
     <string name="sound_settings" msgid="5534671337768745343">"အသံ"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"အသံအတိုးအကျယ်"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"ရှာဖွေခြင်း"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"ရှာဖွေခြင်းဆက်တင်နှင့် မှတ်တမ်းအား စီမံမည်"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"ရလဒ် တစ်ခုမျှ မရှိပါ"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"မှတ်တမ်းကို ရှင်းလင်းရန်"</string>
     <string name="display_settings" msgid="7965901687241669598">"ဖန်သားပြင်"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"မျက်နှာပြင်ကို အော်တိုလှည့်ရန်"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"တောက်ပသော အရောင်များ"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"မူရင်း APNဆက်တင်များကိုပြန်လည်ရယူစေမည်"</string>
     <string name="menu_restore" msgid="8260067415075573273">"စနစ်အား မူလစက်ရုံအခြအေနေထံ ပြန်လည်သတ်မှတ်ရန်"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"APN ၏မူရင်းအပြင်အဆင်များကို အစသို့ပြန်လည်စတင်မှုအား ပြီးဆုံးပါပြီ"</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"ပြန်လည်သတ်မှတ်ခြင်း"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"ကွန်ရက်ဆက်တင်များ ပြန်လည်သတ်မှတ်ရန်"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"ပြန်သတ်မှတ်ရန်ရွေးစရာများ"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"ကွန်ရက်၊ အက်ပ် (သို့) ကိရိယာများကို ပြင်ဆင်သတ်မှတ်နိုင်ပါသည်"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi၊ မိုဘိုင်းနှင့် ဘလူးတုသ်ကို ပြင်ဆင်သတ်မှတ်ရန်"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"၎င်းသည် အောက်ပါတို့အပါအဝင် ကွန်ရက်ဆက်တင်များအားလုံးကို ပြင်ဆင်သတ်မှတ်လိုက်ပါမည်−\n\n"<li>"Wi‑Fi"</li>\n<li>"မိုဘိုင်းဒေတာ"</li>\n<li>"ဘလူးတုသ်"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"ဆက်တင်များ ပြန်လည်သတ်မှတ်ရန်"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"ကွန်ရက်ချိန်ညှိချက်များအားလုံးပြန်လည်သတ်မှတ်မည်လား? ဤလုပ်ဆောင်ချက်ကို ပြန်လည်နောက်ပြန်၍ မရပါ!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"ပြန်လည်စတင်ရန် ပြုလုပ်မလား?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"ဤအသုံးပြုသူအတွက် ကွန်ရက်ပြန်လည်သတ်မှတ်မှု မရရှိနိုင်ပါ"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"ကွန်ရက်ချိန်ညှိချက်များ ပြန်လည်သတ်မှတ်ပြီးပါပြီ"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"စက်ရုံထုတ်အခြေအနေပြန်ယူခြင်း"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other">အကောင့် <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> ခုကို ပြင်ဆင်သတ်မှတ်လိုက်ပါမည်</item>
-      <item quantity="one">အကောင့် ၁ ခုကို ပြင်ဆင်သတ်မှတ်လိုက်ပါမည်</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"စက်တွင်းသိုလှောင်ခန်းနှင့် ဒေတာအားလုံးကို ပြင်ဆင်သတ်မှတ်လိုက်ပါမည်"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"ဒေတာအားလုံးကို ဖျက်ရန် (စက်ရုံထုတ်ဆက်တင်အတိုင်း ပြင်ဆင်သတ်မှတ်ရန်)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ဤသည်မှာ သင့်တက်ဘလက်ထဲရှိ"<b></b>"သင့်ဂူးဂဲလ်အကောင့်\n\n"<li>"စနစ်နှင့် အက်ပ်ဒေတာနှင့် ဆက်တင်များ"</li>\n<li>"ဒေါင်းလုပ်ပြုလုပ်ထားသော အက်ပ်"</li>"iအပါအဝင်\n"<li>"စက်အတွင်းသိမ်းဆည်းထားခြင်း"</li>"များကို ဖျက်ပါလိမ့်မည်"</string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ဤသည်က သင့်ဖုန်း၏"<b>"စက်အတွင်းသိုလှောင်မှု"</b>" အပါအဝင် အောက်ပါတို့ကို ဖျက်ပါလိမ့်မည်- \n\n"<li>"သင်၏ Google အကောင့်"</li>\n<li>"စနစ်နှင့် အက်ပ်ဒေတာ၊ ဆက်တင်များ၊"</li>\n<li>"ဒေါင်းလုဒ်လုပ်ထားသည့်အက်ပ်များ"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"သင်သည် လက်ရှိတွင် အောက်ပါအကောင့်များကို ဝင်ရောက်ထားပါသည်\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"လုံခြုံမှုဆိုင်ရာအချက်အလက်များ"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"သင့်တွင်ဒေတာဆက်သွယ်မှုမရှိပါ။ ဤကြောင်းကြားချက်ကိုကြည့်ရန်အတွက် အင်တာနက်ဆက်သွယ်မှုရှိသည့် မည်သည့်ကွန်ပြုတာမှမဆို %sထံသွားပါ။"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ဖွင့်နေဆဲ…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"သင့်စကားဝှက်ကိုရွေးချယ်ပါ"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"မျက်နှာပြင်လော့ခ်တစ်ခုကို သတ်မှတ်ပါ"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"လုံခြုံရေးအတွက် စကားဝှက်တစ်ခု သတ်မှတ်ပါ"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"လက်ဗွေသုံးရန် စကားဝှက်သတ်မှတ်ပါ"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"သင့်ပုံစံအား ရွေးပါ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"လက်ဗွေသုံးရန် ပုံစံသတ်မှတ်ပါ"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"သင့်ပင်နံပါတ်အား ရွေးပါ"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"လုံခြုံရေးအတွက် ပင်နံပါတ်တစ်ခု သတ်မှတ်ပါ"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"လက်ဗွေသုံးရန် ပင်သတ်မှတ်ပါ"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"သင့်စကားဝှက်ကို အတည်ပြုပါ"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"သင့်စကားဝှက်ကို ပြန်ထည့်ပါ"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"သင့်ပုံဖော်မှုကို အတည်ပြုပါ"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"ပင်နံပါတ်ကို  အတည်ပြုပါ"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"သင့်ပင်နံပါတ်ကို ပြန်ထည့်ပါ"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"စကားဝှက်များ မတူပါ။"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"ပင်နံပါတ် မတူပါ။"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"လော့ခ်ဖွင့်ရန် ရွေးချယ်မှု"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"ဆက်လက်လုပ်ဆောင်ရန် သင်၏အလုပ်ပုံစံကို သုံးပါ"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"ဆက်လက်လုပ်ဆောင်ရန် သင့် အလုပ် ပင်နံပါတ်ကို ရိုက်ထည့်ပါ"</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">"ဆက်လုပ်ရန် သင့်စက်ပစ္စည်း၏ ပင်နံပါတ်ကို ထည့်ပါ။ စက်ပစ္စည်း ပြန်စပြီးနောက် ၎င်းကိုလိုအပ်ပါသည်။"</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">"ဆက်လုပ်ရန် သင့်အလုပ် ပင်နံပါတ်ကို ထည့်ပါ။ စက်ပစ္စည်း ပြန်စပြီးနောက် ၎င်းကိုလိုအပ်ပါသည်။"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"ဆက်လုပ်ရန် သင့်အလုပ် စကားဝှက်ကို ထည့်ပါ။ စက်ပစ္စည်း ပြန်စပြီးနောက် ၎င်းကိုလိုအပ်ပါသည်။"</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"လုံခြုံရေး ပိုကောင်းစေရန် သင်၏ စက်ပစ္စည်းပုံစံကို သုံးပါ"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"လုံခြုံရေး ပိုကောင်းစေရန် သင်၏ စက်ပစ္စည်းပင်နံပါတ်ကို ထည့်ပါ"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"လုံခြုံရေး ပိုကောင်းစေရန် သင်၏ စက်ပစ္စည်းလျှို့ဝှက်စကားလုံးကို ထည့်ပါ"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"လုံခြုံရေး ပိုကောင်းစေရန် သင်၏အလုပ် ပုံစံကို သုံးပါ"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"လုံခြုံရေး ပိုကောင်းစေရန် သင်၏အလုပ် ပင်နံပါတ်ကို ထည့်ပါ"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"လုံခြုံရေး ပိုကောင်းစေရန် သင်၏အလုပ် လျှို့ဝှက်စကားလုံးကို ထည့်ပါ"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"သင့်ဖုန်းကို စက်ရုံဆက်တင်သို့ ပြင်ဆင်သတ်မှတ်ထားပါသည်။ ဤဖုန်းအား အသုံးပြုရန် ယခင် ပုံစံကို ထည့်ပါ။"</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"သင့်ဖုန်းကို စက်ရုံဆက်တင်သို့ ပြင်ဆင်သတ်မှတ်ထားပါသည်။ ဤဖုန်းအားအသုံးပြုရန် ယခင် ပင်နံပါတ်ကို ထည့်ပါ။"</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"သင့်ဖုန်းကို စက်ရုံဆက်တင်သို့ ပြင်ဆင်သတ်မှတ်ထားပါသည်။ ဤဖုန်းအား အသုံးပြုရန် ယခင် စကားဝှက်ကို ထည့်ပါ။"</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"ပုံစံကို အတည်ပြုပါ"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"ပင်နံပါတ်ကို အတည်ပြုပါ"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"စကားဝှက်ကို အတည်ပြုပါ"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"ပင် နံပါတ်အမှား"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"စကားဝှက်အမှား"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"ပုံစံအမှား"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"ဝဒ်ဂျက်ဖန်တီး၍ သုံးစွဲခွင့်ပြုမည်လား ?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"သင် ဝဒ်ဂျက်ကို ဖန်တီးပြီးသောအခါ၊  <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> သည် ဖော်ပြထားသော အချက်အလက်များအားလုံးကို သုံးစွဲနိုင်သည်"</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ကို ဝဒ်ဂျက်များဖန်တီးရန်နှင့် ၎င်းတို့၏ အချက်အလက်များကို ရယူရန် အမြဲခွင့်ပြုသည်။"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>ရက် <xliff:g id="HOURS">%2$d</xliff:g>နာရီ <xliff:g id="MINUTES">%3$d</xliff:g>မိနစ် <xliff:g id="SECONDS">%4$d</xliff:g>စက်ကန့်"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>နာရီ <xliff:g id="MINUTES">%2$d</xliff:g>မိနစ် <xliff:g id="SECONDS">%3$d</xliff:g>စက်ကန့်"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>မိနစ် <xliff:g id="SECONDS">%2$d</xliff:g>စက်ကန့်"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>စက္ကန့်"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"အသုံးပြုမှု၏ ကိန်းဂဏန်းအချက်အလက်"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"အသုံးပြုမှု၏ ကိန်းဂဏန်းအချက်အလက်"</string>
     <string name="display_order_text" msgid="8592776965827565271">"အစဉ်လိုက် စီခြင်း"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"မျက်နှာပြင် ဖတ်စနစ်များ၊ မျက်နှာပြင် ပြသမှု၊ အပြန်အလှန်ဆက်သွယ်ချက် ထိန်းချုပ်မှုများ"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"မြင်ကွင်း ဆက်တင်များ"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"သင့်လိုအပ်ချက်များနှင့် ကိုက်ညီမှုရှိစေရန် ဤစက်ပစ္စည်းကို သင့်စိတ်ကြိုက်ပြင်ဆင်နိုင်သည်။ သုံးရလွယ်သည့် ဤဝန်ဆောင်မှုများကို ဆက်တင်များထဲ၌ နောက်ပိုင်းတွင် ပြောင်းလဲနိုင်သည်။"</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"စာလုံးအရွယ်အစားကို ကြီးအောင်ပြုလုပ်ရန်"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"စာလုံးအရွယ်အစားပြောင်းရန်"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"မျက်နှာပြင် ဖတ်စနစ်များ"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"အသံနှင့် ဖန်သားပြင်ပေါ်ရှိ စာသား"</string>
     <string name="display_category_title" msgid="685461049938269166">"မျက်နှာပြင်ပြသမှု"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"ဇူးမ်ချဲ့ရန်"</b>" မျက်နှာပြင်ကို သုံးချက် အမြန်တို့ပါ။\n"<ul><li>"အပေါ်အောက် လှိမ့်ကြည့်ရန် လက်ချောင်း ၂ ချောင်းနှင့် အထက်ကို အသုံးပြု၍ဖိဆွဲပါ"</li>\n<li>"ဇူးမ်ကို ချိန်ရန် လက်ချောင်း ၂ ချောင်းနှင့် အထက်ကို အသုံးပြု၍ဆွဲကပ်ပါ"</li></ul>\n\n<b>"ယာယီ ဇူးမ်ပြုလုပ်ရန်"</b>" မျက်နှာပြင်ကို သုံးချက်တို့ပြီး တတိယမြောက်အချက်တွင် သင့်လက်ချောင်းကို ဖိထားပါ။\n"<ul><li>"မျက်နှာပြင်ပေါ်တွင် ရွှေ့ကြည့်ရန် ဖိဆွဲပါ"</li>\n<li>"ဇူးမ်ဖြုတ်ရန် လက်ချောင်းကို မ လိုက်ပါ"</li></ul>\n\n"ကီးဘုတ် သို့မဟုတ် လမ်းညွှန်ဘားတန်းပေါ်တွင် ဇူးမ်ချဲ့၍ မရပါ။"</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"ပုံကြီးချဲ့ခြင်းကို ဖွင့်ထားသည့်အခါ အမြန်ချဲ့နိုင်ရန်အတွက် မျက်နှာပြင်အောက်ခြေရှိ အများသုံးစွဲနိုင်မှု ခလုတ်ကို သုံးပါ။\n\n"<b>"ဇူးမ်ဆွဲရန်"</b>" အများသုံးစွဲနိုင်မှု ခလုတ်ကို တို့ပြီး မျက်နှာပြင်၏ မည်သည့်နေရာကိုမဆို တို့လိုက်ပါ။\n"<ul><li>"အပေါ်အောက် လှိမ့်ကြည့်ရန် လက်ချောင်း ၂ ချောင်းနှင့် အထက်ကို အသုံးပြု၍ဖိဆွဲပါ။"</li>\n<li>"ဇူးမ်ကို ချိန်ရန် လက်ချောင်း ၂ ချောင်းနှင့် အထက်ကို အသုံးပြု၍ဆွဲကပ်ပါ။"</li></ul>\n\n<b>"ယာယီဇူးမ်ဆွဲရန်"</b>" အများသုံးစွဲနိုင်မှု ခလုတ်ကို တို့ပြီး မျက်နှာပြင်၏ မည်သည့်နေရာကို မဆို ထိထားပါ။\n"<ul><li>"မျက်နှာပြင်ပေါ်တွင် ရွှေ့ကြည့်ရန် ဖိဆွဲပါ"</li>\n<li>"ဇူးမ်ဖြုတ်ရန် လက်ချောင်းကို မ လိုက်ပါ"</li></ul>\n\n"ကီးဘုတ် သို့မဟုတ် လမ်းညွှန်ဘားတန်းပေါ်တွင် ဇူးမ်ဆွဲ၍ မရပါ။"</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"အများသုံးစွဲနိုင်မှု ခလုတ်ကို <xliff:g id="SERVICE">%1$s</xliff:g> အဖြစ် သတ်မှတ်ထားသည်။ ပုံကြီးချဲ့ခြင်းကို အသုံးပြုရန် အများသုံးစွဲနိုင်မှု ခလုတ်ကို ထိထားပြီးနောက် ပုံကြီးချဲ့ခြင်းကို ရွေးပါ။"</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"အများသုံးစွဲနိုင်မှု ဖြတ်လမ်း"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"အသံခလုတ် ဖြတ်လမ်းလင့်ခ်"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"ဖြတ်လမ်း ဝန်ဆောင်မှု"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"လော့ခ်မျက်နှာပြင်မှ ခွင့်ပြုခြင်း"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"ဖြတ်လမ်းကို ဖွင့်ထားသည့်အခါ အများသုံးစွဲနိုင်မှု ဝန်ဆောင်မှုကို စတင်ရန် အသံအတိုးအလျှော့ ခလုတ်နှစ်ခုလုံးကို ၃ စက္ကန့် ဖိထားနိုင်ပါသည်။"</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"ဖြတ်လမ်းလင့်ခ်ကို ဖွင့်ထားသည့်အခါ အများသုံးစွဲနိုင်မှုဆိုင်ရာ ဝန်ဆောင်မှုကို စတင်ရန် အသံအတိုးအလျှော့ ခလုတ်နှစ်ခုလုံးကို ၃ စက္ကန့်ကြာ ဖိထားနိုင်ပါသည်။"</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">"မျက်နှာပြင်ချဲ့မှု အော်တိုအပ်ဒိတ်"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"အက်ပ် အပြောင်းတွင်မျက်နှာပြင်ချဲ့မှုအပ်ဒိတ်လုပ်ရန်"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"စွမ်းဆောင်ရည် ကျစေနိုင်ပါသည်"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"ညွှန်တံရပ်သွားသည့်အခါ နှိပ်ရန်"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"မနှိပ်မီ စောင့်ချိန်"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ဖွင့်ပါ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ပိတ်ထားသည်"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"အမြန်ဆက်တင်များတွင်ပြပါ"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g> ထဲမှ<xliff:g id="NUMBER">%1$d</xliff:g> ရွေးမည်"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g>ထဲမှ <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"အားလုံးရွေးချယ်ရန်"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"အစီအစဉ်များ စီမံရန်"</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>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"မိုဘိုင်းလ်ကွန်ယက်များ"</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_metered_auto" msgid="1262028400911918865">"အလိုအလျောက်"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"မီတာဖြင့် ကောက်ခံသည်"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"မီတာဖြင့်ကောက်ခံခြင်း မဟုတ်ပါ"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"စီမံပေးသူ၏ ဒေတာ စာရင်းမှာ သင့် ကိရိယာ ထဲကနှင့် ခြားနားနိုင်သည်။။"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"အရေးပေါ်ခေါ်ဆိုရန်"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"ခေါ်ဆိုမှုထံပြန်သွားရန်"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"ခေါ်ဆိုမှု မန်နေဂျာ"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"အရေးပေါ် ထုတ်လွှင့်မှုများ"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"အရေးပေါ်သတိပေးချက်များ"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"ကွန်ရက် အော်ပရေတာများ"</string>
     <string name="access_point_names" msgid="1381602020438634481">"ချိတ်ဆက် နေရာ အမည်များ"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"မြှင့်တင်ထား 4G LTE မုဒ်"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"အတွက် ဦးစားပေး ဆင်းမ်"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"အကြိမ်တိုင်းမှာ မေးရန်"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"ရွေးချယ်ရန် လိုအပ်"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"ဆင်းမ် ရွေးချယ်ရန်"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"ဆက်တင်များ"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">ဖျောက်ထားသည့် %d ခုကို ပြပါ</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"အက်ပ်အသိပေးချက်များ"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"အသိပေးချက် အမျိုးအစား"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"အရေးပါမှု"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"အက်ပ်ကို ဆုံးဖြတ်ခွင့်ပေးပါ"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"အသံကို ခွင့်ပြုရန်"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"အကြောင်းကြားချက်များကို ဘယ်တော့မှ မပြပါနှင့်"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"အသံ သို့မဟုတ် ရုပ်ပုံ ဖွင့်ခြင်းတို့ကို မပြုလုပ်လိုပါ"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"အသံမပါ"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"အသံဖွင့်ပါ"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"အသံဖွင့်၍ မျက်နှာပြင်ပေါ်တွင် ပြပါ"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"ဖန်သားပြင်ပေါ်တွင် ပြရန်"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"သိပ်အရေးမကြီး"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"အတော်အသင့်"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"အရေးကြီး"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"အရေးပေါ်"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"အသံကို ခွင့်ပြုရန်"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"အသံပြုခြင်း၊ တုန်ခါခြင်း၊ သို့မဟုတ် လက်ရှိမျက်နှာပြင်တွင် ဤသတိပေးချက်များကို ပြခြင်းများ မပြုလုပ်ပါနှင့်။"</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"ကြားဖြတ်သတိပေးချက်များကို ခွင့်ပြုရန်"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"အက်ပ်အား အသံမြည်ခြင်း၊ တုန်ခါခြင်းနှင့်/ သို့မဟုတ် မျက်နှာပြင်ပေါ်တွင် သတိပေးချက်များဖော်ပြခွင့် ပေးပါ"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"အနည်းငယ်သာ အရေးပါသည်"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"အတန်အသင့် အရေးပါသည်"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"အလွန်အရေးပါသည်"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"တစ်ခုပေါ်တစ်ခု ထပ်၍ ဖွင့်ခြင်း"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"တစ်ခုပေါ်တစ်ခု ထပ်၍ ဖွင့်ခြင်း"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"တစ်ခုပေါ်တစ်ခု ထပ်၍ ဖွင့်ခွင့်ပြုရန်"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"အက်ပ်ပွင့်နေစဉ် သို့မဟုတ် သင်ထွက်လိုက်ချိန်တွင် ဤအက်ပ်အား တစ်ခုပေါ်တစ်ခုထပ်၍ ဖွင့်ခွင့်ပြုပါ (ဥပမာ၊  ဗီဒီယိုဆက်ကြည့်ရန်)။ ဤဝင်းဒိုးသည် သင်သုံးနေသော အခြားအက်များ၏အပေါ်တွင် ပြသပါလိမ့်မည်။"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"အက်ပ်ပွင့်နေစဉ် သို့မဟုတ် ထွက်လိုက်စဉ်တွင် ဤအက်ပ်အား တစ်ခုပေါ်တစ်ခုထပ်၍ ဖွင့်သည့် ဝင်းဒိုးတစ်ခု ပြုလုပ်ခွင့်ပြုပါ (ဥပမာ ဗီဒီယိုဆက်ကြည့်ရန်)။ ဤဝင်းဒိုးကို သင်သုံးနေသော အခြားအက်ပ်များ၏အပေါ်တွင် ပြသပါလိမ့်မည်။"</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>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"ဖိုင်များကို လွှဲပြောင်းရန်"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"ဓာတ်ပုံများ လွှဲပြောင်းနေသည် (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"စက်ပစ္စည်းကို MIDI အဖြစ် အသုံးပြုနေသည်"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS စကရင်ပွားခြင်း"</string>
     <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>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"ညအလင်းရောင် အစီအစဉ်ကို သတ်မှတ်ရန်"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"ပယင်းရောင်စကရင်ကအိပ်ပျော်စေသည်"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"ညအလင်းရောင်ကို ဖွင့်ထားသည်"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"ဖန်သားပြင်ကို ပယင်းရောင်သန်းထားသည်။ ၎င်းက သင့်ကို အိပ်ပျော်သွားစေရန် အထောက်အကူပေးနိုင်ပါသည်။"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"အကြံပြုချက်များ"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"ပိုအေးသည့် မျက်နှာပြင် အရောင်များကိုအသုံးပြုရန်"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"အရောင်ပြောင်းလဲမှု ပြုလုပ်ရန်၊ မျက်နှာပြင်ကိုပိတ်ပါ"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"တယ်လီဖုန်း ဆက်သွယ်မှုမော်နီတာကို ပြောင်းလဲမှု ပြုလုပ်ရန် စက်ပစ္စည်းကို ပြန်လည်စတင်ပါ"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"ကင်မရာ HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"ကင်မရာ HAL HDR+ ပြောင်းလဲမှုကို ပြုလုပ်ရန် စက်ပစ္စည်းကို ပြန်လည်စတင်ပါ"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Camera လေဆာ အာရုံခံကိရိယာ"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"အလိုအလျောက် စနစ်အပ်ဒိတ်များ"</string>
     <string name="usage" msgid="2977875522080448986">"အသုံးပြုမှု"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"မိုဘိုင်းဒေတာ အသုံးပြုမှု"</string>
@@ -3410,7 +3427,7 @@
     <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="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g> တွင် <xliff:g id="ID_1">%1$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">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"ရှင်းလင်းပြီး အသွင်ပြောင်းလဲပါ"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager နှုန်းကန့်သတ်ခြင်းကို ပြန်လည်သတ်မှတ်ပါ"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager နှုန်းကန့်သတ်ခြင်းကို ပြန်လည်သတ်မှတ်ပြီးပါပြီ"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"လော့ခ်မျက်နှာပြင် အကြောင်းကြားချက်များကို ထိန်းချုပ်ပါ"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"လော့ခ်ချမျက်နှာပြင်ရှိ အချက်အလက်များကို ထိန်းချုပ်ရန်"</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="8483187649355540109">"အကူအညီနှင့် နည်းလမ်းများ"</string>
@@ -3487,7 +3504,7 @@
     <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="2456198532288640046">"အခြားစက်ပစ္စည်းများက မတွေ့နိုင်ပါ"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"ပိတ်ထားသည်"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> နှင့် ချိတ်ဆက်ထားပါသည်"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"စက်ပစ္စည်းအများအပြားနှင့် ချိတ်ဆက်ထားပါသည်"</string>
     <string name="demo_mode" msgid="2798762752209330277">"စနစ် UI သရုပ်ပြမုဒ်"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"ချက်ခြင်းသုံး အက်ပ်များ"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"ထည့်သွင်းထားခြင်း မရှိသေးလျှင်ပင် လင့်ခ်များကို အက်ပ်တွင် ဖွင့်ပါသည်"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"ချက်ခြင်းသုံး အက်ပ်များ"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"ချက်ခြင်းသုံးအက်ပ် အကောင့်"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Instant Apps ရွေးချယ်မှုများ"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ထည့်ထားသည့် အက်ပ်များ"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"သင့်သိုလှောင်မှုကို သိုလှောင်မှုမန်နေဂျာက လက်ရှိစီမံခန့်ခွဲနေပါသည်"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> အတွက် အကောင့်များ"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"သင့်ကိုယ်ရေးကိုယ်တာ ပရိုဖိုင်တွင် VPN အမြဲသုံးရန် ကို ဖွင့်ထားသည်"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"သင့်အလုပ်ပရိုဖိုင်တွင် VPN အမြဲသုံးရန်ကို ဖွင့်ထားသည်"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"ကမ္ဘာသုံး HTTP ပရောက်စီကို သတ်မှတ်ထားပါသည်"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"စိတ်ချရသော အထောက်အထားများ"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"စိတ်ချရသော အထောက်အထားများ"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"သင့်ကိုယ်ပိုင်ပရိုဖိုင်ရှိ စိတ်ချရသော အထောက်အထားများ"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"သင့်အလုပ်ပရိုဖိုင်ရှိ စိတ်ချရသော အထောက်အထားများ"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">အနည်းဆုံး CA အသိအမှတ်ပြုလက်မှတ် <xliff:g id="COUNT_1">%d</xliff:g> ခု</item>
       <item quantity="one">အနည်းဆုံး CA အသိအမှတ်ပြုလက်မှတ် <xliff:g id="COUNT_0">%d</xliff:g> ခု</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"ဝန်ဆောင်မှုပေးသူက ပေးထားသည့် အချက်အလက်များ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Carrier Provisioning"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"စိတ်လှုပ်ရှားဖွယ်ရာ အသစ်အဆန်း ရှိပါသလား။"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ထိပ်တန်း ဝန်ဆောင်မှု ၅ မျိုးကို ကြည့်ရန်"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"သင်၏ဖုန်းအသစ်ကို လေ့လာကြည့်ရှုပါ"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"သင်၏တက်ဘလက်အသစ်ကို လေ့လာကြည့်ရှုပါ"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"သင်၏ စက်ပစ္စည်းအသစ်ကို လေ့လာကြည့်ရှုပါ"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"ဤဝန်ဆောင်မှုကို ဤစက်ပစ္စည်းတွင် မရရှိနိုင်ပါ"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS မှတ်ပုံတင်ခြင်း အခြေအနေ"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"မှတ်ပုံတင်ထားသည်"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"မှတ်ပုံတင်မထားပါ"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index f92bdf7..7d316c1 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ønsker adgang til meldingene dine. Vil du gi %2$s tilgang?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Forespørsel om tilgang til SIM-kort"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> vil ha tilgang til SIM-kortet ditt. Hvis du gir tilgang til SIM-kortet, slås datatilkoblingen på enheten av så lenge tillatelsen varer. Gi tilgang til <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Synlig som «<xliff:g id="DEVICE_NAME">^1</xliff:g>» for andre enheter"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Synlig som «<xliff:g id="DEVICE_NAME">^1</xliff:g>» for andre enheter"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Enhetene dine"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Koble til en ny enhet"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Dato og klokkeslett"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Neste"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Hoppe over fingeravtrykk?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Det tar bare et minutt eller to å konfigurere fingeravtrykk. Hvis du hopper over dette, kan du legge til fingeravtrykket ditt senere i innstillingene."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Vil du hoppe over skjermlås?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Funksjoner for enhetsbeskyttelse blir ikke slått på. Du kommer ikke til å kunne forhindre at andre bruker dette nettbrettet hvis du mister det eller det blir stjålet eller tilbakestilt."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Funksjoner for enhetsbeskyttelse blir ikke slått på. Du kommer ikke til å kunne forhindre at andre bruker denne enheten hvis du mister den eller den blir stjålet eller tilbakestilt."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Funksjoner for enhetsbeskyttelse blir ikke slått på. Du kommer ikke til å kunne forhindre at andre bruker denne telefonen hvis du mister den eller den blir stjålet eller tilbakestilt."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Du har lagt til maksimalt antall fingeravtrykk"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Kan ikke legge til flere fingeravtrykk"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Vil du fjerne alle fingeravtrykk?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Fjern «<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>»"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Vil du slette dette fingeravtrykket?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Du kan ikke bruke fingeravtrykk til å låse opp telefonen, autorisere kjøp eller logge på apper"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Du kan ikke bruke fingeravtrykk til å låse opp jobbprofilen din, autorisere kjøp eller logge på jobbapper"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Ja, fjern"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Beskytt nettbrettet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Beskytt enheten"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Beskytt telefonen"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Velg en reserveskjermlås for bedre beskyttelse."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Velg en reserveskjermlås for bedre beskyttelse."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Hindre at andre bruker dette nettbrettet uten din tillatelse, ved å aktivere funksjoner for enhetsbeskyttelse. Velg skjermlåsen du vil bruke."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Hindre at andre bruker denne enheten uten din tillatelse, ved å aktivere funksjoner for enhetsbeskyttelse. Velg skjermlåsen du vil bruke."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Hindre at andre bruker denne telefonen uten din tillatelse, ved å aktivere funksjoner for enhetsbeskyttelse. Velg skjermlåsen du vil bruke."</string>
@@ -497,35 +502,35 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Vil du fjerne enhetsbeskyttelsen?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Vil du fjerne profilbeskyttelsen?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Funksjoner for enhetsbeskyttelse kommer ikke til å fungere uten mønsteret ditt."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Funksjoner for enhetsbeskyttelse kommer ikke til å fungere uten mønsteret ditt.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Funksjonene for enhetsbeskyttelse kommer ikke til å fungere uten mønsteret ditt.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>De lagrede fingeravtrykkene dine blir også slettet fra enheten, og du kommer ikke til å kunne låse opp telefonen din, autorisere kjøp eller logge på apper med dem."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Funksjoner for enhetsbeskyttelse kommer ikke til å fungere uten PIN-koden din."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Funksjoner for enhetsbeskyttelse kommer ikke til å fungere uten PIN-koden din.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Funksjonene for enhetsbeskyttelse kommer ikke til å fungere uten PIN-koden din.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>De lagrede fingeravtrykkene dine blir også slettet fra enheten, og du kommer ikke til å kunne låse opp telefonen din, autorisere kjøp eller logge på apper med dem."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Funksjoner for enhetsbeskyttelse kommer ikke til å fungere uten passordet ditt."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Funksjoner for enhetsbeskyttelse kommer ikke til å fungere uten passordet ditt.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Funksjonene for enhetsbeskyttelse kommer ikke til å fungere uten passordet ditt.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>De lagrede fingeravtrykkene dine blir også slettet fra enheten, og du kommer ikke til å kunne låse opp telefonen, autorisere kjøp eller logge på apper med dem."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Funksjoner for enhetsbeskyttelse kommer ikke til å fungere uten skjermlåsen din."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Funksjoner for enhetsbeskyttelse kommer ikke til å fungere uten skjermlåsen din.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Funksjonene for enhetsbeskyttelse kommer ikke til å fungere uten skjermlåsen din.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>De lagrede fingeravtrykkene dine blir også slettet fra enheten, og du kommer ikke til å kunne låse opp telefonen din, autorisere kjøp eller logge på apper med dem."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Funksjonene for profilbeskyttelse fungerer ikke uten mønsteret ditt."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Funksjonene for profilbeskyttelse fungerer ikke uten mønsteret ditt.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Funksjonene for profilbeskyttelse fungerer ikke uten mønsteret ditt.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>De lagrede fingeravtrykkene dine fjernes også fra denne profilen, og du kommer ikke til å kunne låse opp profilen, autorisere kjøp eller logge på apper med dem."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Funksjonene for profilbeskyttelse fungerer ikke uten PIN-koden din."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Funksjonene for profilbeskyttelse fungerer ikke uten PIN-koden din.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Funksjonene for profilbeskyttelse fungerer ikke uten PIN-koden din.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>De lagrede fingeravtrykkene dine fjernes også fra denne profilen, og du kommer ikke til å kunne låse opp profilen, autorisere kjøp eller logge på apper med dem."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Funksjonene for profilbeskyttelse fungerer ikke uten passordet ditt."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Funksjonene for profilbeskyttelse fungerer ikke uten passordet ditt.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Funksjonene for profilbeskyttelse fungerer ikke uten passordet ditt.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>De lagrede fingeravtrykkene dine fjernes også fra denne profilen, og du kommer ikke til å kunne låse opp profilen, autorisere kjøp eller logge på apper med dem."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Funksjonene for profilbeskyttelse fungerer ikke uten skjermlåsen din."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Funksjonene for profilbeskyttelse fungerer ikke uten skjermlåsen din.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Funksjonene for profilbeskyttelse fungerer ikke uten skjermlåsen din.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>De lagrede fingeravtrykkene dine fjernes også fra denne profilen, og du kommer ikke til å kunne låse opp profilen, autorisere kjøp eller logge på apper med dem."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Ja, fjern"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"En sekvens av stigende, synkende eller like sifre er ikke tillatt"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Avbryt"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Fjern"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Avbryt"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Neste"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Konfigurasjonen er fullført."</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tilgjengelig"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tilgjengelig)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Skriv inn nettverkspassordet ditt"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Operatørens Wi-Fi-nettverk"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Koble til via <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> ønsker å bruke nettverksskanning, også når Wi-Fi er slått av, for bedre posisjonsnøyaktighet og andre formål. \n\nVil du tillate dette for alle apper som prøver å skanne?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"For å slå dette av går du til Avansert i overflytsmenyen."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Tillat"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Koble til"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Kan ikke koble til nettverket"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Glem"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Endre"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Kunne ikke slette nettverket"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Lagre"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Kunne ikke lagre nettverket"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Avanserte Wi-Fi-innst."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-adresse"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-adresse"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Nettverksinformasjon"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Nettverksmaske"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-adresser"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Vil du avbryte invitasjonen?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vil du avbryte invitasjonen til å koble til <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Vil du glemme denne gruppen?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Flyttbar Wi-Fi-sone"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi-sone"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Deler ikke Internett eller innhold med andre enheter"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Deler nettbrettets Internett-tilkobling via Wi-Fi-sone"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Deler telefonens Internett-tilkobling via Wi-Fi-sone"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Appen deler innhold. Slå Wi-Fi-sone av og på for å dele Internett-tilkobling."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi-Fi-navn"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Navn på Wi-Fi-sonen"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Slår på <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> …"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Andre enheter kan koble til <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi-passord"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Passord for Wi-Fi-sonen"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP-bånd"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Bruk Wi-Fi-soner for å opprette Wi-Fi-nettverk for de andre enhetene dine. Wi-Fi-soner gir Internett-tilgang ved hjelp av mobildatatilkoblingen din."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Du kan bruke apper til å opprette Wi-Fi-soner for deling av innhold med enheter i nærheten."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Adressen som oppgis som posisjonen din til beredskapstjenester, hvis du utfører et nødanrop med Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skjerm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Lyd"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumer"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Søk"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Søkeinnstillinger og -logg"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Ingen resultater"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Tøm loggen"</string>
     <string name="display_settings" msgid="7965901687241669598">"Skjerm"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotér skjermen automatisk"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Levende farger"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Gjenoppretter standard APN-innstillinger."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Tilbakestill til standardvalg"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Tilbakestilling av standard APN-innstillinger er fullført."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Tilbakestill"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Tilbakestill nettverksinnstillingene"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Alternativer for tilbakestilling"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Nettverket, appene eller enheten kan tilbakestilles"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Tilbakestil Wi-Fi, mobil og Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Dette tilbakestiller alle nettverksinnstillinger, inkludert:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobildata"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Tilbakestill innstillingene"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Vil du tilbakestille alle nettverksinnstillingene? Du kan ikke angre denne handlingen."</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Vil du tilbakestille?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Tilbakestilling av nettverket er ikke tilgjengelig for denne brukeren"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Nettverksinnstillingene er tilbakestilt"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Tilbakestill til fabrikkstandard"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> kontoer blir tilbakestilt</item>
-      <item quantity="one">1 konto blir tilbakestilt</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Intern lagring og alle dataene tilbakestilles"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Slett alle data (tilbakestilling til fabrikkstandard)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Dette sletter alle data fra nettbrettets "<b>"interne lagringsplass"</b>", inkludert følgende:\n\n"<li>"Google-kontoen din"</li>\n<li>"Data og innstillinger for system og apper"</li>\n<li>"Nedlastede apper"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Dette sletter alle data fra telefonens "<b>"interne lagringsplass"</b>", inkludert følgende:\n\n"<li>"Google-kontoen din"</li>\n<li>"Data og innstillinger for system og apper"</li>\n<li>"Nedlastede apper"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du er for øyeblikket pålogget følgende kontoer:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Sikkerhetsinformasjon"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Du har ingen datatilkobling. Hvis du vil se denne informasjonen nå, kan du gå til %s fra en datamaskin som er koblet til Internett."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Laster inn …"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Velg passord"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Angi en skjermlås"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Angi et passord for sikkerheten"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Angi passord for å bruke fingeravtrykk"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Velg mønster"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Angi mønster for å bruke fingeravtrykk"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Velg PIN-kode"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Angi en PIN-kode for sikkerheten"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Angi PIN for å bruke fingeravtrykk"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Bekreft passordet ditt"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Angi passordet på nytt"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Bekreft mønsteret"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Bekreft PIN-koden"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Angi PIN-koden på nytt"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Passordene samsvarer ikke"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-kodene samsvarer ikke"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Valg for opplåsing"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Bruk jobbmønsteret ditt for å fortsette"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Skriv inn jobb-PIN-koden din for å fortsette"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Skriv inn jobbpassordet ditt for å fortsette"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Tegn mønsteret ditt for å fortsette. Dette kreves etter omstart av enheten."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Skriv inn PIN-koden til enheten din for å fortsette. Dette er nødvendig når enheten startes på nytt."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Skriv inn enhetspassordet ditt for å fortsette. Dette kreves etter omstart av enheten."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Bruk jobbmønsteret ditt for å fortsette. Dette kreves etter omstart av enheten."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Skriv inn jobb-PIN-koden din for å fortsette. Dette kreves etter omstart av enheten."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Skriv inn jobbpassordet ditt for å fortsette. Dette kreves etter omstart av enheten."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Bruk enhetsmønsteret ditt for bedre beskyttelse"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Skriv inn PIN-koden din for bedre beskyttelse"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Skriv inn enhetspassordet ditt for bedre beskyttelse"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Bruk jobbmønsteret ditt for bedre beskyttelse"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Skriv inn jobb-PIN-koden din for bedre beskyttelse"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Skriv inn jobbpassordet ditt for bedre beskyttelse"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Telefonen er tilbakestilt til fabrikkstandard. For å bruke den, skriv inn det forrige mønsteret ditt."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Telefonen er tilbakestilt til fabrikkstandard. For å bruke den, skriv inn den forrige PIN-koden din."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Telefonen er tilbakestilt til fabrikkstandard. For å bruke den, skriv inn det forrige passordet ditt."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Bekreft mønster"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Bekreft PIN-kode"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Bekreft passord"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Feil PIN-kode"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Feil passord"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Feil mønster"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vil du opprette modulen og gi tilgang?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Når du har opprettet modulen, kan <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> lese alle dataene den viser."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Gi alltid <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> tillatelse til å opprette moduler og lese moduldata"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>t <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>t <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> t <xliff:g id="MINUTES">%3$d</xliff:g> m"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> t <xliff:g id="MINUTES">%2$d</xliff:g> m"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Bruksstatistikk"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Bruksstatistikk"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sorter etter:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Skjermlesere, skjerm, interaksjonskontroller"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Synsinnstillinger"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Du kan tilpasse denne enheten etter egne behov. Tilgjengelighetsfunksjonene kan du endre senere i Innstillinger."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Øk skriftstørrelsen"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Endre skriftstørrelse"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Skjermlesere"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Lyd og tekst på skjermen"</string>
     <string name="display_category_title" msgid="685461049938269166">"Skjerm"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"For å zoome"</b>", trykk raskt på skjermen tre ganger.\n"<ul><li>"Dra to eller flere fingre for å rulle"</li>\n<li>"Knip to eller flere fingre for å justere zoom"</li></ul>\n\n<b>"For å zoome midlertidig"</b>", trykk raskt på skjermen tre ganger, og hold fingeren nede på det tredje trykket.\n"<ul><li>"Dra for å bevege deg rundt på skjermen"</li>\n<li>"Løft fingeren for å zoome ut"</li></ul>\n\n"Du kan ikke zoome inn på tastaturet eller navigasjonsraden."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Når forstørrelse er slått på, bruker du Tilgjengelighet-knappen nederst på skjermen for å forstørre raskt.\n\n"<b>"For å zoome"</b>", trykk på Tilgjengelighet-knappen, og trykk deretter hvor som helst på skjermen.\n"<ul><li>"Dra to eller flere fingre for å rulle"</li>\n<li>"Knip to eller flere fingre for å justere zoomen"</li></ul>\n\n<b>"For å zoome midlertidig"</b>", trykk på Tilgjengelighet-knappen, og trykk deretter og hold hvor som helst på skjermen.\n"<ul><li>"Dra for å bevege deg rundt på skjermen"</li>\n<li>"Løft fingeren for å zoome ut"</li></ul>\n\n"Du kan ikke zoome inn på tastaturet eller navigasjonsraden."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Tilgjengelighet-knappen er satt til <xliff:g id="SERVICE">%1$s</xliff:g>. For å bruke forstørrelse, trykk på og hold inne Tilgjengelighet-knappen, og velg deretter forstørrelse."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Snarvei for tilgjengelighet"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Snarvei til volumtast"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Snarveitjeneste"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Tillat fra låseskjermen"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Når snarveien er på, kan du trykke på begge volumknappene i tre sekunder for å starte en tilgjengelighetsfunksjon."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Når snarveien er på, kan du trykke på begge volumtastene i tre sekunder for å starte en tilgjengelighetsfunksjon."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Tekst med høy kontrast"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Automatisk oppdatering av skjermforstørrelsen"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Oppdater skjermforstørrelsen ved appbytter"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Kan påvirke ytelsen"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klikk etter at markøren stanser"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Forsinkelse før klikk"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"PÅ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"AV"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Vis i hurtiginnstillingene"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"du har valgt <xliff:g id="NUMBER">%1$d</xliff:g> av <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> av totalt <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Velg alle"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Administrer abonnementer"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Databruk"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Appens databruk"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operatørens måling av databruk samsvarer ikke nødvendigvis med enhetens måling."</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilnettverk"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Wi‑Fi-nettverk med datamåling"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Du må slå på Wi-Fi for å velge nettverk med datamåling."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatisk"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Med datamåling"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Uten datamåling"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Operatørens måling av databruk samsvarer ikke nødvendigvis med enhetens måling."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Nødanrop"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Tilbake til anrop"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Anropsbehandling"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Nødvarsler"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Nødvarsler"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Nettverksoperatører"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Navn på tilgangspunkt"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Forbedret 4G LTE-modus"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Prioritert SIM-kort for"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Spør hver gang"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Du må velge en SIM-innstilling"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Valg av SIM-kort"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Innstillinger"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">Vis %d skjulte elementer</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Appvarsler"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Varselkategori"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Viktighet"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"La appen bestemme"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Tillat lyd"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Vis aldri varsler"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Ingen lyd eller visuell forstyrrelse"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Ingen lyd"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Lag lyd"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Lag lyd og vis i forgrunnen"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Vis i forgrunnen"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Lav"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Middels"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Høy"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Haster"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Tillat lyd"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Disse varslene vises ikke kjapt på skjermen – verken med vibrering eller lyd."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Tillat forstyrrelser"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"La appen lage lyd, vibrere og/eller vise varsler på skjermen"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Lav viktighet"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Middels viktighet"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Høy viktighet"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip bilde i"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Bilde-i-bilde"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Tillat bilde-i-bilde"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"La denne appen opprette et bilde-i-bilde-vindu mens appen er åpen eller etter at du har gått ut av den (for eksempel for å fortsette å se en video). Dette vinduet vises over andre apper du bruker."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"La denne appen opprette et bilde-i-bilde-vindu mens appen er åpen, eller etter at du har gått ut av den (for eksempel for å fortsette å se en video). Dette vinduet vises over andre apper du bruker."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"«Ikke forstyrr»-tilgang"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ingen installerte apper har bedt om «Ikke forstyrr»-tilgang"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Laster inn apper …"</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Overføring av filer"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Overføring av bilder (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Bruk av enheten som MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS-speiling"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Bakgrunnssjekk"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Full bakgrunnstilgang"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Bruk teksten fra skjermen"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Angi tidsplanen for nattlys"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Sovne enklere med ravgul skjermnyanse"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Nattlys er på"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Skjermen din har en ravgul nyanse. Dette kan gjøre det enklere å sovne."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Forslag"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Bruk kaldere skjermfarger"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"For å bruke fargeendringen, slå av skjermen"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Start enheten på nytt for å aktivere endringene i telefonmonitoren"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Start enheten på nytt for å aktivere endringene i Kamera HAL HDR+"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kameraets lasersensor"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatiske systemoppdateringer"</string>
     <string name="usage" msgid="2977875522080448986">"Bruk"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Bruk av mobildata"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Varsel om databruk"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Angi en datagrense"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datagrense"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> er brukt i tidsrommet <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> brukte <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurer"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Andre apper som er inkludert i bruken"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Slett og konvertér"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Vil du tilbakestille frekvensbegrensning for ShortcutManager?"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Frekvensberegning for ShortcutManager er tilbakestilt"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrollér låseskjermvarsler"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Kontrollér informasjon på låseskjermen"</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="8483187649355540109">"Brukerstøtte og tips"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Ingen installerte apper har bedt om tilgang til premium-SMS."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium-SMS kan koste penger og legges til telefonregningen din. Hvis du slår på tillatelse for en app, kan du sende premium-SMS via den appen."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Tilgang til premium-SMS"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Ikke synlig for andre enheter"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Av"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Koblet til <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Koblet til flere enheter"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Demomodus for systembrukergrensesnittet"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Instant-apper"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Åpne linker i apper – selv om appene ikke er installert"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Instant-apper"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Konto for instant-apper"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Instant Apps-innstillinger"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installerte apper"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Lagringsplassen din blir nå administrert av lagringsadministratoren"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Kontoer for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Alltid-på-VPN er slått på i den personlige profilen din"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Alltid-på-VPN er slått på i jobbprofilen din"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP-proxy-tjener er angitt"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Pålitelig legitimasjon"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Pålitelig legitimasjon"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Pålitelig legitimasjon i den personlige profilen din"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Pålitelig legitimasjon i jobbprofilen din"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Minimum <xliff:g id="COUNT_1">%d</xliff:g> CA-sertifikater</item>
       <item quantity="one">Minimum <xliff:g id="COUNT_0">%d</xliff:g> CA-sertifikat</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informasjon om operatørhåndtering"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Utløs operatørhåndtering"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Hva er nytt og spennende?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Sjekk ut de 5 mest populære funksjonene"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Få en innføring i den nye telefonen din"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Få en innføring i det nye nettbrettet ditt"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Få en innføring i den nye enheten din"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Denne funksjonen er ikke tilgjengelig på denne enheten"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Tilstand for IMS-registrering"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrert"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Ikke registrert"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index c628df9..fb0ee70 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -153,7 +153,7 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="692477613671555006">"एउटा अनुप्रयोग ब्लुटुथ सक्रिय गर्न र अन्य यन्त्रहरूले तपाईंको ट्याब्लेट देख्न सक्ने बनाउन चाहन्छ। तपाईं पछि ब्लुटुथ सम्बन्धी सेटिङहरूमा गई यसलाई परिवर्तन गर्न सक्नुहुन्छ।"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"एउटा अनुप्रयोग ब्लुटुथ सक्रिय गर्न र अन्य यन्त्रहरूले तपाईंको फोन देख्न सक्ने बनाउन चाहन्छ। तपाईं पछि ब्लुटुथ सम्बन्धी सेटिङहरूमा गई यसलाई परिवर्तन गर्न सक्नुहुन्छ।"</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"ब्लुटुथ खुल्दै..."</string>
-    <string name="bluetooth_turning_off" msgid="2337747302892025192">"ब्लुटुथ बन्द हुँदै छ..."</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"ब्लुटुथ बन्द हुँदैछ..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"स्वतःजडान"</string>
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"ब्लुटुथ जडान अनुरोध"</string>
     <string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" सँग जडान गर्न ट्याप गर्नुहोस्।"</string>
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s तपाईँको सन्देशमा पहुँच चाहन्छ। %2$s मा पहुँच दिने हो?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM पहुँच अनुरोध"</string>
     <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="bluetooth_device_name_summary" msgid="4757990010751789977">"अन्य यन्त्रहरूमा <xliff:g id="DEVICE_NAME">^1</xliff:g> को रूपमा देख्न सकिन्छ"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"अन्य यन्त्रहरूमा <xliff:g id="DEVICE_NAME">^1</xliff:g> को रूपमा देखिन्छ"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"तपाईंका यन्त्रहरू"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"नयाँ यन्त्रलाई जोडा बनाउनुहोस्"</string>
     <string name="date_and_time" msgid="9062980487860757694">"मिति र समय"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"अर्को"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"फिंगरप्रिन्ट सेटअप छाड्ने हो?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"फिंगरप्रिन्ट सेटअप गर्न केवल एक वा दुई मिनेट लाग्छ। छाड्नु भएको खण्डमा, तपाईं सेटिङहरूमा गएर पछि आफ्नो फिंगरप्रिन्ट थप्न सक्नुहुन्छ।"</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"स्क्रिन लक सेटअप छाड्ने हो?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"यन्त्रको सुरक्षासम्बन्धी सुविधाहरू सक्रिय गरिने छैनन्। तपाईं यो ट्याब्लेट हराएको वा चोरी भएको वा रिसेट भएको अवस्थामा अरूलाई यो चलाउनबाट रोक्न सक्नुहुने छैन।"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"यन्त्रको सुरक्षासम्बन्धी सुविधाहरू सक्रिय गरिने छैनन्। तपाईं यो यन्त्र हराएको वा चोरी भएको वा रिसेट भएको अवस्थामा अरूलाई यो चलाउनबाट रोक्न सक्नुहुने छैन।"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"यन्त्रको सुरक्षासम्बन्धी सुविधाहरू सक्रिय गरिने छैनन्। तपाईं यो फोन हराएको वा चोरी भएको वा रिसेट भएको अवस्थामा अरूलाई यो चलाउनबाट रोक्न सक्नुहुने छैन।"</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"तपाईंले अधिकतम संख्यामा फिंगरप्रिन्टहरू थप्नुभएको छ"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"थप फिंगरप्रिन्टहरू थप्न सकिँदैन"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"सबै फिंगरप्रिन्टहरू हटाउने हो?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' हटाउनुहोस्‌"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"तपाईं यो फिंगरप्रिन्ट मेट्न चाहनुहुन्छ?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"तपाईं फोन अनलक गर्न, खरिद अधिकार प्रदान गर्न वा तिनीहरूमार्फत अनुप्रयोगहरूमा साइन इन गर्नका लागि तपाईं आफ्नो फिंगरप्रिन्टहरूको प्रयोग गर्न सक्षम हुनुहुने छैन।"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"तपाईं आफ्नो कार्य प्रोफाइल अनलक गर्न, खरिद गर्ने अनुमति दिन, वा कार्यसँग सम्बन्धित अनुप्रयोगहरूमा साइन इन गर्नका लागि आफ्नो फिंगरप्रिन्ट प्रयोग गर्न सक्नुहुने छैन।"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"हो, हटाउनुहोस्"</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"थप सुरक्षाका लागि एउटा ब्याक अप सम्बन्धी स्क्रिन लक सेट अप गर्नुहोस्।"</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"थप सुरक्षाका लागि एउटा ब्याकअप स्क्रिन लक सेट अप गर्नुहोस्।"</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>
@@ -497,37 +502,37 @@
     <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_fingerprint" msgid="8212242533942400457">"यन्त्र सुरक्षा विशेषताहरू तपाईंको ढाँचा बिना काम गर्ने छैनन्। <xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"यन्त्रका सुरक्षासम्बन्धी सुविधाहरूले तपाईंको ढाँचाबिना काम गर्ने छैनन्। <xliff:g id="EMPTY_LINE">
 
-</xliff:g> तपाईंको सुरक्षित फिंगरप्रिन्टहरू पनि यस यन्त्रबाट हटाइने छ र तपाईं आफ्नो फोन अनलक गर्न, खरिद आधिकार दिन वा तिनीहरूमार्फत अनुप्रयोगहरूमा साइन इन गर्न सक्षम हुनु हुने छैन। \""</string>
+</xliff:g> यस यन्त्रबाट तपाईंका सुरक्षित गरिएका फिंगरप्रिन्टहरू पनि हटाइने छन् र तपाईं तिनीहरूमार्फत आफ्नो फोन अनलक गर्ने, खरिदसम्बन्धी आधिकार प्रदान गर्ने वा अनुप्रयोगहरूमा साइन इन गर्ने कार्यहरू गर्न सक्नुहुनेछैन।"</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">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"यन्त्रका सुरक्षासम्बन्धी सुविधाहरूले तपाईंको PIN बिना काम गर्ने छैनन्। <xliff:g id="EMPTY_LINE">
 
-</xliff:g> तपाईंको सुरक्षित फिंगरप्रिन्टहरू पनि यस यन्त्रबाट हटाइने छ र तपाईं आफ्नो फोन अनलक गर्न, खरिद आधिकार दिन वा तिनीहरूमार्फत अनुप्रयोगहरूमा साइन इन गर्न सक्षम हुनु हुने छैन। \""</string>
+</xliff:g>यस यन्त्रबाट तपाईंका सुरक्षित गरिएका फिंगरप्रिन्टहरू पनि हटाइने छन् र तपाईं तिनीहरूमार्फत आफ्नो फोन अनलक गर्ने, खरिदसम्बन्धी आधिकार प्रदान गर्ने वा अनुप्रयोगहरूमा साइन इन गर्ने कार्यहरू गर्न सक्नुहुनेछैन।"</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"यन्त्रका सुरक्षासम्बन्धी सुविधाहरूले तपाईंको पासवर्डबिना काम गर्ने छैनन्। <xliff:g id="EMPTY_LINE">
 
-</xliff:g> तपाईंको सुरक्षित फिंगरप्रिन्टहरू पनि यस यन्त्रबाट हटाइने छ र तपाईं आफ्नो फोन अनलक गर्न, खरिद आधिकार दिन वा तिनीहरूमार्फत अनुप्रयोगहरूमा साइन इन गर्न सक्षम हुनु हुने छैन। \""</string>
+</xliff:g> यस यन्त्रबाट तपाईंका सुरक्षित गरिएका फिंगरप्रिन्टहरू पनि हटाइने छन् र तपाईं तिनीहरूमार्फत आफ्नो फोन अनलक गर्ने, खरिदसम्बन्धी आधिकार प्रदान गर्ने वा अनुप्रयोगहरूमा साइन इन गर्ने कार्यहरू गर्न सक्नुहुनेछैन।"</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"यन्त्रका सुरक्षासम्बन्धी सुविधाहरूले तपाईंको स्क्रिन लकबिना काम गर्ने छैनन्। <xliff:g id="EMPTY_LINE">
 
-</xliff:g> तपाईंको सुरक्षित फिंगरप्रिन्टहरू पनि यस यन्त्रबाट हटाइने छ र तपाईं आफ्नो फोन अनलक गर्न, खरिद आधिकार दिन वा तिनीहरूमार्फत अनुप्रयोगहरूमा साइन इन गर्न सक्षम हुनु हुने छैन। \""</string>
+</xliff:g>यस यन्त्रबाट तपाईंका सुरक्षित गरिएका फिंगरप्रिन्टहरू पनि हटाइने छन् र तपाईं तिनीहरूमार्फत आफ्नो फोन अनलक गर्ने, खरिदसम्बन्धी आधिकार प्रदान गर्ने वा अनुप्रयोगहरूमा साइन इन गर्ने कार्यहरू गर्न सक्नुहुनेछैन।"</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"प्रोफाइल सुरक्षा विशेषताहरूले तपाईँको ढाँचा बिना काम गर्नेछैनन्।"</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"प्रोफाइल सुरक्षा विशेषताहरूले तपाईंको ढाँचा बिना काम गर्नेछैनन्।<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"प्रोफाइलका सुरक्षासम्बन्धी सुविधाहरूले तपाईंको ढाँचाबिना काम गर्ने छैनन्।<xliff:g id="EMPTY_LINE">
 
-</xliff:g>तपाईंको सुरक्षित फिंगरप्रिन्टहरू पनि यस प्रोफाइलबाट हटाइनेछ र तपाईं तिनीहरूको प्रयोग बिना तपाईंको प्रोफाइल अनलक गर्न, खरिद अधिकार दिन वा अनुप्रयोगहरूमा साइन इन गर्न सक्षम हुनुहुनेछैन।\""</string>
+</xliff:g>यस प्रोफाइलबाट तपाईंका सुरक्षित गरिएका फिंगरप्रिन्टहरू पनि हटाइने छन् र तपाईं तिनीहरूमार्फत आफ्नो प्रोफाइल अनलक गर्ने, खरिदसम्बन्धी अधिकार प्रदान गर्ने वा अनुप्रयोगहरूमा साइन इन गर्ने कार्यहरू सक्नुहुनेछैन।"</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"प्रोफाइल सुरक्षा विशेषताहरूले तपाईँको PIN बिना काम गर्नेछैनन्।"</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"प्रोफाइल सुरक्षा विशेषताहरूले तपाईंको PIN बिना काम गर्नेछैनन्।<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"प्रोफाइलका सुरक्षासम्बन्धी सुविधाहरूले तपाईंको PIN बिना काम गर्ने छैनन्।<xliff:g id="EMPTY_LINE">
 
-</xliff:g>तपाईंको सुरक्षित फिंगरप्रिन्टहरू पनि यस प्रोफाइलबाट हटाइनेछ र तपाईं तिनीहरूको प्रयोग बिना तपाईंको प्रोफाइल अनलक गर्न, खरिद अधिकार दिन वा अनुप्रयोगहरूमा साइन इन गर्न सक्षम हुनुहुनेछैन।\""</string>
+</xliff:g>यस प्रोफाइलबाट तपाईंका सुरक्षित गरिएका फिंगरप्रिन्टहरू पनि हटाइने छन् र तपाईं तिनीहरूमार्फत आफ्नो प्रोफाइल अनलक गर्ने, खरिदसम्बन्धी अधिकार प्रदान गर्ने वा अनुप्रयोगहरूमा साइन इन गर्ने कार्यहरू गर्न सक्नुहुनेछैन।"</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"प्रोफाइल सुरक्षा विशेषताहरूले तपाईँको पासवर्ड बिना काम गर्नेछैनन्।"</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"प्रोफाइल सुरक्षा विशेषताहरूले तपाईंको पासवर्ड बिना काम गर्नेछैनन्।<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"प्रोफाइलका सुरक्षासम्बन्धी सुविधाहरूले तपाईंको पासवर्डबिना काम गर्ने छैनन्।<xliff:g id="EMPTY_LINE">
 
-</xliff:g>तपाईंको सुरक्षित फिंगरप्रिन्टहरू पनि यस प्रोफाइलबाट हटाइनेछ र तपाईं तिनीहरूको प्रयोग बिना तपाईंको प्रोफाइल अनलक गर्न, खरिद अधिकार दिन वा अनुप्रयोगहरूमा साइन इन गर्न सक्षम हुनुहुनेछैन।\""</string>
+</xliff:g>यस प्रोफाइलबाट तपाईंका सुरक्षित गरिएका फिंगरप्रिन्टहरू पनि हटाइने छन् र तपाईं तिनीहरूमार्फत आफ्नो फोन अनलक गर्ने, खरिदसम्बन्धी आधिकार प्रदान गर्ने वा अनुप्रयोगहरूमा साइन इन गर्ने कार्यहरू गर्न सक्नुहुनेछैन।"</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"प्रोफाइल सुरक्षा विशेषताहरूले तपाईँको स्क्रिन लक बिना काम गर्नेछैनन्।"</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"प्रोफाइल सुरक्षा विशेषताहरूले तपाईंको स्क्रिन लक बिना काम गर्नेछैनन्।<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"प्रोफाइलका सुरक्षासम्बन्धी सुविधाहरूले तपाईंको स्क्रिन लकबिना काम गर्ने छैनन्।<xliff:g id="EMPTY_LINE">
 
-</xliff:g>तपाईंको सुरक्षित फिंगरप्रिन्टहरू पनि यस प्रोफाइलबाट हटाइनेछन् र तपाईं तिनीहरूको प्रयोग बिना तपाईंको प्रोफाइल अनलक गर्न, खरिद अधिकार दिन वा अनुप्रयोगहरूमा साइन इन गर्न सक्षम हुनुहुनेछैन।\""</string>
+</xliff:g>यस प्रोफाइलबाट तपाईंका सुरक्षित गरिएका फिंगरप्रिन्टहरू पनि हटाइने छन् र तपाईं तिनीहरूमार्फत आफ्नो प्रोफाइल अनलक गर्ने, खरिदसम्बन्धी अधिकार प्रदान गर्ने वा अनुप्रयोगहरूमा साइन इन गर्ने कार्यहरू गर्न सक्नुहुनेछैन।"</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"हो, हटाउनुहोस्"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"अनलक ढाँचा बदल्नुहोस्"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"अनलक PIN परिवर्तन गर्नुहोस्"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"बढ्दो, घट्दो वा दोहोरिएका अङ्कहरूको अनुक्रमलाई निषेध गरिएको छ"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ठीक छ"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"रद्द गर्नुहोस्"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"खाली गर्नुहोस्"</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>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS उपलब्ध छ"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS उपलब्ध)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"आफ्नो सञ्जाल पासवर्ड प्रविष्ट गर्नुहोस्"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"सेवा प्रदायकको Wi‑Fi नेटवर्क"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> मार्फत जडान गर्नुहोस्"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"स्थान सटिकता सुधार गर्न र अन्य प्रायोजनहरूको लागि, <xliff:g id="APP_NAME">%1$s</xliff:g> नेटवर्क स्क्यानिङ खुला भएको चाहन्छ, Wi-Fi बन्द भएता पनि।\n\nके यसलाई सबै अनुप्रयोगहरूको लागि अनुमति दिन चाहनुहुन्छ जसले स्क्यान गर्न चाहन्छन्?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"यो बन्द गर्न, अतिप्रवाह मेनुमा उन्नतमा जानुहोस्।"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"अनुमति दिनुहोस्"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"जडान गर्नुहोस्"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"सञ्जालमा जडान गर्न विफल"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"बिर्सनुहोस्"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"परिमार्जन गर्नुहोस्"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"सञ्जाल बिर्सन विफल"</string>
     <string name="wifi_save" msgid="3331121567988522826">"सुरक्षित गर्नुहोस्"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"सञ्जाल बचत गर्न विफल"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"जटिल Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"म्याक ठेगाना"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP ठेगाना"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"नेटवर्कसम्बन्धी जानकारी"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"सबनेट मास्क"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 ठेगानाहरू"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"आमन्त्रण रद्द गर्ने हो?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g>सँग जोडिने आमन्त्रण के रद्द गर्न चाहनु हुन्छ ?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"यो समूह बिर्सनुभयो?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"पोर्टेबल Wi-Fi हटस्पट"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi हटस्पट"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"अन्य यन्त्रहरूसँग इन्टरनेट वा सामग्री आदान-प्रदान गरिरहेको छैन"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"हटस्पटमार्फत यो ट्याब्लेटको इन्टरनेट जडान साझा गर्दै"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"हटस्पटमार्फत यो फोनको इन्टरनेट जडान साझा गर्दै"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"अनुप्रयोगले सामग्री आदान-प्रदान गर्दैछ। इन्टरनेट जडान साझा गर्न हटस्पट निष्क्रिय पार्नुहोस्, त्यसपछि फेरि  गर्नुहोस्‌"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi को नाम"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"हटस्पटको नाम"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> सक्रिय गर्दै..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"अन्य यन्त्रहरू <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> मा जडान गर्न सक्छन्"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi को पासवर्ड"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"हटस्पटको पासवर्ड"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP ब्यान्ड"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"आफ्ना अन्य यन्त्रहरूका लागि Wi‑Fi नेटवर्क सिर्जना गर्न हटस्पट प्रयोग गर्नुहोस्। हटस्पटले तपाईंको मोबाइल डेटा जडान प्रयोग गरेर इन्टरनेट प्रदान गर्दछ। अतिरिक्त मोबाइल डेटा शुल्क लागू हुनसक्छ।"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"अनुप्रयोगहरूले नजिकैका यन्त्रहरूसँग सामग्री आदान-प्रदान गर्न एउटा हटस्पट सिर्जना गर्न सक्छन्।"</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi कलिङ सक्रिय हुँदा तपाईँको प्राथमिकता र कुन संकेत बलियो छ भन्ने आधारमा तपाईँको फोनले कलहरूलाई Wi-Fi नेटवर्हकरू वा तपाईँको वाहकको नेटवर्कमार्फत पठाउन सक्छ। यो सुविधा सक्रिय पार्न अघि शुल्क र अन्य विवरणको बारेमा तपाईँको वाहकसँग जाँच गर्नुहोस्।"</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"आपतकालीन ठेगानालाई अद्यावधिक गर्नुहोस्"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"तपाईँले WiFi को प्रयोग गरी कुनै ९११ सम्बन्धी कल गर्दा आपतकालीन सेवाहरूले तपाईँको स्थानको रूपमा प्रयोग गर्ने ठेगाना"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"तपाईंले WiFi प्रयोग गरी आपतकालीन कल गर्दा आपतकालीन सेवाहरूले तपाईंको स्थानको रूपमा प्रयोग गर्ने ठेगाना"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"प्रदर्शन"</string>
     <string name="sound_settings" msgid="5534671337768745343">"आवाज"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"भोल्युम"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"खोज्नुहोस्"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"खोज सेटिङहरू र इतिहास प्रबन्ध गर्नुहोस्"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"कुनै परिणाम फेला पारिएन"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"इतिहास खाली गर्नुहोस्"</string>
     <string name="display_settings" msgid="7965901687241669598">"प्रदर्शन"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"स्वतःघुम्ने स्क्रिन"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"जीवन्त रङहरू"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"पूर्वनिर्धारित APN सेटिङहरू पुनःप्राप्त गर्दै।"</string>
     <string name="menu_restore" msgid="8260067415075573273">"पूर्वनिर्धारितमा पुनःसेट गर्नुहोस्"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"पूर्वनिर्धारित APN सेटिङहरू पुनःसेट पुरा भयो।"</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"पुनःसेट गर्नुहोस्"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"सञ्जाल सेटिङहरू रिसेट"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"रिसेटका विकल्पहरू"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"नेटवर्क, अनुप्रयोगहरू वा यन्त्रलाई रिसेट गर्न सकिन्छ"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi, मोबाइल र ब्लुटुथ रिसेट गर्नुहोस्"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"यसले निम्न सेटिङहरू लगायत सम्पूर्ण नेटवर्क सम्बन्धी सेटिहरूलाई रिसेट गर्नेछ:\n\n"<li>"Wi‑Fi"</li>\n<li>"मोबाइल डेटा"</li>\n<li>"ब्लुटुथ"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"सेटिङहरू रिसेट गर्नुहोस्"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"सबै नेटवर्क सेटिङहरू रिसेट गर्ने हो? तपाईं यी कार्य अनडू गर्न सक्नुहुन्न!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"रिसेट गर्ने हो?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"नेटवर्क रिसेट यो प्रयोगकर्ताको लागि उपलब्ध छैन"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"सञ्जाल सेटिङ्हरू रिसेट गरियो"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"कारखाना डेटा रिसेट"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> खाता रिसेट हुनेछन्</item>
-      <item quantity="one">१ खाता रिसेट हुनेछ</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"आन्तरिक भण्डारण र सबै डेटा रिसेट हुनेछन्"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"सबै डेटा मेटाउनुहोस् (फ्याक्ट्री रिसेट गर्नुहोस्)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"यस कार्यले तपाईँको सम्पूर्ण डेटा मेटाउँछ ट्याब्लेटको "<b>" आन्तरिक भण्डारणबाट "</b>" : जसमा, \n \n "<li>" तपाईँको Google खाता "</li>" \n "<li>" प्रणाली र अनुप्रयोग डेटा र सेटिङहरू"</li>" \n "<li>" डाउनलोड गरिएका अनुप्रयोगहरू "</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"यसले सबै डेटा तपाईंको "<b>"आन्तरिक भण्डारणबाट मेटाउँदछ"</b>", समावेश गर्दछ:\n\n"<li>"तपाईंको Google खाता"</li>\n<li>"प्रणाली र अनुप्रयोग डेटा र सेटिङहरू"</li>\n<li>"डाउनलोड गरिएका अनुप्रयोगहरू"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n" \nतपाईँले अहिले निम्न खाताहरूमा साइन इन गर्नुभयो:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"सुरक्षा जानकारी"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"तपाईंसँग डेटा जडान छैन। यो जानकारी अब हेर्नको लागि इन्टरनेटमा जडित कुनै पनि कम्प्युटरबाट %s मा जानुहोस्।"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"लोड हुँदै..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"तपाईंको पासवर्ड छनौट गर्नुहोस्"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"एउटा स्क्रिन लक सेट गर्नुहोस्"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"सुरक्षाका लागि एउटा पासवर्ड सेट गर्नुहोस्"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"फिंगरप्रिन्ट प्रयोग गर्न पासवर्ड सेट गर्नुहोस्"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"तपाईँको ढाँचा छान्नुहोस्"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"फिंगरप्रिन्ट प्रयोग गर्न ढाँचा सेट गर्नुहोस्"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"तपाईँको PIN छान्नुहोस्"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"सुरक्षाका ला‍गि एउटा PIN सेट गर्नुहोस्"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"फिंगरप्रिन्ट प्रयोग गर्न PIN सेट गर्नुहोस्"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"तपाईँको पासवर्ड निश्चित गर्नुहोस्"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"आफ्नो पासवर्ड पुन: प्रविष्ट गर्नुहोस्"</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_pin_header" msgid="7744513791910572550">"आफ्नो 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>
@@ -1483,12 +1490,18 @@
     <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_strong_auth_required_device_pattern" msgid="530802132223800623">"थप सुरक्षाका लागि आफ्नो यन्त्रको ढाँचा प्रयोग गर्नुहोस्‌"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"थप सुरक्षाका लागि आफ्नो यन्त्रको PIN प्रविष्ट गर्नुहोस्"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"थप सुरक्षाका लागि आफ्नो यन्त्रको पासवर्ड प्रविष्ट गर्नुहोस्"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"थप सुरक्षाका लागि आफ्नो यन्त्रको कार्य प्रोफाइलको ढाँचा प्रयोग गर्नुहोस्"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"थप सुरक्षाका लागि आफ्नो यन्त्रको कार्य प्रोफाइलको PIN प्रविष्ट गर्नुहोस्"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"थप सुरक्षाका लागि आफ्नो यन्त्रको कार्य प्रोफाइलको पासवर्ड प्रविष्ट गर्नुहोस्"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"तपाईंको फोन फ्याक्ट्री सेटिङमा रिसेट गरिएको छ। यो फोन प्रयोग गर्न आफ्नो पछिल्लो ढाँचा प्रविष्ट गर्नुहोस्।"</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"तपाईंको फोन फ्याक्ट्री सेटिङमा रिसेट गरिएको छ। यो फोन प्रयोग गर्न आफ्नो पछिल्लो PIN प्रविष्ट गर्नुहोस्।"</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"तपाईंको फोन फ्याक्ट्री सेटिङमा रिसेट गरिएको छ। यो फोन प्रयोग गर्न आफ्नो पछिल्लो पासवर्ड प्रविष्ट गर्नुहोस्।"</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"ढाँचा पुष्टि गर्नुहोस्‌"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"PIN पुष्टि गर्नुहोस्‌"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"पासवर्ड पुष्टि गर्नुहोस्"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"गलत PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"गलत पासवर्ड"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"गलत ढाँचा"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"विजेट सिर्जना गर्ने र पहुँच अनुमति दिन चाहनुहुन्छ?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"तपाईँले विजेट बनाइसक्नु भएपछि <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>ले देखाउने सम्पूर्ण डेटाहरू पहुँच गर्न सक्छ।"</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"सधैँ <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>लाई विजेटहरू सिर्जना गर्न अनुमति दिनुहोस् र तिनीहरूको डेटा पहुँच गर्नुहोस्"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>दिन <xliff:g id="HOURS">%2$d</xliff:g>घन्टा <xliff:g id="MINUTES">%3$d</xliff:g>मिनेट <xliff:g id="SECONDS">%4$d</xliff:g>सेकेन्ड"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> घन्टा <xliff:g id="MINUTES">%2$d</xliff:g> मिनेट <xliff:g id="SECONDS">%3$d</xliff:g>सेकेन्ड"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> मिनेट <xliff:g id="SECONDS">%2$d</xliff:g> सेकेन्ड"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</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="usage_stats_label" msgid="5890846333487083609">"उपयोग तथ्याङ्क"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"प्रयोग तथ्याङ्क"</string>
     <string name="display_order_text" msgid="8592776965827565271">"बाट क्रमबद्घ:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"स्क्रिन रिडरहरू, प्रदर्शन, अन्तर्क्रिया नियन्त्रणहरू"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"दृश्यका सेटिङहरू"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"तपाईंले आफ्नो आवश्यकताहरूसँग मेल खाने बनाउन यस यन्त्रलाई आफू अनुकूल गर्न सक्नुहुन्छ। यी पहुँच सुविधाहरू सेटिङमा पछि परिवर्तन गर्न सकिनेछ।"</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"फन्टको आकार बढाउनुहोस्"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"फन्ट साइज बदल्नुहोस्"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"स्क्रिन रिडरहरू"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"अडियो तथा स्क्रिनमा देखिने पाठ सन्देश"</string>
     <string name="display_category_title" msgid="685461049938269166">"प्रदर्शन"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"जुम गर्नका लागि"</b>", स्क्रिनलाई तीन पटक छिटो-छिटो ट्याप गर्नुहोस्।\n"<ul><li>"स्क्रोल गर्नका लागि दुई वा सो भन्दा बढी औंलाले ड्र्याग गर्नुहोस्"</li>\n<li>"जुम समायोजन गर्नका लागि २ वा सो भन्दा बढी औंलाले पिन्च गर्नुहोस्"</li></ul>\n\n<b>"अस्थायी रूपमा जुम गर्नका लागि"</b>", स्क्रिनमा ३ पटक छिटो-छिटो ट्याप गर्नुहोस् र तेस्रो ट्यापमा आफ्नो औंलालाई तलतिर होल्ड गर्नुहोस्।\n"<ul><li>"स्क्रिनमा यताउता जान ड्र्याग गर्नुहोस्"</li>\n<li>"जुम आउट गर्नका लागि औंला उचाल्नुहोस्"</li></ul>\n\n"तपाईं किबोर्ड वा नेभिगेसन बारमा जुम इन गर्न सक्नुहुन्न।"</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"म्याग्निफिकेसनलाई सक्रिय गरिसकेपछि, छिटो म्याग्निफाइ गर्न स्क्रिनको तलतिर रहेको पहुँच बटन प्रयोग गर्नुहोस्।\n\n"<b>"जुम गर्नको लागि"</b>", पहुँच बटनलाई ट्याप गर्नुहोस्, र त्यसपछि स्क्रिनको कुनै पनि भागमा ट्याप गर्नुहोस्।\n"<ul><li>"स्क्रोल गर्नको लागि २ वा सोभन्दा बढी औंलाले ड्र्याग गर्नुहोस्"</li>\n<li>" जुमलाई समायोजन गर्न दुई वा सोभन्दा बढी औंलाले पिन्च गर्नुहोस्"</li></ul>\n\n<b>"अस्थायी रूपमा जुम गर्नका लागि"</b>", पहुँच बटनलाई ट्याप गर्नुहोस्, र त्यसपछि स्क्रिनको कुनै पनि भागमा केहीबेर छोइरहनुहोस्।\n"<ul><li>"स्क्रिनमा यताउता जान ड्र्याग गर्नुहोस्"</li>\n<li>"जुम आउट गर्नका लागि औंला उचाल्नुहोस्"</li></ul>\n\n"तपाईं किबोर्ड वा नेभिगेसन बारमा जुम इन गर्न सक्नुहुन्न।"</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"पहुँच बटनलाई <xliff:g id="SERVICE">%1$s</xliff:g> मा सेट गरिएको छ। म्याग्निफिकेसन प्रयोग गर्नका लागि पहुँच बटनलाई केहीबेर छोइरहनुहोस् र त्यसपछि म्याग्निफिकेसन चयन गर्नुहोस्।"</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"उपलब्धता सर्टकट"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"भोल्युम कुञ्जीको सर्टकट"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"सर्टकट सेवा"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"लक स्क्रिनबाट अनुमति दिनुहोस्"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"सर्टकट सक्रिय भएको बेलामा, पहुँच सुविधा सुरु गर्न तपाईं दुवै भोल्युम बटनलाई ३ सेकेण्डसम्म थिच्न सक्नुहुन्छ।"</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"सर्टकट सक्रिय हुँदा पहुँचसम्बन्धी सुविधा सुरु गर्न तपाईं दुवै भोल्युम कुञ्जीहरूलाई ३ सेकेन्डसम्म थिच्न सक्नुहुन्छ।"</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">"स्क्रिन आवर्धन स्वतः अपडेट गर्नुहोस्"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"अनुप्रयोग ट्रान्जिसनहरूमा स्क्रिन आवर्धन अपडेट गर्नुहोस्"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"कार्यसम्पादनमा असर पार्न सक्छ"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"प्वाइन्टर चल्न रोकेपछि क्लिक गर्नुहोस्"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"क्लिक गर्न अघि ढिलाइ"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"सक्रिय छ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"निष्क्रिय छ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"द्रुत सेटिङमा देखाउनुहोस्"</string>
@@ -2358,6 +2363,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"योजनाहरूको व्यवस्थापन गर्नुहोस्"</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>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"मोबाइल नेटवर्क"</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_metered_auto" msgid="1262028400911918865">"स्वचालित"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"मिटर गरिएको छ"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"मिटर गरिएको छैन"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"वाहक डेटा लेखाकृत गर्ने तपाईँको उपकरणबाट फरक हुन सक्छ।"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"आपतकालीन कल"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"कलमा फर्किनुहोस्"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"प्रबन्धक कल"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"आपतकालीन प्रसारणहरू"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"आपतकालीन सतर्कताहरू"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"सञ्जाल संचालकहरू"</string>
     <string name="access_point_names" msgid="1381602020438634481">"बिन्दु नामहरूमा पहुँच"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"अभिवृद्धि गरिएको 4G LTE ढाँचा"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"निम्नको लागि उपयुक्त SIM"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"प्रत्येक पटक सोध्नुहोस्"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"छनौट आवश्यक छ"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"SIM को चयन"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"सेटिङहरू"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">लुकाइएका %d वस्तुहरू देखाउनुहोस्</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"अनुप्रयोग सूचनाहरू"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"सूचनाको प्रकार"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"महत्त्व"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"अनुप्रयोगलाई निर्णय गर्न दिनुहोस्"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"ध्वनिलाई अनुमति दिनुहोस्"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"सूचनाहरू कहिल्यै नदेखाउनुहोस्"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"कुनै आवाज ननिकाल्ने वा दृश्य सम्बन्धी अवरोध नपुर्याउने"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"आवाज ननिकाल्ने"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"आवाज निकाल्ने"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"आवाज निकाल्ने र स्क्रिनमा पपअप देखाउने"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"स्क्रिनमा देखाउनुहोस्"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"कम"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"सामान्य"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"उच्च"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"जरुरी"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"ध्वनिलाई अनुमति दिनुहोस्"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"ध्वनि, कम्पन नगर्नुहोस् वा हालको स्क्रिनमा यी सूचनाहरूलाई दृश्यमा नचियाउनुहोस्।"</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"अवरोधहरूहरूलाई अनुमति दिनुहोस्"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"अनुप्रयोगलाई बज्न, कम्पन गर्न र/वा स्क्रिनमा सूचनाहरू पप गर्न दिनुहोस्"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"न्यून महत्त्वको सूचना"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"सामान्य महत्वको सूचना"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"उच्च महत्त्वको सूचना"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"तस्बिरमा तस्बिर मोडमा तस्बिर"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Picture-in-picture लाई अनुमति दिनुहोस्"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"यो अनुप्रयोग खुला रहेको बेलामा वा तपाईंले यसलाई छाड्नुभएपछि (उदाहरणका लागि, भिडियो हेर्ने कार्य जारी राख्नको लागि) यस अनुप्रयोगलाई कुनै picture-in-picture विन्डो सिर्जना गर्न अनुमति दिनुहोस्। यो विन्डो तपाईंले प्रयोग गरिरहनुभएका अन्य अनुप्रयोगहरूको माथिपट्टि देखिन्छ।"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"यो अनुप्रयोग खुला रहेको अवस्थामा वा तपाईंले यसलाई छाड्नुभएपछि (उदाहरणका लागि, भिडियो हेर्ने कार्य जारी राख्न) यस अनुप्रयोगलाई picture-in-picture विन्डो सिर्जना गर्न अनुमति दिनुहोस्। यो विन्डो तपाईंले प्रयोग गरिरहनुभएका अन्य अनुप्रयोगहरूको शीर्ष भागमा देखिन्छ।"</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>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"फाइलहरू स्थानान्तरण गर्दै"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"तस्बिरहरू स्थानान्तरण गर्दै (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"यन्त्रलाई MIDI को रूपमा प्रयोग गर्दै"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS प्रतिविम्ब गर्ने सुविधा"</string>
     <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>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"रात्रि प्रकाशको समय तालिका सेट गर्नुहोस्"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"आफूलाई निदाउन सजिलो होस् भनेर स्क्रिनलाई हल्का एम्बर रङको बनाउनुहोस्"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"रात्रिको प्रकाश सक्रिय छ"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"स्क्रिनलाई हल्का एम्बर रङको बनाइएको छ। यसले तपाईँलाई निदाउन मद्दत गर्न सक्छ।"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"सुझावहरू"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"अझ सुन्दर प्रदर्शनको रंगहरू प्रयोग गर्नुहोस्"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"रंगको परिवर्तन लागू गर्न स्क्रिन बन्द गर्नुहोस्"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"टेलिफोनी मनिटरमा गरिएको परिवर्तनलाई लागू गर्न यन्त्रलाई पुनःबुट गर्नुहोस्"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"क्यामेरा HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"क्यामेरा HAL HDR+ मा गरिएको परिवर्तनलाई लागू गर्न यन्त्रलाई पुनः बुट गर्नुहोस्"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"क्यामेरा लेजरको सेन्सर"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"स्वचालित प्रणाली अद्यावधिकहरू"</string>
     <string name="usage" msgid="2977875522080448986">"उपयोग"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"मोबाइल डेटाको प्रयोग"</string>
@@ -3410,7 +3427,7 @@
     <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="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g> सम्म <xliff:g id="ID_1">%1$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">
@@ -3481,7 +3498,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"वाइप गरेर रूपान्तरण गर्नुहोस्"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager को दर-सीमित गर्ने सुविधालाई रिसेट गर्नुहोस्"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager को दर-सीमित गर्ने सुविधालाई रिसेट गरियो"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"लक स्क्रिनका सूचनाहरूलाई नियन्त्रण गर्नु"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"लक स्क्रिनमा जानकारी नियन्त्रण गर्नुहोस्"</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="8483187649355540109">"सहायता र सुझावहरू"</string>
@@ -3489,7 +3506,7 @@
     <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="2456198532288640046">"अन्य यन्त्रहरूले देख्न नसक्ने"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"निष्क्रिय छ"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> मा जडान गरियो"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"धेरै यन्त्रहरूमा जडान गरियो"</string>
     <string name="demo_mode" msgid="2798762752209330277">"प्रणालीको UI को प्रदर्शन मोड"</string>
@@ -3591,7 +3608,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"तात्कालिक अनुप्रयोगहरू"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"अनुप्रयोगहरूको स्थापना नगरिए तापनि लिंकहरूलाई तिनीहरूमा खोल्नुहोस्"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"तात्कालिक अनुप्रयोगहरू"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"तात्कालिक अनुप्रयोगहरूको खाता"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"तात्कालिक अनुप्रयोगका प्राथमिकताहरू"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"स्थापना गरिएका अनुप्रयोगहरू"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"तपाईंको भण्डारण अहिले भण्डारण प्रबन्धकद्वारा व्यवस्थापन भइरहेको छ"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> का खाताहरू"</string>
@@ -3638,7 +3655,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"तपाईँको व्यक्तिगत प्रोफाइलमा सधैँ-सक्रिय रहने VPN सेवा सक्रिय गरिएको छ"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"तपाईँको कार्य प्रोफाइलमा सधैँ-सक्रिय रहने VPN सेवा सक्रिय गरिएको छ"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"विश्वव्यापी HTTP प्रोक्सी सेट गरियो"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"विश्वसनीय प्रमाणहरू"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"विश्वसनीय प्रमाणपत्रहरू"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"तपाईंको व्यक्तिगत प्रोफाइलमा रहेका विश्वसनीय प्रमाणपत्रहरू"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"तपाईंको कार्य प्रोफाइलमा रहेका विश्वसनीय प्रमाणपत्रहरू"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">न्यूनतम <xliff:g id="COUNT_1">%d</xliff:g> CA का प्रमाणपत्र</item>
       <item quantity="one">न्यूनतम <xliff:g id="COUNT_0">%d</xliff:g> CA को प्रमाणपत्र</item>
@@ -3701,7 +3720,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"सेवा प्रदायकको प्रावधान सम्बन्धी जानकारी"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"सेवा प्रदायकको प्रावधानलाई ट्रिगर गर्नुहोस्"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"सेटिङहरूको गृहपृष्ठमा नयाँ र रोमाञ्चक के छ?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"शीर्ष ५ सुविधाहरू हेर्नुहोस्"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"आफ्नो नयाँ फोनको बारेमा राम्रोसँग जान्नुहोस्‌"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"आफ्नो नयाँ ट्याब्लेटको बारेमा राम्रोसँग जान्नुहोस्‌"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"आफ्नो नयाँ यन्त्रको बारेमा राम्रोसँग जान्नुहोस्‌"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"यस यन्त्रमा यो सुविधा उपलब्ध छैन"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS दर्ताको स्थिति"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"दर्ता गरिएको"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"दर्ता नगरिएको"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 263dddd..b4f99b0 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s wil toegang tot je berichten. Toegang geven aan %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Toegangsverzoek voor simkaart"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> wil toegang tot je simkaart. Als je toegang tot de simkaart verleent, wordt de gegevensverbinding op je apparaat uitgeschakeld voor de duur van de verbinding. Toegang verlenen aan <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Zichtbaar als <xliff:g id="DEVICE_NAME">^1</xliff:g> voor andere apparaten"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Zichtbaar als <xliff:g id="DEVICE_NAME">^1</xliff:g> voor andere apparaten"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Je apparaten"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Nieuw apparaat koppelen"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum en tijd"</string>
@@ -195,8 +195,8 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"De HTTP-proxy wordt gebruikt door de browser, maar mogelijk niet door de andere apps."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Mobiele locatiegegevens (beëindigd):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Mobiele gegevens voor locatie in de buurt (beëindigd):"</string>
-    <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Vernieuwingsfrequentie van mobiele gegevens:"</string>
+    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Mobiele data voor locatie in de buurt (beëindigd):"</string>
+    <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Vernieuwingsfrequentie van mobiele data:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Alle mobiele meetgegevens:"</string>
     <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Realtime informatie over gegevensverbinding:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Gegevensservice:"</string>
@@ -292,15 +292,15 @@
     <string name="sms_messages_title" msgid="1778636286080572535">"Sms\'jes"</string>
     <string name="cellular_data_summary" msgid="4660351864416939504">"Datagebruik via mobiel netwerk toestaan"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Geg.gebr. bij roaming toestaan"</string>
-    <string name="roaming" msgid="3596055926335478572">"Gegevensroaming"</string>
+    <string name="roaming" msgid="3596055926335478572">"Dataroaming"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Verbinding maken met dataservices tijdens roaming"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Verbinding maken met dataservices tijdens roaming"</string>
-    <string name="roaming_reenable_message" msgid="9141007271031717369">"De gegevensverbinding is verbroken, omdat je je thuisnetwerk hebt verlaten terwijl gegevensroaming was uitgeschakeld."</string>
+    <string name="roaming_reenable_message" msgid="9141007271031717369">"De gegevensverbinding is verbroken, omdat je je thuisnetwerk hebt verlaten terwijl dataroaming was uitgeschakeld."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Inschakelen"</string>
     <string name="roaming_warning" msgid="4275443317524544705">"Er kunnen hoge kosten in rekening worden gebracht."</string>
-    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Wanneer je gegevensroaming toestaat, kunnen er hoge roamingkosten in rekening worden gebracht.\n\nDeze instelling is van invloed op alle gebruikers van deze tablet."</string>
-    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Wanneer je gegevensroaming toestaat, kunnen er hoge roamingkosten in rekening worden gebracht.\n\nDeze instelling is van invloed op alle gebruikers van deze telefoon."</string>
-    <string name="roaming_reenable_title" msgid="6068100976707316772">"Gegevensroaming toestaan?"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Wanneer je dataroaming toestaat, kunnen er hoge roamingkosten in rekening worden gebracht.\n\nDeze instelling is van invloed op alle gebruikers van deze tablet."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Wanneer je dataroaming toestaat, kunnen er hoge roamingkosten in rekening worden gebracht.\n\nDeze instelling is van invloed op alle gebruikers van deze telefoon."</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Dataroaming toestaan?"</string>
     <string name="networks" msgid="6333316876545927039">"Operator selecteren"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Een mobiele provider kiezen"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum en tijd"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Volgende"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Vingerafdruk overslaan?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Het instellen van een vingerafdruk kost slechts een minuut of twee. Als je dit nu overslaat, kun je je vingerafdruk later toevoegen via de instellingen."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Schermvergrendeling overslaan?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"De apparaatbeschermingsfuncties worden niet ingeschakeld. Je kunt niet voorkomen dat anderen deze tablet gebruiken als je deze verliest, als de tablet wordt gestolen of als deze wordt gereset."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"De apparaatbeschermingsfuncties worden niet ingeschakeld. Je kunt niet voorkomen dat anderen dit apparaat gebruiken als je het verliest, als het wordt gestolen of als het wordt gereset."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"De apparaatbeschermingsfuncties worden niet ingeschakeld. Je kunt niet voorkomen dat anderen deze telefoon gebruiken als je deze verliest, als de telefoon wordt gestolen of als deze wordt gereset."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Je hebt het maximale aantal vingerafdrukken toegevoegd"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Kan geen extra vingerafdrukken toevoegen"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Alle vingerafdrukken verwijderen?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' verwijderen"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Wil je deze vingerafdruk verwijderen?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Je kunt je vingerafdrukken niet gebruiken om je telefoon te ontgrendelen, aankopen te autoriseren of in te loggen bij apps"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Je kunt je vingerafdrukken niet gebruiken om je werkprofiel te ontgrendelen, aankopen te autoriseren of in te loggen bij werk-apps"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Ja, verwijderen"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Je tablet beschermen"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Je apparaat beschermen"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Bescherm je telefoon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Stel een extra schermvergrendeling in voor betere beveiliging."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Stel een extra schermvergrendeling in voor betere beveiliging."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Stel apparaatbeschermingsfuncties in om te voorkomen dat anderen deze tablet zonder je toestemming gebruiken. Kies de schermvergrendeling die je wilt gebruiken."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Stel apparaatbeschermingsfuncties in om te voorkomen dat anderen dit apparaat zonder je toestemming gebruiken. Kies de schermvergrendeling die je wilt gebruiken."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Stel apparaatbeschermingsfuncties in om te voorkomen dat anderen deze telefoon zonder je toestemming gebruiken. Kies de schermvergrendeling die je wilt gebruiken."</string>
@@ -497,37 +502,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Apparaatbeveiliging verwijderen?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Profielbeveiliging verwijderen?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"De apparaatbeveiliging werkt niet zonder je patroon."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"De apparaatbeveiliging werkt niet zonder je patroon.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"De apparaatbeveiliging werkt niet zonder je patroon.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Je opgeslagen vingerafdrukken worden ook verwijderd van dit apparaat en het is niet mogelijk je telefoon te ontgrendelen, aankopen te autoriseren of in te loggen bij apps zonder deze vingerafdrukken."</string>
+</xliff:g>Je opgeslagen vingerafdrukken worden ook verwijderd van dit apparaat. Het is dan niet meer mogelijk je telefoon te ontgrendelen, toestemming te geven voor aankopen of in te loggen bij apps met deze vingerafdrukken."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"De apparaatbeveiliging werkt niet zonder je pincode."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"De apparaatbeveiliging werkt niet zonder je pincode.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"De apparaatbeveiliging werkt niet zonder je pincode.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Je opgeslagen vingerafdrukken worden ook verwijderd van dit apparaat en het is niet mogelijk je telefoon te ontgrendelen, aankopen te autoriseren of in te loggen bij apps zonder deze vingerafdrukken."</string>
+</xliff:g>Je opgeslagen vingerafdrukken worden ook verwijderd van dit apparaat. Het is dan niet meer mogelijk je je telefoon te ontgrendelen, toestemming te geven voor aankopen of in te loggen bij apps met deze vingerafdrukken."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"De apparaatbeveiliging werkt niet zonder je wachtwoord."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"De apparaatbeveiliging werkt niet zonder je wachtwoord.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"De apparaatbeveiliging werkt niet zonder je wachtwoord.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Je opgeslagen vingerafdrukken worden ook verwijderd van dit apparaat en het is niet mogelijk je telefoon te ontgrendelen, aankopen te autoriseren of in te loggen bij apps zonder deze vingerafdrukken."</string>
+</xliff:g>Je opgeslagen vingerafdrukken worden ook verwijderd van dit apparaat. Het is dan niet meer mogelijk je telefoon te ontgrendelen, toestemming te geven voor aankopen of in te loggen bij apps met deze vingerafdrukken."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"De apparaatbeveiliging werkt niet zonder je schermvergendeling."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"De apparaatbeveiliging werkt niet zonder je schermvergendeling.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"De apparaatbeveiliging werkt niet zonder je schermvergendeling.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Je opgeslagen vingerafdrukken worden ook verwijderd van dit apparaat en het is niet mogelijk je telefoon te ontgrendelen, aankopen te autoriseren of in te loggen bij apps zonder deze vingerafdrukken."</string>
+</xliff:g>Je opgeslagen vingerafdrukken worden ook verwijderd van dit apparaat. Het is dan niet meer mogelijk je je telefoon te ontgrendelen, toestemming te geven voor aankopen of in te loggen bij apps met deze vingerafdrukken."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Functies voor profielbeveiliging werken niet zonder je patroon."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Functies voor profielbeveiliging werken niet zonder je patroon.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Functies voor profielbeveiliging werken niet zonder je patroon.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Je opgeslagen vingerafdrukken worden ook verwijderd uit dit profiel. Het is bovendien niet mogelijk om je profiel te ontgrendelen, toestemming te geven voor aankopen of in te loggen bij apps met deze vingerafdrukken."</string>
+</xliff:g>Je opgeslagen vingerafdrukken worden ook verwijderd uit dit profiel. Het is dan niet meer mogelijk om je profiel te ontgrendelen, toestemming te geven voor aankopen of in te loggen bij apps met deze vingerafdrukken."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Functies voor profielbeveiliging werken niet zonder je pincode."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Functies voor profielbeveiliging werken niet zonder je pincode.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Functies voor profielbeveiliging werken niet zonder je pincode.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Je opgeslagen vingerafdrukken worden ook verwijderd uit dit profiel. Het is bovendien niet mogelijk om je profiel te ontgrendelen, toestemming te geven voor aankopen of in te loggen bij apps met deze vingerafdrukken."</string>
+</xliff:g>Je opgeslagen vingerafdrukken worden ook verwijderd uit dit profiel. Het is dan niet meer mogelijk om je profiel te ontgrendelen, toestemming te geven voor aankopen of in te loggen bij apps met deze vingerafdrukken."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Functies voor profielbeveiliging werken niet zonder je wachtwoord."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Functies voor profielbeveiliging werken niet zonder je wachtwoord.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Functies voor profielbeveiliging werken niet zonder je wachtwoord.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Je opgeslagen vingerafdrukken worden ook verwijderd uit dit profiel. Het is bovendien niet mogelijk om je profiel te ontgrendelen, toestemming te geven voor aankopen of in te loggen bij apps met deze vingerafdrukken."</string>
+</xliff:g>Je opgeslagen vingerafdrukken worden ook verwijderd uit dit profiel. Het is dan niet meer mogelijk om je profiel te ontgrendelen, toestemming te geven voor aankopen of in te loggen bij apps met deze vingerafdrukken."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Functies voor profielbeveiliging werken niet zonder je schermvergendeling."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Functies voor profielbeveiliging werken niet zonder je schermvergrendeling.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Functies voor profielbeveiliging werken niet zonder je schermvergrendeling.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Je opgeslagen vingerafdrukken worden ook verwijderd uit dit profiel. Het is bovendien niet mogelijk om je profiel te ontgrendelen, toestemming te geven voor aankopen of in te loggen bij apps met deze vingerafdrukken."</string>
+</xliff:g>Je opgeslagen vingerafdrukken worden ook verwijderd uit dit profiel. Het is dan niet meer mogelijk om je profiel te ontgrendelen, toestemming te geven voor aankopen of in te loggen bij apps met deze vingerafdrukken."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Ja, verwijderen"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Ontgrendelingspatroon wijzigen"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Pincode voor ontgrendelen wijzigen"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Een oplopende, aflopende of herhaalde reeks cijfers is niet toegestaan"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Annuleren"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Wissen"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Annuleren"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Volgende"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Het instellen is voltooid."</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS beschikbaar"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS beschikbaar)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Geef je netwerkwachtwoord op"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Wifi-netwerk van provider"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Verbinden via <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Om de locatieprecisie te verbeteren en voor andere doeleinden, wil <xliff:g id="APP_NAME">%1$s</xliff:g> de netwerkscan inschakelen, zelfs als wifi is uitgeschakeld.\n\nDit toestaan voor alle apps die willen scannen?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Ga in het overloopmenu naar \'Geavanceerd\' om dit uit te schakelen."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Toestaan"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Verbinden"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Kan geen verbinding maken met het netwerk"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Vergeten"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Aanpassen"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Vergeten van netwerk is mislukt"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Opslaan"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Opslaan van netwerk is mislukt"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Geavanceerde wifi-instellingen"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-adres"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-adres"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Netwerkinformatie"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnetmasker"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-adressen"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Uitnodiging annuleren?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Wil je de uitnodiging voor verbinding met <xliff:g id="PEER_NAME">%1$s</xliff:g> annuleren?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Deze groep vergeten?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Draagbare wifi-hotspot"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wifi-hotspot"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Internet of content wordt niet gedeeld met andere apparaten"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Internetverbinding van deze tablet delen via hotspot"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Internetverbinding van deze telefoon delen via hotspot"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"App deelt content. Als je je internetverbinding wilt delen, schakel je de hotspot uit en weer in."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wifi-naam"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Naam hotspot"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> inschakelen..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Andere apparaten kunnen verbinding maken met <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wifi-wachtwoord"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Wachtwoord hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Frequentieband voor toegangspunt"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Gebruik een hotspot om een wifi-netwerk te maken voor je andere apparaten. De hotspot biedt internet via je mobiele dataverbinding. Er kunnen extra kosten voor mobiele data van toepassing zijn."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Apps kunnen hotspots maken om content te delen met apparaten in de buurt."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Adres dat door noodhulpdiensten als je locatie wordt gebruikt als je het noodnummer belt via wifi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Weergave"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Geluid"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Zoeken"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Instellingen voor zoeken en zoekgeschiedenis beheren"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Geen resultaten"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Geschiedenis wissen"</string>
     <string name="display_settings" msgid="7965901687241669598">"Weergave"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Scherm autom. draaien"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Levendige kleuren"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Standaard-APN-instellingen herstellen."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Standaardinstellingen herstellen"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Herstellen van standaard-APN-instellingen voltooid."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Resetten"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Netwerk resetten"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Opties voor resetten"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Netwerk, apps of apparaat kunnen worden gereset"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Wifi, mobiel en Bluetooth resetten"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Hiermee worden alle netwerkinstellingen gereset, waaronder:\n\n"<li>"wifi"</li>\n<li>"mobiele data"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Instellingen resetten"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Alle netwerkinstellingen resetten? Je kunt deze actie niet ongedaan maken."</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Resetten?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Netwerk herstellen is niet beschikbaar voor deze gebruiker"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Netwerkinstellingen zijn gereset"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Fabrieksinstellingen herstellen"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> accounts worden gereset</item>
-      <item quantity="one">1 account wordt gereset</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Interne opslag en alle gegevens worden gereset"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Alle gegevens wissen (fabrieksinstellingen terugzetten)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van je telefoon gewist, waaronder:\n\n"<li>"Je Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de apps"</li>\n<li>"Gedownloade apps"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van je telefoon gewist, waaronder:\n\n"<li>"Je Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de apps"</li>\n<li>"Gedownloade apps"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Je bent momenteel aangemeld bij de volgende accounts:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Veiligheidsinformatie"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Je hebt geen gegevensverbinding. Als je deze informatie nu wilt weergeven, ga je op een computer met internetverbinding naar %s."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Laden..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Je wachtwoord kiezen"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Een schermvergrendeling instellen"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Stel een wachtwoord in voor betere beveiliging"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Stel wachtwoord in voor gebruik van vingerafdruk"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Je patroon kiezen"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Stel patroon in voor gebruik van vingerafdruk"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Je pincode kiezen"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Stel een pincode in voor betere beveiliging"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Stel pincode in voor gebruik van vingerafdruk"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Je wachtwoord bevestigen"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Geef je wachtwoord opnieuw op"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Je patroon bevestigen"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Bevestig de pincode"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Geef je pincode opnieuw op"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Wachtwoorden komen niet overeen"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Pincodes komen niet overeen"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Ontgrendelingsmethode"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Geef het patroon van je werkprofiel op om door te gaan"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Geef de pincode van je werkprofiel op om door te gaan"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Geef het wachtwoord van je werkprofiel op om door te gaan"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Gebruik het patroon van het apparaat om door te gaan. Vereist na opnieuw opstarten."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Geef de pincode van het apparaat op om door te gaan. Vereist na opnieuw opstarten."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Geef het wachtwoord van het apparaat op om door te gaan. Vereist na opnieuw opstarten."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Teken het patroon van je werkprofiel om door te gaan. Vereist na opnieuw opstarten."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Geef de pincode van je werkprofiel op om door te gaan. Vereist na opnieuw opstarten."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Geef het wachtwoord van je werkprofiel op om door te gaan. Vereist na opnieuw opstarten."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Geef voor extra veiligheid je apparaatpatroon op"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Geef voor extra veiligheid je apparaatpincode op"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Geef voor extra veiligheid je apparaatwachtwoord op"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Geef voor extra veiligheid het patroon voor je werkprofiel op"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Geef voor extra veiligheid de pincode voor je werkprofiel op"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Geef voor extra veiligheid het wachtwoord voor je werkprofiel op"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Je telefoon is teruggezet op de fabrieksinstellingen. Geef je vorige patroon op."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Je telefoon is teruggezet op de fabrieksinstellingen. Geef je vorige pincode op."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Je telefoon is teruggezet op de fabrieksinstellingen. Geef je vorige wachtwoord op."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Patroon verifiëren"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Pincode verifiëren"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Wachtwoord verifiëren"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Onjuiste pincode"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Onjuist wachtwoord"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Onjuist patroon"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Widget maken en toegang toestaan?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Nadat je de widget hebt gemaakt, heeft <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> toegang tot alle gegevens die de widget weergeeft."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> altijd toestaan widgets te maken en toegang tot de widgetgegevens geven"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>u <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>u <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> u <xliff:g id="MINUTES">%3$d</xliff:g> m"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> u <xliff:g id="MINUTES">%2$d</xliff:g> m"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Gebruiksstatistieken"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Gebruiksstatistieken"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sorteren op:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Schermlezers, display, interactieopties"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Optische instellingen"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Je kunt dit apparaat aanpassen aan je behoeften. Deze toegankelijkheidsfuncties kunnen later worden gewijzigd in Instellingen."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Lettergrootte vergroten"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Lettergrootte wijzigen"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Schermlezers"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio en tekst op het scherm"</string>
     <string name="display_category_title" msgid="685461049938269166">"Display"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Als je wilt inzoomen"</b>", tik je drie keer snel achter elkaar op het scherm.\n"<ul><li>"Veeg met twee of meer vingers om te scrollen"</li>\n<li>"Knijp twee of meer vingers samen om te zoomen"</li></ul>\n\n<b>"Als je tijdelijk wilt zoomen"</b>", tik je drie keer snel achter elkaar op het scherm en houd je het scherm vast bij de derde tik.\n"<ul><li>"Sleep om een ander deel van het scherm weer te geven"</li>\n<li>"Haal je vinger van het scherm om uit te zoomen"</li></ul>\n\n"Je kunt niet inzoomen op het toetsenbord of de navigatiebalk."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Als Vergroting is ingeschakeld, kun je met de knop Toegankelijkheid onderaan het scherm het beeld snel vergroten.\n\n"<b>"Als je wilt zoomen"</b>", tik je op de knop Toegankelijkheid en tik je vervolgens ergens op het scherm.\n"<ul><li>"Veeg met twee of meer vingers om te scrollen"</li>\n<li>"Knijp twee of meer vingers samen om te zoomen"</li></ul>\n\n<b>"Als je tijdelijk wilt zoomen"</b>", tik je op de knop Toegankelijkheid. Tik ergens op het scherm en houd vast.\n"<ul><li>"Sleep om een ander deel van het scherm weer te geven"</li>\n<li>"Haal je vinger van het scherm om uit te zoomen"</li></ul>\n\n"Je kunt niet inzoomen op het toetsenbord of de navigatiebalk."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Toegankelijkheid is ingesteld op <xliff:g id="SERVICE">%1$s</xliff:g>. Als je vergroting wilt gebruiken, tik je op de knop Toegankelijkheid, houd je deze vast en selecteer je Vergroting."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Snelle link toegankelijkheid"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Sneltoets via volumeknop"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Service van snelkoppeling"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Toestaan vanaf vergrendeld scherm"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Als de snelkoppeling is ingeschakeld, kun je een toegankelijkheidsfunctie openen door drie seconden op beide volumeknoppen te drukken."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Wanneer de sneltoets is ingeschakeld, kun je drie seconden op beide volumeknoppen drukken om een toegankelijkheidsfunctie te openen."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Tekst met hoog contrast"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Schermvergroting automatisch updaten"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Schermvergroting updaten bij app-overgangen"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Kan gevolgen hebben voor de prestaties"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klikken als muisaanwijzer niet meer beweegt"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Vertraging vóór klikken"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"AAN"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"UIT"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Weergeven in Snelle instellingen"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> van <xliff:g id="TOTAL">%2$d</xliff:g> geselecteerd"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> van <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Alles selecteren"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Abonnementen beheren"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datagebruik"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Gegevensgebruik van app"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"De door de provider berekende gegevens kunnen afwijken van de berekening van je apparaat."</string>
@@ -2367,7 +2373,7 @@
     <string name="data_usage_data_limit" msgid="1193930999713192703">"Gegevenslimiet instellen"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Gegevensgebruikcyclus"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"Appgebruik"</string>
-    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Gegevensroaming"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Dataroaming"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Achtergrondgegevens beperken"</string>
     <string name="data_usage_menu_allow_background" msgid="2694761978633359223">"Achtergrondgegev. toestaan"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"4G-gebruik apart weergeven"</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobiele netwerken"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Betaalde wifi-netwerken"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Als je betaalde netwerken wilt selecteren, schakel je wifi in."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatisch"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Betaald"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Niet betaald"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"De door de provider berekende gegevens kunnen afwijken van die van je apparaat."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Noodoproep"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Terug naar gesprek"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Oproepbeheer"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Nooduitzendingen"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Noodwaarschuwingen"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Netwerkproviders"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Namen van toegangspunten"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Geoptimaliseerde 4G LTE-modus"</string>
@@ -2700,7 +2709,7 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"Tik om een simkaart voor gegevens te selecteren"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Altijd gebruiken voor oproepen"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Selecteer een simkaart voor gegevens"</string>
-    <string name="data_switch_started" msgid="2040761479817166311">"Schakelen naar simkaart voor mobiele gegevens, dit kan even duren…"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Schakelen naar simkaart voor mobiele data, dit kan even duren…"</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Bellen met"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Een simkaart selecteren"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"Simkaart <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Voorkeurssimkaart voor"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Elke keer vragen"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Selectie vereist"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Simkaartselectie"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Instellingen"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">%d verborgen items weergeven</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"App-meldingen"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Meldingscategorie"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Belang"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Laat de app beslissen"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Geluid toestaan"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nooit meldingen weergeven"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Geen geluid of visuele onderbreking"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Geen geluid"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Geluid laten horen"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Geluid laten horen en op het scherm weergeven"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Weergeven op scherm"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Laag"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Gemiddeld"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Hoog"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgent"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Geluid toestaan"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Geen geluid laten horen, niet trillen en deze meldingen niet weergeven op het huidige scherm."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Onderbrekingen toestaan"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"De app geluid laten maken, laten trillen en/of meldingen laten weergeven op het scherm"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Klein belang"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Gemiddeld belang"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Groot belang"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip picture beeld in"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Scherm-in-scherm"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Scherm-in-scherm toestaan"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Geef deze app toestemming om een scherm-in-scherm-venster te maken als de app open is of als je de app verlaat (bijvoorbeeld om een video te blijven kijken). Dit venster wordt weergegeven vóór andere apps die je gebruikt."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Geef deze app toestemming om een beeld-in-beeld-venster te maken als de app open is of als je de app verlaat (bijvoorbeeld om een video te blijven kijken). Dit venster wordt weergegeven vóór andere apps die je gebruikt."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Toegang tot \'Niet storen\'"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Er zijn geen geïnstalleerde apps die toegang tot \'Niet storen\' hebben aangevraagd"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Apps laden..."</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Bestanden overzetten"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Foto\'s overzetten (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Apparaat gebruiken als MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Sms-mirroring"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Achtergrondcontrole"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Volledige toegang tot achtergrond"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Tekst van scherm gebruiken"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Planning van Nachtverlichting instellen"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Een oranje scherm helpt je in slaap vallen"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Nachtverlichting ingeschakeld"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Het scherm heeft een oranje tint. Hierdoor val je mogelijk beter in slaap."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Suggesties"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Koelere weergavekleuren gebruiken"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Schakel het scherm uit om de kleurwijziging toe te passen"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Start het apparaat opnieuw op om de wijziging in Telephony Monitor toe te passen"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Camera HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Start het apparaat opnieuw op om de wijziging in Camera HAL HDR+ toe te passen"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Cameralasersensor"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatische systeemupdates"</string>
     <string name="usage" msgid="2977875522080448986">"Gebruik"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Gebruik van mobiele data"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Datawaarschuwing"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Datalimiet instellen"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datalimiet"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> gebruikt tussen <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> gebruikt in de periode <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configureren"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Andere apps opgenomen in gebruik"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Wissen en converteren"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Frequentielimieten van ShortcutManager opnieuw instellen"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"De frequentielimieten van ShortcutManager zijn opnieuw ingesteld."</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Meldingen voor vergrendelingsscherm beheren"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Informatie op 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="8483187649355540109">"Ondersteuning &amp; tips"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Er zijn geen geïnstalleerde apps die premium sms-toegang hebben aangevraagd"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium sms\'jes kunnen je geld kosten en worden toegevoegd aan de facturen van je provider. Als je rechten aan een app verleent, kun je premium sms\'jes verzenden met die app."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Premium sms-toegang"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Niet zichtbaar voor andere apparaten"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Uit"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Verbonden met <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Verbonden met meerdere apparaten"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Demomodus voor systeemgebruikersinterface"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Instant-apps"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Links openen in apps, zelfs als deze niet zijn geïnstalleerd"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Instant-apps"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Account voor instant-apps"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Voorkeuren voor instant-apps"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Geïnstalleerde apps"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Je opslag wordt nu beheerd door de opslagbeheerder"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Accounts voor <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Always-on VPN ingeschakeld in je persoonlijke profiel"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Always-on VPN ingeschakeld in je werkprofiel"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Algemene HTTP-proxy ingesteld"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Vertrouwde certificaatgegevens"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Vertrouwde certificaatgegevens"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Vertrouwde certificaatgegevens in je persoonlijke profiel"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Vertrouwde certificaatgegevens in je werkprofiel"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Minimaal <xliff:g id="COUNT_1">%d</xliff:g> CA-certificaten</item>
       <item quantity="one">Minimaal <xliff:g id="COUNT_0">%d</xliff:g> CA-certificaat</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Gegevens voor providerregistratie"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Providerregistratie activeren"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Wat is er nieuw en interessant?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"De vijf belangrijkste functies controleren"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Een rondleiding volgen voor je nieuwe telefoon"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Een rondleiding volgen voor je nieuwe tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Een rondleiding volgen voor je nieuwe apparaat"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Deze functie is niet beschikbaar op dit apparaat"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS-registratiestatus"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Geregistreerd"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Niet geregistreerd"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 8112c2d..de95e3b 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ਤੁਹਾਡੇ ਸੁਨੇਹਿਆਂ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ। ਕੀ %2$s ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰਨੀ ਹੈ?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"ਸਿਮ ਪਹੁੰਚ ਬੇਨਤੀ"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ਤੁਹਾਡੇ ਸਿਮ ਕਾਰਡ ਦੀ ਪਹੁੰਚ ਕਰਨਾ ਚਾਹੁੰਦਾ/ਚਾਹੁੰਦੀ ਹੈ। ਸਿਮ ਕਾਰਡ ਦੀ ਪਹੁੰਚ ਦੇਣਾ ਕਨੈਕਸ਼ਨ ਦੀ ਸਮਾਂ ਮਿਆਦ ਦੇ ਲਈ ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਕਨੈਕਟਿਵਿਟੀ ਨੂੰ ਅਸਮਰਥਿਤ ਕਰ ਦੇਵੇਗਾ। <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> ਨੂੰ ਪਹੁੰਚ ਦਿਓ"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"ਹੋਰਾਂ ਡੀਵਾਈਸਾਂ ਲਈ <xliff:g id="DEVICE_NAME">^1</xliff:g> ਵਜੋਂ ਦਿਖਣਯੋਗ ਹੈ"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"ਹੋਰਾਂ ਡੀਵਾਈਸਾਂ ਲਈ <xliff:g id="DEVICE_NAME">^1</xliff:g> ਵਜੋਂ ਦਿਖਣਯੋਗ"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ਤੁਹਾਡੀਆਂ ਡੀਵਾਈਸਾਂ"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ਨਵਾਂ ਡੀਵਾਈਸ ਜੋੜਾਬੱਧ ਕਰੋ"</string>
     <string name="date_and_time" msgid="9062980487860757694">"ਤਾਰੀਖ ਅਤੇ ਸਮਾਂ"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"ਅੱਗੇ"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"ਕੀ ਫਿੰਗਰਪ੍ਰਿੰਟ ਛੱਡਣਾ ਹੈ?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸਥਾਪਨਾ ਵਿੱਚ ਸਿਰਫ਼ ਇੱਕ ਜਾਂ ਦੋ ਮਿੰਟ ਲੱਗਦੇ ਹਨ। ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਨੂੰ ਛੱਡ ਦਿੰਦੇ ਹੋ, ਤਾਂ ਤੁਸੀਂ ਬਾਅਦ ਵਿੱਚ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"ਕੀ ਸਕ੍ਰੀਨ  ਲਾਕ  ਨੂੰ ਛੱਡਣਾ ਹੈ?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਚਾਲੂ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਗੁੰਮ ਹੋ ਜਾਂਦਾ ਹੈ, ਚੋਰੀ ਹੋ ਜਾਂਦਾ ਹੈ ਜਾਂ ਰੀਸੈੱਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਗੇ।"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਚਾਲੂ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਗੁੰਮ, ਚੋਰੀ ਹੋ ਜਾਂਦਾ ਹੈ ਜਾਂ ਰੀਸੈੱਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਗੇ।"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਚਾਲੂ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡਾ ਫ਼ੋਨ ਗੁੰਮ, ਚੋਰੀ ਹੋ ਜਾਂਦਾ ਹੈ ਜਾਂ ਰੀਸੈੱਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸਦੀ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਗੇ।"</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"ਤੁਸੀਂ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਦੀ ਅਧਿਕਤਮ ਸੰਖਿਆ ਨੂੰ ਸ਼ਾਮਲ ਕੀਤਾ ਹੋਇਆ ਹੈ"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"ਹੋਰ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"ਕੀ ਸਾਰੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਹਟਾਉਣੇ ਹਨ?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' ਨੂੰ ਹਟਾਓ"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"ਕੀ ਤੁਸੀਂ ਇਸ ਫਿੰਗਰਪ੍ਰਿੰਟ ਨੂੰ ਮਿਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ ਜਾਂ ਉਹਨਾਂ ਨਾਲ ਐਪਾਂ \'ਤੇ ਸਾਈਨ-ਇਨ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਸਕੋਂਗੇ"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"ਤੁਸੀਂ ਆਪਣੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ ਜਾਂ ਕਾਰਜ ਐਪਾਂ \'ਤੇ ਸਾਈਨ-ਇਨ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਸਕੋਂਗੇ"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"ਹਾਂ, ਹਟਾਓ"</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"ਵਾਧੂ ਸੁਰੱਖਿਆ ਲਈ, ਕੋਈ ਬੈਕਅੱਪ ਸਕ੍ਰੀਨ  ਲਾਕ  ਸਥਾਪਤ ਕਰੋ।"</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"ਵਾਧੂ ਸੁਰੱਖਿਆ ਲਈ, ਕੋਈ ਬੈਕਅੱਪ ਸਕ੍ਰੀਨ  ਲਾਕ  ਸਥਾਪਤ ਕਰੋ।"</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>
@@ -497,37 +502,37 @@
     <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_fingerprint" msgid="8212242533942400457">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪੈਟਰਨ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪੈਟਰਨ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ਤੁਹਾਡੇ ਸੁਰੱਖਿਅਤ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵੀ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ ਅਤੇ ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਰੀਆਂ ਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰਨ, ਜਾਂ ਉਹਨਾਂ ਦੇ ਨਾਲ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਹੋਵੋਗੇ।\""</string>
+</xliff:g>ਤੁਹਾਡੇ ਰੱਖਿਅਤ ਕੀਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਵੀ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਹਟਾਇਆ ਜਾਵੇਗਾ ਅਤੇ ਤੁਸੀਂ ਉਹਨਾਂ ਨਾਲ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਰਹੋਗੇ।"</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਿੰਨ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਿੰਨ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਿੰਨ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ਤੁਹਾਡੇ ਸੁਰੱਖਿਅਤ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵੀ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ ਅਤੇ ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਰੀਆਂ ਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰਨ, ਜਾਂ ਉਹਨਾਂ ਦੇ ਨਾਲ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਹੋਵੋਗੇ।\""</string>
+</xliff:g>ਤੁਹਾਡੇ ਰੱਖਿਅਤ ਕੀਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਵੀ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਹਟਾਇਆ ਜਾਵੇਗਾ ਅਤੇ ਤੁਸੀਂ ਉਹਨਾਂ ਨਾਲ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਰਹੋਗੇ।"</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ਤੁਹਾਡੇ ਸੁਰੱਖਿਅਤ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵੀ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ ਅਤੇ ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਰੀਆਂ ਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰਨ, ਜਾਂ ਉਹਨਾਂ ਦੇ ਨਾਲ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਹੋਵੋਗੇ।"</string>
+</xliff:g>ਤੁਹਾਡੇ ਰੱਖਿਅਤ ਕੀਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਵੀ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਹਟਾਇਆ ਜਾਵੇਗਾ ਅਤੇ ਤੁਸੀਂ ਉਹਨਾਂ ਨਾਲ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਰਹੋਗੇ।"</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਸਕ੍ਰੀਨ ਲਾਕ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ਤੁਹਾਡੇ ਰੱਖਿਅਤ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵੀ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ ਅਤੇ ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਰੀਆਂ ਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰਨ, ਜਾਂ ਉਹਨਾਂ ਦੇ ਨਾਲ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਹੋਵੋਗੇ।\""</string>
+</xliff:g>ਤੁਹਾਡੇ ਰੱਖਿਅਤ ਕੀਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਵੀ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਹਟਾਇਆ ਜਾਵੇਗਾ ਅਤੇ ਤੁਸੀਂ ਉਹਨਾਂ ਨਾਲ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਰਹੋਗੇ।"</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"ਪ੍ਰੋਫਾਈਲ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪੈਟਰਨ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Profile protection features will not work without your pattern.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"ਪ੍ਰੋਫਾਈਲ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪੈਟਰਨ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Your saved fingerprints will also be removed from this profile and you wont be able to unlock your profile, authorize purchases, or sign in to apps with them.\""</string>
+</xliff:g>ਤੁਹਾਡੇ ਰੱਖਿਅਤ ਕੀਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਵੀ ਇਸ ਪ੍ਰੋਫਾਈਲ ਤੋਂ ਹਟਾਇਆ ਜਾਵੇਗਾ ਅਤੇ ਤੁਸੀਂ ਉਹਨਾਂ ਨਾਲ ਆਪਣੇ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਰਹੋਂਗੇ।"</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"ਪ੍ਰੋਫਾਈਲ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਿੰਨ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"ਪ੍ਰੋਫਾਈਲ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਿੰਨ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"ਪ੍ਰੋਫਾਈਲ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਿੰਨ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
 
 </xliff:g>ਤੁਹਾਡੇ ਰੱਖਿਅਤ ਕੀਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਵੀ ਇਸ ਪ੍ਰੋਫਾਈਲ ਤੋਂ ਹਟਾਇਆ ਜਾਵੇਗਾ ਅਤੇ ਤੁਸੀਂ ਉਹਨਾਂ ਨਾਲ ਆਪਣੇ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਰਹੋਗੇ।"</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"ਪ੍ਰੋਫਾਈਲ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"ਪ੍ਰੋਫਾਈਲ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਿੰਨ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"ਪ੍ਰੋਫਾਈਲ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ਤੁਹਾਡੇ ਰੱਖਿਅਤ ਕੀਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਵੀ ਇਸ ਪ੍ਰੋਫਾਈਲ ਤੋਂ ਹਟਾਇਆ ਜਾਵੇਗਾ ਅਤੇ ਤੁਸੀਂ ਉਹਨਾਂ ਨਾਲ ਆਪਣੇ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਰਹੋਗੇ।"</string>
+</xliff:g>ਤੁਹਾਡੇ ਰੱਖਿਅਤ ਕੀਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਵੀ ਇਸ ਪ੍ਰੋਫਾਈਲ ਤੋਂ ਹਟਾਇਆ ਜਾਵੇਗਾ ਅਤੇ ਤੁਸੀਂ ਉਹਨਾਂ ਨਾਲ ਆਪਣੇ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਰਹੋਂਗੇ।"</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"ਪ੍ਰੋਫਾਈਲ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਸਕ੍ਰੀਨ  ਲਾਕ  ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Profile protection features will not work without your screen lock.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"ਪ੍ਰੋਫਾਈਲ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਸਕ੍ਰੀਨ ਲਾਕ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Your saved fingerprints will also be removed from this profile and you wont be able to unlock your profile, authorize purchases, or sign in to apps with them.\""</string>
+</xliff:g>ਤੁਹਾਡੇ ਰੱਖਿਅਤ ਕੀਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਵੀ ਇਸ ਪ੍ਰੋਫਾਈਲ ਤੋਂ ਹਟਾਇਆ ਜਾਵੇਗਾ ਅਤੇ ਤੁਸੀਂ ਉਹਨਾਂ ਨਾਲ ਆਪਣੇ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਰਹੋਂਗੇ।"</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"ਹਾਂ, ਹਟਾਓ"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"ਅਣਲਾਕ ਪੈਟਰਨ ਬਦਲੋ"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ਅਣਲਾਕ ਪਿੰਨ ਬਦਲੋ"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"ਅੰਕਾਂ ਦਾ ਵਧਦਾ ਕ੍ਰਮ, ਘਟਦਾ ਕ੍ਰਮ, ਜਾਂ ਦੁਹਰਾਈ ਗਈ ਲੜੀ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ਠੀਕ"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"ਰੱਦ ਕਰੋ"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"ਕਲੀਅਰ ਕਰੋ"</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>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ਉਪਲਬਧ"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ਉਪਲਬਧ)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ਆਪਣਾ ਨੈੱਟਵਰਕ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"ਕੈਰੀਅਰ ਵਾਈ‑ਫਾਈ ਨੈੱਟਵਰਕ"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> ਰਾਹੀਂ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ਟਿਕਾਣਾ ਸ਼ੁੱਧਤਾ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ ਅਤੇ ਹੋਰਾਂ ਮੰਤਵਾਂ ਲਈ, <xliff:g id="APP_NAME">%1$s</xliff:g> ਨੈੱਟਵਰਕ ਸਕੈਨਿੰਗ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ, ਭਾਵੇਂ ਵਾਈ-ਫਾਈ ਬੰਦ ਹੋਵੇ। \n\nਕੀ ਇਸਨੂੰ ਸਾਰੀਆਂ ਐਪਾਂ ਲਈ ਆਗਿਆ ਦੇਣੀ ਹੈ ਜਿਹਨਾਂ ਨੂੰ ਸਕੈਨ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ਇਸਨੂੰ ਬੰਦ ਕਰਨ ਲਈ, ਓਵਰਫ਼ਲੋ ਮੀਨੂ ਵਿੱਚ ਵਿਕਸਿਤ ਤੇ ਜਾਓ।"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ਆਗਿਆ ਦਿਓ"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ਨੈੱਟਵਰਕ ਕਨੈਕਟ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"ਭੁੱਲਣਾ"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"ਸੋਧੋ"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"ਨੈੱਟਵਰਕ ਛੱਡਣ ਵਿੱਚ ਅਸਫਲ"</string>
     <string name="wifi_save" msgid="3331121567988522826">"ਰੱਖਿਅਤ ਕਰੋ"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"ਨੈੱਟਵਰਕ ਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"ਵਿਕਸਿਤ ਵਾਈ‑ਫਾਈ"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC ਪਤਾ"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP ਪਤਾ"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"ਨੈੱਟਵਰਕ ਬਾਰੇ ਜਾਣਕਾਰੀ"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"ਸਬਨੈੱਟ ਮਾਸਕ"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 ਪਤੇ"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ਕੀ ਸੱਦਾ ਰੱਦ ਕਰਨਾ ਹੈ?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"ਕੀ ਤੁਸੀਂ <xliff:g id="PEER_NAME">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਲਈ ਸੱਦਾ ਰੱਦ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ਕੀ ਇਹ ਸਮੂਹ ਛੱਡਣਾ ਹੈ?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"ਪੋਰਟੇਬਲ ਵਾਈ‑ਫਾਈ ਹੌਟਸਪੌਟ"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"ਵਾਈ‑ਫਾਈ ਹੌਟਸਪੌਟ"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"ਦੂਜੇ ਡੀਵਾਈਸਾਂ ਨਾਲ ਇੰਟਰਨੈੱਟ ਜਾਂ ਸਮੱਗਰੀ ਸਾਂਝੀ ਨਹੀਂ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"ਇਸ ਟੈਬਲੈੱਟ ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ ਹੌਟਸਪੌਟ ਰਾਹੀਂ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"ਇਸ ਫ਼ੋਨ ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ ਹੌਟਸਪੌਟ ਰਾਹੀਂ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"ਐਪ ਸਮੱਗਰੀ ਸਾਂਝਾ ਕਰ ਰਹੀ ਹੈ। ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਸਾਂਝਾ ਕਰਨ ਲਈ, ਹੌਟਸਪੌਟ ਨੂੰ ਬੰਦ ਕਰਕੇ, ਫਿਰ ਚਾਲੂ ਕਰੋ"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"ਵਾਈ‑ਫਾਈ ਦਾ ਨਾਮ"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"ਹੌਟਸਪੌਟ ਨਾਮ"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"ਹੋਰ ਡੀਵਾਈਸਾਂ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੋ ਸਕਦੀਆਂ ਹਨ"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"ਵਾਈ-ਫਾਈ ਪਾਸਵਰਡ"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"ਹੌਟਸਪੌਟ ਪਾਸਵਰਡ"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP ਬੈਂਡ"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"ਆਪਣੇ ਹੋਰ ਡੀਵਾਈਸਾਂ ਲਈ ਇੱਕ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਬਣਾਉਣ ਲਈ ਹੌਟਸਪੌਟ ਦੀ ਵਰਤੋਂ ਕਰੋ। ਹੌਟਸਪੌਟ ਤੁਹਾਡੇ ਮੋਬਾਈਲ ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਇੰਟਰਨੈੱਟ ਮੁਹੱਈਆ ਕਰਦਾ ਹੈ। ਵਧੀਕ ਮੋਬਾਈਲ ਡਾਟਾ ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ।"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ਨੇੜਲੇ ਡੀਵਾਈਸ ਨਾਲ ਸਮੱਗਰੀ ਨੂੰ ਸਾਂਝਾ ਕਰਨ ਲਈ ਐਪਾਂ ਇੱਕ ਹੌਟਸਪੌਟ ਬਣਾ ਸਕਦੇ ਹਨ।"</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"ਜਦੋਂ ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ ਚਾਲੂ ਹੁੰਦੀ ਹੈ, ਤਾਂ ਤੁਹਾਡਾ ਫ਼ੋਨ ਤੁਹਾਡੀ ਤਰਜੀਹ ਅਤੇ ਕਿਹੜਾ ਸਿਗਨਲ ਵੱਧ ਮਜ਼ਬੂਤ ਹੈ, ਦੇ ਆਧਾਰ ਤੇ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕਾਂ ਜਾਂ ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਦੇ ਨੈੱਟਵਰਕ ਰਾਹੀ ਕਾਲਾਂ ਰੂਟ ਕਰ ਸਕਦਾ ਹੈ। ਇਸ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਚਾਲੂ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ, ਫੀਸ ਅਤੇ ਹੋਰ ਵੇਰਵਿਆਂ ਲਈ ਆਪਣੇ ਕੈਰੀਅਰ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।"</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"ਸੰਕਟਕਾਲੀਨ ਪਤਾ ਅੱਪਡੇਟ ਕਰੋ"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਵਾਈ-ਫਾਈ ਦੀ ਵਰਤੋਂ ਨਾਲ 911 ਨੂੰ ਕਾਲ ਕਰਨ \'ਤੇ ਸੰਕਟਕਾਲੀਨ ਸੇਵਾਵਾਂ ਦੁਆਰਾ ਤੁਹਾਡੇ ਟਿਕਾਣੇ ਵਜੋਂ ਵਰਤਿਆ ਜਾਣ ਵਾਲਾ ਪਤਾ"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"ਜੇਕਰ ਤੁਸੀਂ ਵਾਈ-ਫਾਈ ਦੀ ਵਰਤੋਂ ਨਾਲ ਕੋਈ ਸੰਕਟਕਾਲੀਨ ਕਾਲ ਕਰਦੇ ਹੋਂ, ਤਾਂ ਸੰਕਟਕਾਲੀਨ ਸੇਵਾਵਾਂ ਵੱਲੋਂ ਇਸ ਪਤੇ ਦੀ ਵਰਤੋਂ ਤੁਹਾਡੇ ਪਤੇ ਵਜੋਂ ਕੀਤੀ ਜਾਂਦੀ ਹੈ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ਡਿਸਪਲੇ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ਧੁਨੀ"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ਵੋਲਯੂਮ"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"ਖੋਜੋ"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"ਖੋਜ ਸੈਟਿੰਗ ਅਤੇ ਇਤਿਹਾਸ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"ਕੋਈ ਨਤੀਜੇ ਨਹੀਂ"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"ਇਤਿਹਾਸ ਕਲੀਅਰ ਕਰੋ"</string>
     <string name="display_settings" msgid="7965901687241669598">"ਡਿਸਪਲੇ"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"ਸਕ੍ਰੀਨ ਆਪਣੇ-ਆਪ ਘੁੰਮਾਓ"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"ਸ਼ੋਖ ਰੰਗ"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"ਪੂਰਵ-ਨਿਰਧਾਰਤ APN ਸੈਟਿੰਗਾਂ ਰੀਸਟੋਰ ਕਰ ਰਿਹਾ ਹੈ।"</string>
     <string name="menu_restore" msgid="8260067415075573273">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਤੇ ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"ਪੂਰਵ-ਨਿਰਧਾਰਤ APN ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕਰਨਾ ਪੂਰਾ ਹੋਇਆ।"</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"ਰੀਸੈੱਟ ਕਰੋ"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"ਨੈੱਟਵਰਕ ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"ਰੀਸੈੱਟ ਵਿਕਲਪ"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"ਨੈੱਟਵਰਕ, ਐਪਾਂ, ਜਾਂ ਡੀਵਾਈਸ ਨੂੰ ਰੀਸੈੱਟ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"ਵਾਈ-ਫਾਈ, ਮੋਬਾਈਲ ਅਤੇ ਬਲੂਟੁੱਥ ਨੂੰ ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"ਇਹ ਨੈੱਟਵਰਕ ਦੀਆਂ ਸਾਰੀਆਂ ਸੈਟਿੰਗਾਂ ਨੂੰ ਰੀਸੈੱਟ ਕਰੇਗਾ, ਜਿਸ ਵਿੱਚ ਇਹ ਸ਼ਾਮਲ ਹਨ:\n\n"<li>"ਵਾਈ-ਫਾਈ"</li>\n<li>"ਮੋਬਾਈਲ ਡਾਟਾ"</li>\n<li>"ਬਲੂਟੁੱਥ"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"ਕੀ ਸਾਰੀਆਂ ਨੈੱਟਵਰਕ ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕਰਨੀਆਂ ਹਨ? ਤੁਸੀਂ ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀ ਕਰ ਸਕਦੇ!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"ਕੀ ਰੀਸੈੱਟ ਕਰਨਾ ਹੈ?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"ਇਸ ਉਪਭੋਗਤਾ ਲਈ ਨੈੱਟਵਰਕ ਰੀਸੈੱਟ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"ਨੈੱਟਵਰਕ ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕੀਤੀਆਂ ਗਈਆਂ ਹਨ"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"ਫੈਕਟਰੀ ਡਾਟਾ ਰੀਸੈੱਟ"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> ਖਾਤੇ ਰੀਸੈੱਟ ਕੀਤੇੇ ਜਾਣਗੇ</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> ਖਾਤੇ ਰੀਸੈੱਟ ਕੀਤੇੇ ਜਾਣਗੇ</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ ਅਤੇ ਸਾਰਾ ਡਾਟਾ ਰੀਸੈੱਟ ਕੀਤਾ ਜਾਵੇਗਾ"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"ਸਾਰਾ  ਡਾਟਾ  ਮਿਟਾਓ (ਫੈਕਟਰੀ ਰੀਸੈੱਟ)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ਇਹ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਦੀ "<b>"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</b>"ਦਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾ ਦੇਵੇਗਾ, ਜਿਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੈ:\n\n"<li>"ਤੁਹਾਡਾ Google ਖਾਤਾ"</li>\n<li>"ਸਿਸਟਮ ਅਤੇ ਐਪ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗਾਂ"</li>\n<li>"ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਐਪਾਂ"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ਇਹ ਤੁਹਾਡੇ ਫ਼ੋਨ ਦੀ "<b>"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</b>" ਦਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾ ਦੇਵੇਗਾ, ਜਿਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੈ:\n\n"<li>"ਤੁਹਾਡਾ Google ਖਾਤਾ"</li>\n<li>"ਸਿਸਟਮ ਅਤੇ ਐਪ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗਾਂ"</li>\n<li>"ਡਾਊਨਲੋਡ ਕੀਤੇ ਐਪਾਂ"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ਤੁਸੀਂ ਇਸ ਵੇਲੇ ਇਹਨਾਂ ਖਾਤਿਆਂ ਤੇ ਸਾਈਨ ਇਨ ਕਰ ਰਹੇ ਹੋ:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"ਸੁਰੱਖਿਆ ਜਾਣਕਾਰੀ"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"ਤੁਹਾਡੇ ਕੋਲ ਕੋਈ ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਨਹੀਂ ਹੈ। ਹੁਣ ਇਸ ਜਾਣਕਾਰੀ ਨੂੰ ਦੇਖਣ ਲਈ, ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਕੀਤੇ ਕਿਸੇ ਵੀ ਕੰਪਿਊਟਰ ਤੋਂ %s ਤੇ ਜਾਓ।"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"ਆਪਣਾ ਪਾਸਵਰਡ ਚੁਣੋ"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"ਕੋਈ ਸਕ੍ਰੀਨ  ਲਾਕ  ਸਥਾਪਤ ਕਰੋ"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"ਸੁਰੱਖਿਆ ਲਈ, ਇੱਕ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤਣ ਲਈ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"ਆਪਣਾ ਪੈਟਰਨ ਚੁਣੋ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤਣ ਲਈ ਪੈਟਰਨ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"ਆਪਣਾ ਪਿੰਨ ਚੁਣੋ"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"ਸੁਰੱਖਿਆ ਲਈ, ਇੱਕ ਪਿੰਨ ਸਥਾਪਤ ਕਰੋ"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤਣ ਲਈ ਪਿੰਨ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"ਆਪਣੇ ਪਾਸਵਰਡ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"ਆਪਣਾ ਪਾਸਵਰਡ ਮੁੜ-ਦਾਖਲ ਕਰੋ"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"ਆਪਣੇ ਪੈਟਰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"ਆਪਣੇ ਪਿੰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"ਆਪਣਾ ਪਿੰਨ ਮੁੜ-ਦਾਖਲ ਕਰੋ"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"ਪਾਸਵਰਡ ਮੇਲ ਨਹੀਂ ਖਾਂਦੇ"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"ਪਿੰਨ ਮੇਲ ਨਹੀਂ ਖਾਂਦੇ"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"ਅਣਲਾਕ ਚੋਣ"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣੀ ਕੰਮ ਸਬੰਧੀ ਵੰਨਗੀ ਵਰਤੋ"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣਾ ਕੰਮ ਸਬੰਧੀ ਪਿੰਨ ਦਾਖਲ ਕਰੋ"</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">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣਾ ਡੀਵਾਈਸ ਪਿੰਨ ਦਾਖਲ ਕਰੋ। ਡੀਵਾਈਸ ਦੇ ਦੁਬਾਰਾ ਚਾਲੂ ਹੋਣ \'ਤੇ ਲੋੜੀਂਦਾ ਹੈ।"</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">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣਾ ਕੰਮ ਸਬੰਧੀ ਪਿੰਨ ਦਾਖਲ ਕਰੋ। ਡੀਵਾਈਸ ਦੇ ਦੁਬਾਰਾ ਚਾਲੂ ਹੋਣ \'ਤੇ ਲੋੜੀਂਦਾ ਹੈ।"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣਾ ਕੰਮ ਸਬੰਧੀ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ। ਡੀਵਾਈਸ ਦੇ ਦੁਬਾਰਾ ਚਾਲੂ ਹੋਣ \'ਤੇ ਲੋੜੀਂਦਾ ਹੈ।"</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"ਵਾਧੂ ਸੁਰੱਖਿਆ ਲਈ, ਆਪਣੇ ਡੀਵਾਈਸ ਪੈਟਰਨ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"ਵਾਧੂ ਸੁਰੱਖਿਆ ਲਈ, ਆਪਣਾ ਡੀਵਾਈਸ ਪਿੰਨ ਦਾਖਲ ਕਰੋ"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"ਵਾਧੂ ਸੁਰੱਖਿਆ ਲਈ, ਆਪਣੇ ਡੀਵਾਈਸ ਦਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"ਵਾਧੂ ਸੁਰੱਖਿਆ ਲਈ, ਆਪਣੇ ਕਾਰਜ-ਸਥਾਨ ਦੇ ਪੈਟਰਨ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"ਵਾਧੂ ਸੁਰੱਖਿਆ ਲਈ, ਆਪਣਾ ਕੰਮ ਸਬੰਧੀ ਪਿੰਨ ਦਾਖਲ ਕਰੋ"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"ਵਾਧੂ ਸੁਰੱਖਿਆ ਲਈ, ਆਪਣੇ ਕਾਰਜ-ਸਥਾਨ ਦਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Your phone was reset to factory settings. To use this phone, enter your previous pattern."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Your phone was reset to factory settings. To use this phone, enter your previous PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Your phone was reset to factory settings. To use this phone, enter your previous password."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"ਪੈਟਰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"ਪਿੰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verify password"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"ਗਲਤ ਪਿੰਨ"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"ਗਲਤ ਪਾਸਵਰਡ"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"ਗ਼ਲਤ ਪੈਟਰਨ"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"ਕੀ ਵਿਜੇਟ ਬਣਾਉਣਾ ਹੈ ਅਤੇ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਵਿਜੇਟ ਬਣਾਉਣ ਤੋਂ ਬਾਅਦ, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ਸਾਰੇ ਡਾਟਾ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦਾ ਹੈ, ਜੋ ਇਹ ਡਿਸਪਲੇ ਕਰਦਾ ਹੈ।"</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"ਹਮੇਸ਼ਾਂ <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ਨੂੰ ਵਿਜੇਟ ਬਣਾਉਣ ਅਤੇ ਉਹਨਾਂ ਦੇ ਡਾਟਾ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>ਘੰ <xliff:g id="MINUTES">%2$d</xliff:g>ਮਿੰ <xliff:g id="SECONDS">%3$d</xliff:g>ਸ"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>ਮਿੰ <xliff:g id="SECONDS">%2$d</xliff:g>ਸ"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>ਸਕਿੰਟ"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"ਵਰਤੋਂ ਅੰਕੜੇ"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"ਵਰਤੋਂ ਅੰਕੜੇ"</string>
     <string name="display_order_text" msgid="8592776965827565271">"ਇਸ ਮੁਤਾਬਕ ਛਾਂਟੋ:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"ਸਕ੍ਰੀਨ ਰੀਡਰ, ਡਿਸਪਲੇ, ਅੰਤਰਕਿਰਿਆ ਕੰਟਰੋਲ"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"ਨਜ਼ਰ ਸਬੰਧੀ ਸੈਟਿੰਗਾਂ"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਆਪਣੀਆਂ ਲੋੜਾਂ ਦੇ ਅਨੁਸਾਰ ਵਿਉਂਤਬੱਧ ਕਰ ਸਕਦੇ ਹੋ। ਇਹਨਾਂ ਪਹੁੰਚਯੋਗਤਾ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਬਾਅਦ ਵਿੱਚ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਜਾ ਕੇ ਬਦਲਿਆ ਜਾ ਸਕਦਾ ਹੈ।"</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"ਫੌਂਟ ਆਕਾਰ ਵਧਾਓ"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"ਫੌਂਟ ਦਾ ਆਕਾਰ ਬਦਲੋ"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"ਸਕ੍ਰੀਨ ਪਾਠਕ"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">" ਆਡੀਓ  ਅਤੇ ਔਨ-ਸਕ੍ਰੀਨ ਲਿਖਤ"</string>
     <string name="display_category_title" msgid="685461049938269166">"ਡਿਸਪਲੇ"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><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_screen_magnification_navbar_summary" msgid="1996584694050087161">"ਜਦੋਂ ਵੱਡਦਰਸ਼ੀਕਰਨ ਚਾਲੂ ਹੋਵੇ, ਤਾਂ ਤੇਜ਼ੀ ਨਾਲ ਵੱਡਾ ਕਰਨ ਲਈ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਾਂ ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ ਦੀ ਵਰਤੋਂ ਕਰੋ।\n\n"<b>"ਜ਼ੂਮ ਕਰਨ ਲਈ"</b>", ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ \'ਤੇ ਟੈਪ ਕਰੋ, ਫਿਰ ਸਕ੍ਰੀਨ \'ਤੇ ਕਿਤੇ ਵੀ ਟੈਪ ਕਰੋ।\n"<ul><li>"ਸਕ੍ਰੋਲ ਕਰਨ ਲਈ 2 ਜਾਂ ਜ਼ਿਆਦਾ ਉਂਗਲਾਂ ਘਸੀਟੋ"</li>\n<li>"ਜ਼ੂਮ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰਨ ਲਈ 2 ਜਾਂ ਜ਼ਿਆਦਾ ਉਂਗਲਾਂ ਨਾਲ ਚੂੰਢੀ ਭਰੋ"</li></ul>\n\n<b>"ਅਸਥਾਈ ਤੌਰ \'ਤੇ ਜ਼ੂਮ ਕਰਨ ਲਈ"</b>", ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ \'ਤੇ ਟੈਪ ਕਰੋ, ਫਿਰ ਸਕ੍ਰੀਨ \'ਤੇ ਕੀਤੇ ਵੀ ਸਪੱਰਸ਼ ਕਰੋ ਅਤੇ ਦਬਾਈ ਰੱਖੋ।\n"<ul><li>"ਸਕ੍ਰੀਨ \'ਤੇ ਆਲੇ-ਦੁਆਲੇ ਜਾਣ ਲਈ ਘਸੀਟੋ"</li>\n<li>"ਜ਼ੂਮ ਘਟਾਉਣ ਲਈ ਉਂਗਲ ਚੁੱਕੋ"</li></ul>\n\n"ਤੁਸੀਂ ਕੀ-ਬੋਰਡ ਜਾਂ ਦਿਸ਼ਾ-ਨਿਰਦੇਸ਼ ਪੱਟੀ \'ਤੇ ਜ਼ੂਮ ਵਧਾ ਨਹੀਂ ਸਕਦੇ।"</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ <xliff:g id="SERVICE">%1$s</xliff:g> \'ਤੇ ਸੈੱਟ ਹੈ। ਵੱਡਦਰਸ਼ੀਕਰਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ, ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ ਨੂੰ ਸਪੱਰਸ਼ ਕਰੋ ਅਤੇ ਦਬਾਈ ਰੱਖੋ, ਫਿਰ ਵੱਡਦਰਸ਼ੀਕਰਨ ਨੂੰ ਚੁਣੋ।"</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"ਪਹੁੰਚਯੋਗਤਾ ਸ਼ਾਰਟਕੱਟ"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"ਵੌਲਿਊਮ ਕੁੰਜੀ ਸ਼ਾਰਟਕੱਟ"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"ਸ਼ਾਰਟਕੱਟ ਸੇਵਾ"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">" ਲਾਕ  ਸਕ੍ਰੀਨ ਤੋਂ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"ਜਦੋਂ ਸ਼ਾਰਟਕੱਟ ਚਾਲੂ ਹੋਵੇ, ਤਾਂ ਤੁਸੀਂ ਕਿਸੇ ਪਹੁੰਚਯੋਗਤਾ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਦੋਵੇਂ ਅਵਾਜ਼ ਬਟਨਾਂ ਨੂੰ 3 ਸਕਿੰਟਾਂ ਲਈ ਦੱਬ ਸਕਦੇ ਹੋ।"</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"ਜਦੋਂ ਸ਼ਾਰਟਕੱਟ ਚਾਲੂ ਹੋਵੇ, ਤਾਂ ਤੁਸੀਂ ਕਿਸੇ ਪਹੁੰਚਯੋਗਤਾ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਦੋਵੇਂ ਅਵਾਜ਼ ਕੁੰਜੀਆਂ ਨੂੰ 3 ਸਕਿੰਟਾਂ ਲਈ ਦੱਬ ਸਕਦੇ ਹੋ।"</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">"ਸਕ੍ਰੀਨ ਵਿਸਤਰੀਕਰਨ ਸਵੈ-ਅੱਪਡੇਟ ਕਰੋ"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"ਐਪ ਟ੍ਰਾਂਜਿਸ਼ਨਾਂ ਤੇ ਸਕ੍ਰੀਨ ਵਿਸਤਰੀਕਰਨ ਅੱਪਡੇਟ ਕਰੋ"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"ਪ੍ਰਦਰਸ਼ਨ \'ਤੇ ਅਸਰ ਪਾ ਸਕਦੀ ਹੈ"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"ਪੋਇੰਟਰ ਰੁਕਣ ਤੋਂ ਬਾਅਦ ਕਲਿੱਕ ਕਰੋ"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"ਕਲਿੱਕ ਤੋਂ ਪਹਿਲਾਂ ਦੇਰੀ"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ਚਾਲੂ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ਬੰਦ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"ਤਤਕਾਲ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਦਿਖਾਓ"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g> ਵਿੱਚੋਂ <xliff:g id="NUMBER">%1$d</xliff:g> ਚੁਣਿਆ"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g> ਵਿੱਚੋਂ <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"ਸਭ ਚੁਣੋ"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"ਯੋਜਨਾਵਾਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰੋ"</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>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"ਮੀਟਰਬੱਧ ਕੀਤੇ ਗਏ ਵਾਈ‑ਫਾਈ ਨੈੱਟਵਰਕ"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"ਮੀਟਰਬੱਧ ਕੀਤੇ ਗਏ ਨੈੱਟਵਰਕ ਚੁਣਨ ਲਈ, ਵਾਈ‑ਫਾਈ ਚਾਲੂ ਕਰੋ।"</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"ਸਵੈਚਲਿਤ"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"ਮੀਟਰਬੱਧ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"ਮੀਟਰਬੱਧ ਨਹੀਂ ਕੀਤਾ ਗਿਆ"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"ਕੈਰੀਅਰ ਦਾ ਡਾਟਾ ਹਿਸਾਬ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਤੋਂ ਵੱਖ ਹੋ ਸਕਦਾ ਹੈ।"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"ਸੰਕਟਕਾਲੀਨ ਕਾਲ"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"ਕਾਲ \'ਤੇ ਵਾਪਸ ਜਾਓ"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"ਕਾਲ ਮੈਨੇਜਰ"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"ਐਮਰਜੈਂਸੀ ਪ੍ਰਸਾਰਨ"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾਵਾਂ"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"ਨੈੱਟਵਰਕ ਓਪਰੇਟਰ"</string>
     <string name="access_point_names" msgid="1381602020438634481">"ਐਕਸੈੱਸ ਪੁਆਇੰਟ ਨਾਮ"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"ਵਿਸਤ੍ਰਿਤ 4G LTE ਮੋਡ"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"ਇਸ ਲਈ ਤਰਜੀਹੀ SIM"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"ਹਰ ਵਾਰ ਪੁੱਛੋ"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"ਚੋਣ ਲੁੜੀਂਦੀ"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"ਸਿਮ ਚੋਣ"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"ਸੈਟਿੰਗਾਂ"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="one">%d ਲੁਕੀਆਂ ਹੋਈਆਂ ਆਈਟਮਾਂ  ਦਿਖਾਓ </item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"ਐਪ ਸੂਚਨਾਵਾਂ"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"ਸੂਚਨਾ ਸ਼੍ਰੇਣੀ"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"ਮਹੱਤਤਾ"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"ਐਪ ਨੂੰ ਤੈਅ ਕਰਨ ਦਿਓ"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"ਧੁਨੀ ਵੱਜਣ ਦਿਓ"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"ਸੂਚਨਾਵਾਂ ਕਦੇ ਵੀ ਨਾ  ਦਿਖਾਓ"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ਕੋਈ ਧੁਨੀ ਜਾਂ ਦ੍ਰਿਸ਼ਟਾਂਤਕ ਰੁਕਾਵਟ ਨਹੀਂ"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"ਕੋਈ ਧੁਨੀ ਨਹੀਂ"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"ਧੁਨੀ ਵਜਾਓ"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"ਧੁਨੀ ਵਜਾਓ ਅਤੇ ਸਕ੍ਰੀਨ \'ਤੇ  ਦਿਖਾਓ"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"ਸਕ੍ਰੀਨ \'ਤੇ ਦਿਖਾਓ"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"ਘੱਟ"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"ਔਸਤ"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"ਉੱਚ"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"ਜ਼ਰੂਰੀ"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"ਧੁਨੀ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"ਵਰਤਮਾਨ ਸਕ੍ਰੀਨ \'ਤੇ ਦ੍ਰਿਸ਼ ਵਿੱਚ ਇਹਨਾਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਧੁਨੀ ਨਾ ਵਜਾਉਣ ਦਿਓ, ਥਰਥਰਾਹਟ ਨਾ ਕਰਨ ਦਿਓ ਜਾਂ ਦ੍ਰਿਸ਼ ਨਾ ਦਿਖਾਉਣ ਦਿਓ।"</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"ਰੁਕਾਵਟਾਂ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"ਐਪ ਨੂੰ ਧੁਨੀ ਵਜਾਉਣ, ਥਰਥਰਾਹਟ ਕਰਨ, ਅਤੇ/ਜਾਂ ਸਕ੍ਰੀਨ \'ਤੇ ਸੂਚਨਾਵਾਂ ਦਿਖਾਉਣ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"ਘੱਟ ਮਹੱਤਵ"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"ਔਸਤ ਮਹੱਤਵ"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"ਉੱਚ ਮਹੱਤਵ"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip ਤਸਵੀਰ ਵਿੱਚ"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"ਤਸਵੀਰ-ਵਿੱਚ-ਤਸਵੀਰ"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"ਤਸਵੀਰ-ਵਿੱਚ-ਤਸਵੀਰ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"ਇਸ ਐਪ ਨੂੰ ਤਸਵੀਰ-ਵਿੱਚ-ਤਸਵੀਰ ਵਿੰਡੋ ਬਣਾਉਣ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ ਜਦੋਂ ਐਪ ਖੁੱਲ੍ਹੀ ਹੋਵੇ ਜਾਂ ਜਦੋਂ ਤੁਸੀਂ ਇਸ ਨੂੰ ਛੱਡ ਦਿਓ (ਉਦਾਹਰਨ ਲਈ, ਵੀਡੀਓ ਦੇਖਣਾ ਜਾਰੀ ਰੱਖਣ ਲਈ)। ਇਹ ਵਿੰਡੋ ਤੁਹਾਡੇ ਦੁਆਰਾ ਵਰਤੀਆਂ ਜਾ ਰਹੀਆਂ ਦੂਜੀਆਂ ਐਪਾਂ ਦੇ ਉੱਪਰ ਪ੍ਰਦਰਸ਼ਿਤ ਹੁੰਦੀ ਹੈ।"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"ਇਸ ਐਪ ਨੂੰ ਤਸਵੀਰ-ਵਿੱਚ-ਤਸਵੀਰ ਵਿੰਡੋ ਬਣਾਉਣ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ ਜਦੋਂ ਐਪ ਖੁੱਲ੍ਹੀ ਹੋਵੇ ਜਾਂ ਜਦੋਂ ਤੁਸੀਂ ਇਸ ਨੂੰ ਛੱਡ ਦਿਓ (ਉਦਾਹਰਨ ਲਈ, ਵੀਡੀਓ ਦੇਖਣਾ ਜਾਰੀ ਰੱਖਣ ਲਈ)। ਇਹ ਵਿੰਡੋ ਤੁਹਾਡੇ ਦੁਆਰਾ ਵਰਤੀਆਂ ਜਾ ਰਹੀਆਂ ਦੂਜੀਆਂ ਐਪਾਂ ਦੇ ਉੱਪਰ ਪ੍ਰਦਰਸ਼ਿਤ ਹੁੰਦੀ ਹੈ।"</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>
@@ -3161,7 +3172,7 @@
     <string name="system_default_app" msgid="3091113402349739037">"(ਸਿਸਟਮ ਪੂਰਵ-ਨਿਰਧਾਰਤ)"</string>
     <string name="apps_storage" msgid="4353308027210435513">"ਐਪਾਂ ਦੀ ਸਟੋਰੇਜ"</string>
     <string name="usage_access" msgid="5479504953931038165">"ਉਪਯੋਗ ਪਹੁੰਚ"</string>
-    <string name="permit_usage_access" msgid="4012876269445832300">"ਪਰਮਿਟ ਵਰਤੋਂਕਾਰ ਪਹੁੰਚ"</string>
+    <string name="permit_usage_access" msgid="4012876269445832300">"ਵਰਤੋਂ ਪਹੁੰਚ ਲਈ ਮਨਜ਼ੂਰੀ"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"ਐਪ ਉਪਯੋਗਤਾ ਪਸੰਦ"</string>
     <string name="usage_access_description" msgid="1352111094596416795">"ਵਰਤੋਂ ਪਹੁੰਚ ਤੁਸੀਂ ਕਿਹੜੀਆਂ ਐਪਾਂ ਦੀ ਵਰਤੋਂ ਕਰ ਰਹੇ ਹੋ ਅਤੇ ਕਿੰਨੀ ਵਾਰੀ, ਇਸਦੇ ਨਾਲ-ਨਾਲ ਆਪਣੇ ਕੈਰੀਅਰ, ਭਾਸ਼ਾ ਸੈਟਿੰਗਾਂ, ਅਤੇ ਹੋਰ ਵੇਰਵੇ ਨੂੰ ਟਰੈਕ ਕਰਨ ਲਈ ਕਿਸੇ ਐਪ ਨੂੰ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string>
     <string name="memory_settings_title" msgid="7490541005204254222">"ਮੈਮਰੀ"</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"ਫ਼ਾਈਲਾਂ ਦਾ ਤਬਾਦਲਾ ਕਰਨ ਲਈ"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"ਫ਼ੋਟੋਆਂ ਦਾ ਤਬਾਦਲਾ ਕਰਨ ਲਈ (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"ਡੀਵਾਈਸ ਨੂੰ MIDI ਵਜੋਂ ਵਰਤਣਾ"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS ਪ੍ਰਤਿਬਿੰਬੀਕਰਨ"</string>
     <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>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"ਰਾਤ ਦੀ ਰੋਸ਼ਨੀ ਸਬੰਧੀ ਸਮਾਂ-ਸੂਚੀ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"ਤੁਹਾਨੂੰ ਸੌਣ ਵਿੱਚ ਮਦਦ ਕਰਨ ਲਈ ਸਕ੍ਰੀਨ ਨੂੰ ਪੀਲੀ-ਸੰਤਰੀ ਭਾਹ ਦਿਓ"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"ਰਾਤਰੀ ਲਾਈਟ ਚਾਲੂ ਹੈ"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"ਸਕ੍ਰੀਨ ਨੂੰ ਭੂਰੇ ਪੀਲੇ ਰੰਗ ਦੀ ਭਾਹ ਦਿੱਤੀ ਗਈ ਹੈ। ਇਸ ਨਾਲ ਤੁਹਾਨੂੰ ਸੌਣ ਵਿੱਚ ਮਦਦ ਮਿਲ ਸਕਦੀ ਹੈ।"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"ਸੁਝਾਅ"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"ਵਧੇਰੇ ਠੰਡੇ ਡਿਸਪਲੇ ਰੰਗਾਂ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"ਰੰਗ ਬਦਲਾਅ ਲਾਗੂ ਕਰਨ ਲਈ, ਸਕ੍ਰੀਨ ਨੂੰ ਬੰਦ ਕਰੋ"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"ਟੈਲੀਫ਼ੋਨੀ ਮੋਨੀਟਰ ਤਬਦੀਲੀ ਲਾਗੂ ਕਰਨ ਲਈ, ਡੀਵਾਈਸ ਨੂੰ ਰੀਬੂਟ ਕਰੋ"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"ਕੈਮਰਾ HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"ਕੈਮਰਾ HAL HDR+ ਤਬਦੀਲੀ ਲਾਗੂ ਕਰਨ ਲਈ, ਡੀਵਾਈਸ ਨੂੰ ਰੀਬੂਟ ਕਰੋ"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"ਕੈਮਰਾ ਲੇਜ਼ਰ ਸੈਂਸਰ"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ਸਵੈਚਾਲਿਤ ਸਿਸਟਮ ਅੱਪਡੇਟਾਂ"</string>
     <string name="usage" msgid="2977875522080448986">"ਵਰਤੋਂ"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"ਮੋਬਾਈਲ ਡਾਟਾ ਵਰਤੋਂ"</string>
@@ -3410,7 +3427,7 @@
     <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_2">%2$s</xliff:g> ਦੌਰਾਨ <xliff:g id="ID_1">%1$s</xliff:g> ਵਰਤਿਆ ਗਿਆ"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g> ਤੱਕ <xliff:g id="ID_1">%1$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">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"ਮਿਟਾਓ ਅਤੇ ਰੁਪਾਂਤਰਣ ਕਰੋ"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager ਰੇਟ-ਲਿਮਟਿੰਗ ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager ਰੇਟ-ਲਿਮਟਿੰਗ ਰੀਸੈੱਟ ਕੀਤੀ ਜਾ ਚੁੱਕੀ ਹੈ"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">" ਲਾਕ  ਸਕ੍ਰੀਨ ਸੂਚਨਾਵਾਂ ਨੂੰ ਕੰਟਰੋਲ ਕਰੋ"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">" ਲਾਕ  ਸਕ੍ਰੀਨ \'ਤੇ ਜਾਣਕਾਰੀ ਨੂੰ ਕੰਟਰੋਲ ਕਰੋ"</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="8483187649355540109">"ਸਹਾਇਤਾ ਅਤੇ ਨੁਕਤੇ"</string>
@@ -3487,7 +3504,7 @@
     <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="2456198532288640046">"ਦੂਜੀਆਂ ਡੀਵਾਈਸਾਂ ਲਈ ਦਿਖਣਯੋਗ ਨਹੀਂ"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"ਬੰਦ"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੈ"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"ਇੱਕ ਤੋਂ ਜ਼ਿਆਦਾ ਡੀਵਾਈਸਾਂ ਨਾਲ ਕਨੈਕਟ ਹੈ"</string>
     <string name="demo_mode" msgid="2798762752209330277">"ਸਿਸਟਮ UI ਡੈਮੋ ਮੋਡ"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"ਤਤਕਾਲ ਐਪਾਂ"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"ਐਪਾਂ ਸਥਾਪਤ ਨਾ ਹੋਈਆਂ ਹੋਣ \'ਤੇ ਵੀ ਉਹਨਾਂ ਵਿਚਲੇ ਲਿੰਕਾਂ ਨੂੰ ਖੋਲ੍ਹੋ"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"ਤਤਕਾਲ ਐਪਾਂ"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"\'ਤਤਕਾਲ ਐਪਾਂ\' ਖਾਤਾ"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"ਤਤਕਾਲ ਐਪਾਂ ਸੰਬੰਧੀ ਤਰਜੀਹਾਂ"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ਸਥਾਪਤ ਕੀਤੀਆਂ ਐਪਾਂ"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"ਤੁਹਾਡੀ ਸਟੋਰੇਜ ਦਾ ਪ੍ਰਬੰਧਨ ਹੁਣ ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ ਵੱਲੋਂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> ਦੇ ਖਾਤੇ"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"ਤੁਹਾਡੇ ਨਿੱਜੀ ਪ੍ਰੋਫਾਈਲ ਵਿੱਚ \'ਹਮੇਸ਼ਾ-ਚਾਲੂ VPN\' ਵਿਕਲਪ ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਹੋਇਆ ਹੈ"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"ਤੁਹਾਡੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਵਿੱਚ \'ਹਮੇਸ਼ਾ-ਚਾਲੂ VPN\' ਵਿਕਲਪ ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਹੋਇਆ ਹੈ"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"ਗਲੋਬਲ HTTP ਪ੍ਰੌਕਸੀ ਸੈੱਟ ਕੀਤੀ ਗਈ"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"ਭਰੋਸੇਯੋਗ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"ਭਰੋਸੇਯੋਗ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"ਤੁਹਾਡੇ ਨਿੱਜੀ ਪ੍ਰੋਫਾਈਲ ਵਿੱਚ ਭਰੋਸੇਯੋਗ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"ਤੁਹਾਡੇ ਕਾਰਜ-ਸਥਾਨ ਪ੍ਰੋਫਾਈਲ ਵਿੱਚ ਭਰੋਸੇਯੋਗ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">ਨਿਊਨਤਮ <xliff:g id="COUNT_1">%d</xliff:g> CA ਪ੍ਰਮਾਣ-ਪੱਤਰ</item>
       <item quantity="other">ਨਿਊਨਤਮ <xliff:g id="COUNT_1">%d</xliff:g> CA ਪ੍ਰਮਾਣ-ਪੱਤਰ</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"ਕੈਰੀਅਰ ਵਿਵਸਥਾਕਰਨ ਜਾਣਕਾਰੀ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ਕੈਰੀਅਰ ਵਿਵਸਥਾਕਰਨ ਨੂੰ ਤੂਲ ਦਿਓ"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"ਕੀ ਕੁਝ ਨਵਾਂ ਅਤੇ ਦਿਲਚਸਪ ਹੈ?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ਪ੍ਰਮੁੱਖ 5 ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਦੇਖੋ"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Take a tour of your new phone"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ਆਪਣਾ ਨਵਾਂ ਟੈਬਲੈੱਟ ਵਰਤਣ ਬਾਰੇ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Take a tour of your new device"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS ਰਜਿਸਟਰੇਸ਼ਨ ਸਥਿਤੀ"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"ਰਜਿਸਟਰ ਕੀਤੀ ਗਈ"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"ਰਜਿਸਟਰ ਨਹੀਂ ਕੀਤੀ ਗਈ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 16cbaec..ff0aa82 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -168,7 +168,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s chce uzyskać dostęp do Twoich wiadomości. Zezwolić na dostęp?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Prośba o dostęp do karty SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> chce uzyskać dostęp do Twojej karty SIM. Jeśli na to zezwolisz, na czas tego połączenia na urządzeniu zostanie wyłączone połączenie transmisji danych. Przyznaj dostęp do urządzenia <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Widoczne dla innych urządzeń jako „<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Widoczne dla innych urządzeń jako „<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Twoje urządzenia"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Sparuj nowe urządzenie"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data i czas"</string>
@@ -378,6 +378,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Dalej"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Pominąć odcisk palca?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Zapisanie odcisku palca zajmuje tylko chwilę. Zawsze możesz go dodać później w ustawieniach."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Pominąć blokadę ekranu?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Zabezpieczenia urządzenia nie zostaną włączone. Nie będzie można uniemożliwić innym osobom korzystania z tego tabletu, gdy zostanie zgubiony, skradziony lub zresetowany."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Zabezpieczenia urządzenia nie zostaną włączone. Nie będzie można uniemożliwić innym osobom korzystania z urządzenia, gdy zostanie zgubione, skradzione lub zresetowane."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Zabezpieczenia urządzenia nie zostaną włączone. Nie będzie można uniemożliwić innym osobom korzystania z tego telefonu, gdy zostanie zgubiony, skradziony lub zresetowany."</string>
@@ -417,6 +420,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Dodano maksymalną liczbę odcisków palców"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Nie można dodać więcej odcisków palców"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Usunąć wszystkie odciski palców?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Usuń odcisk palca „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>”"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Czy chcesz usunąć ten odcisk palca?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Odcisków palców nie będzie można używać do odblokowywania telefonu, autoryzowania zakupów ani logowania się w aplikacjach"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Nie będziesz mieć możliwości używania odcisków palców, by odblokować profil do pracy, autoryzować zakupy czy logować się w aplikacjach używanych do pracy"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Tak, usuń"</string>
@@ -461,7 +466,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Chroń swój tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Chroń swoje urządzenie"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Zabezpiecz telefon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Ze względów bezpieczeństwa skonfiguruj zapasową blokadę ekranu."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Ze względów bezpieczeństwa skonfiguruj zapasową blokadę ekranu."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Włącz funkcje ochrony urządzenia, by zablokować innym możliwość używania tego tabletu bez Twojej zgody. Wybierz rodzaj blokady ekranu."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Włącz funkcje ochrony urządzenia, by zablokować innym możliwość używania tego urządzenia bez Twojej zgody. Wybierz rodzaj blokady ekranu."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Włącz funkcje ochrony urządzenia, by zablokować innym możliwość używania tego telefonu bez Twojej zgody. Wybierz rodzaj blokady ekranu."</string>
@@ -503,37 +508,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Usunąć ochronę urządzenia?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Wyłączyć ochronę profilu?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Bez wzoru nie będą działać funkcje chroniące urządzenie."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Bez wzoru nie będą działać funkcje chroniące urządzenie.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Bez wzoru nie będą działać funkcje chroniące urządzenie.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Twoje zapisane odciski palców także zostaną usunięte z tego urządzenia, dlatego stracisz możliwość używania ich do odblokowywania telefonu, autoryzowania zakupów czy logowania się w aplikacjach."</string>
+</xliff:g>Twoje zapisane odciski palców także zostaną usunięte z tego urządzenia i stracisz możliwość używania ich do odblokowywania telefonu, autoryzowania zakupów czy logowania się w aplikacjach."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Bez kodu PIN nie będą działać funkcje chroniące urządzenie."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Bez kodu PIN nie będą działać funkcje chroniące urządzenie.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Bez kodu PIN nie będą działać funkcje chroniące urządzenie.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Twoje zapisane odciski palców także zostaną usunięte z tego urządzenia, dlatego stracisz możliwość używania ich do odblokowywania telefonu, autoryzowania zakupów czy logowania się w aplikacjach."</string>
+</xliff:g>Twoje zapisane odciski palców także zostaną usunięte z tego urządzenia i stracisz możliwość używania ich do odblokowywania telefonu, autoryzowania zakupów czy logowania się w aplikacjach."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Bez hasła nie będą działać funkcje chroniące urządzenie."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Bez hasła nie będą działać funkcje chroniące urządzenie.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Bez hasła nie będą działać funkcje chroniące urządzenie.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Twoje zapisane odciski palców także zostaną usunięte z tego urządzenia, dlatego stracisz możliwość używania ich do odblokowywania telefonu, autoryzowania zakupów czy logowania się w aplikacjach."</string>
+</xliff:g>Twoje zapisane odciski palców także zostaną usunięte z tego urządzenia i stracisz możliwość używania ich do odblokowywania telefonu, autoryzowania zakupów czy logowania się w aplikacjach."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Bez blokady ekranu nie będą działać funkcje chroniące urządzenie."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Bez blokady ekranu nie będą działać funkcje chroniące urządzenie.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Bez blokady ekranu nie będą działać funkcje chroniące urządzenie.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Twoje zapisane odciski palców także zostaną usunięte z tego urządzenia, dlatego stracisz możliwość używania ich do odblokowywania telefonu, autoryzowania zakupów czy logowania się w aplikacjach."</string>
+</xliff:g>Twoje zapisane odciski palców także zostaną usunięte z tego urządzenia i stracisz możliwość używania ich do odblokowywania telefonu, autoryzowania zakupów czy logowania się w aplikacjach."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Bez wzoru nie będą działać funkcje ochrony profilu."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Bez wzoru nie będą działać funkcje ochrony profilu.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Bez wzoru nie będą działać funkcje ochrony profilu.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Twoje zapisane odciski palców także zostaną usunięte z tego profilu, dlatego stracisz możliwość używania ich do odblokowywania go, autoryzowania zakupów czy logowania się w aplikacjach."</string>
+</xliff:g>Twoje zapisane odciski palców także zostaną usunięte z tego profilu i stracisz możliwość używania ich do odblokowywania go, autoryzowania zakupów czy logowania się w aplikacjach."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Bez kodu PIN nie będą działać funkcje ochrony profilu."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Bez kodu PIN nie będą działać funkcje ochrony profilu.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Bez kodu PIN nie będą działać funkcje ochrony profilu.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Twoje zapisane odciski palców także zostaną usunięte z tego profilu, dlatego stracisz możliwość używania ich do odblokowywania go, autoryzowania zakupów czy logowania się w aplikacjach."</string>
+</xliff:g>Twoje zapisane odciski palców także zostaną usunięte z tego profilu i stracisz możliwość używania ich do odblokowywania go, autoryzowania zakupów czy logowania się w aplikacjach."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Bez hasła nie będą działać funkcje ochrony profilu."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Bez hasła nie będą działać funkcje ochrony profilu.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Bez hasła nie będą działać funkcje ochrony profilu.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Twoje zapisane odciski palców także zostaną usunięte z tego profilu, dlatego stracisz możliwość używania ich do odblokowywania go, autoryzowania zakupów czy logowania się w aplikacjach."</string>
+</xliff:g>Twoje zapisane odciski palców także zostaną usunięte z tego profilu i stracisz możliwość używania ich do odblokowywania go, autoryzowania zakupów czy logowania się w aplikacjach."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Bez blokady ekranu nie będą działać funkcje ochrony profilu."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Bez blokady ekranu nie będą działać funkcje ochrony profilu.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Bez blokady ekranu nie będą działać funkcje ochrony profilu.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Twoje zapisane odciski palców także zostaną usunięte z tego profilu, dlatego stracisz możliwość używania ich do odblokowywania go, autoryzowania zakupów czy logowania się w aplikacjach."</string>
+</xliff:g>Twoje zapisane odciski palców także zostaną usunięte z tego profilu i stracisz możliwość używania ich do odblokowywania go, autoryzowania zakupów czy logowania się w aplikacjach."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Tak, usuń"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Zmień wzór odblokowania"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Zmień kod PIN odblokowania"</string>
@@ -604,6 +609,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Ciąg cyfr rosnących, malejących lub powtarzających się jest niedozwolony"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Anuluj"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"OK"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Anuluj"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Dalej"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Konfiguracja została ukończona."</string>
@@ -838,6 +844,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Protokół WPS jest dostępny"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (protokół WPS dostępny)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Podaj hasło do sieci"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Sieć Wi‑Fi operatora"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Połącz przez: <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Aby zwiększyć dokładność lokalizacji (i w innych celach), <xliff:g id="APP_NAME">%1$s</xliff:g> chce włączyć skanowanie sieci – nawet gdy Wi-Fi jest wyłączone.\n\nZezwolić na to wszystkim aplikacjom, które chcą wykonywać skanowanie?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Aby wyłączyć tę opcję, w rozszerzonym menu otwórz Zaawansowane."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Zezwól"</string>
@@ -855,6 +863,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Połącz"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nie można nawiązać połączenia z siecią"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Zapomnij"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Zmień"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Nie udało się zapomnieć sieci"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Zapisz"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Nie udało się zapisać sieci"</string>
@@ -869,6 +878,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Zaawansowane"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adres MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Adres IP"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Informacje o sieci"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska podsieci"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Adresy IPv6"</string>
@@ -901,16 +911,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Anulować zaproszenie?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Czy chcesz anulować zaproszenie do połączenia z <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Zapomnieć o tej grupie?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Przenośny hotspot Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Hotspot Wi‑Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Nie udostępniam internetu ani treści innym urządzeniom"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Udostępniam połączenie internetowe tabletu przez hotspot"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Udostępniam połączenie internetowe telefonu przez hotspot"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplikacja udostępnia treści. Aby udostępnić połączenie internetowe, wyłącz i ponownie włącz hostpot"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nazwa Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Nazwa hotspota"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Włączam: <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Inne urządzenia mogą łączyć się z: <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Hasło Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Hasło do hotspota"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Pasmo punktu dostępu"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Użyj hotspotu do utworzenia sieci Wi-Fi dla innych urządzeń. Hotspot zapewnia dostęp do internetu, korzystając z połączenia mobilnej transmisji danych. Mogą zostać naliczone dodatkowe opłaty za transfer danych."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikacje mogą utworzyć hotspot, by udostępniać treści urządzeniom w pobliżu."</string>
@@ -962,7 +971,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Adres, który służby ratunkowe będą traktować jako Twoją lokalizację, jeśli zadzwonisz pod numer alarmowy przez Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Wyświetlacz"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Dźwięk"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Głośność"</string>
@@ -1016,6 +1025,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Wyszukiwanie"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Zarządzaj ustawieniami i historią wyszukiwania"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Brak wyników"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Wyczyść historię"</string>
     <string name="display_settings" msgid="7965901687241669598">"Wyświetlacz"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Autoobracanie ekranu"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Żywe kolory"</string>
@@ -1350,8 +1360,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Przywracanie domyślnych ustawień APN"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Resetuj ustawienia"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Przywrócono domyślne ustawienia APN."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Resetowanie"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Resetuj ustawienia sieciowe"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Zresetuj opcje"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Można zresetować sieć, aplikacje lub urządzenie"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Zresetuj Wi-Fi, sieć komórkową i Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Spowoduje to usunięcie wszystkich ustawień sieciowych, w tym:\n\n"<li>"Wi‑Fi"</li>\n<li>"mobilnej transmisji danych"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Zresetuj ustawienia"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Zresetować wszystkie ustawienia sieciowe? Tego działania nie można cofnąć."</string>
@@ -1359,14 +1370,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Zresetować?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Resetowanie sieci nie jest dostępne dla tego użytkownika"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Ustawienia sieciowe zostały zresetowane"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Ustawienia fabryczne"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="few"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> konta zostaną zresetowane</item>
-      <item quantity="many"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> kont zostanie zresetowanych</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> konta zostanie zresetowane</item>
-      <item quantity="one">1 konto zostanie zresetowane</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Pamięć wewnętrzna i wszystkie dane zostaną zresetowane"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Wykasuj wszystkie dane (przywróć dane fabryczne)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Zostaną usunięte wszystkie dane z "<b>"wewnętrznej pamięci"</b>" tabletu, w tym:\n\n"<li>"Dane konta Google"</li>\n<li>"Dane i ustawienia systemu oraz aplikacji"</li>\n<li>"Pobrane aplikacje"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Zostaną usunięte wszystkie dane z "<b>"wewnętrznej pamięci"</b>" telefonu, w tym:\n\n"<li>"Dane konta Google"</li>\n<li>"Dane i ustawienia systemu oraz aplikacji"</li>\n<li>"Pobrane aplikacje"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"W tej chwili używasz kont:\n"</string>
@@ -1490,15 +1494,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informacje o bezpieczeństwie"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Brak połączenia transmisji danych. Aby wyświetlić te informacje teraz, przejdź do strony %s na dowolnym komputerze połączonym z internetem."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Wczytuję..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Wybierz hasło"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ustawianie blokady ekranu"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Ze względów bezpieczeństwa ustaw hasło"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Aby korzystać z odcisku palca, ustaw hasło"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Wybierz wzór"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Aby korzystać z odcisku palca, ustaw wzór"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Wybierz kod PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Ze względów bezpieczeństwa ustaw kod PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Aby korzystać z odcisku palca, ustaw kod PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Potwierdź hasło"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Podaj ponownie hasło"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potwierdź wzór"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Potwierdź PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Podaj ponownie kod PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Hasła nie są takie same"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Kody PIN nie są takie same"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Wybór blokady"</string>
@@ -1511,12 +1516,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Podaj wzór używany w profilu do pracy, by kontynuować"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Podaj kod PIN używany w profilu do pracy, by kontynuować"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Podaj hasło używane w profilu do pracy, by kontynuować"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Urządzenie zostało zrestartowane. Musisz podać wzór, którego na nim używasz."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Urządzenie zostało zrestartowane. Musisz podać kod PIN, którego na nim używasz."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Urządzenie zostało zrestartowane. Musisz podać hasło, którego na nim używasz."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Urządzenie zostało zrestartowane. Podaj wzór, którego używasz w profilu do pracy."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Urządzenie zostało zrestartowane. Podaj kod PIN, którego używasz w profilu do pracy."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Urządzenie zostało zrestartowane. Podaj hasło, którego używasz w profilu do pracy."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Ze względów bezpieczeństwa podaj wzór używany na urządzeniu"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Ze względów bezpieczeństwa podaj kod PIN urządzenia"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Ze względów bezpieczeństwa podaj hasło do urządzenia"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Ze względów bezpieczeństwa podaj wzór do profilu do pracy"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Ze względów bezpieczeństwa podaj kod PIN do profilu do pracy"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Ze względów bezpieczeństwa podaj hasło do profilu do pracy"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Telefon został zresetowany do ustawień fabrycznych. Aby korzystać z tego telefonu, wprowadź poprzedni wzór."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Telefon został zresetowany do ustawień fabrycznych. Aby korzystać z tego telefonu, wprowadź poprzedni kod PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Telefon został zresetowany do ustawień fabrycznych. Aby korzystać z tego telefonu, wpisz poprzednie hasło."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Zweryfikuj wzór"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Zweryfikuj PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Zweryfikuj hasło"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Nieprawidłowy kod PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Nieprawidłowe hasło"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Nieprawidłowy wzór"</string>
@@ -1821,13 +1832,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Utworzyć widżet i zezwolić na dostęp?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Po utworzeniu widżetu <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> może uzyskać dostęp do wszystkich wyświetlanych danych."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Zawsze zezwalaj na tworzenie widgetów przez aplikację <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> i dostęp do ich danych"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>g <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>g <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d. <xliff:g id="HOURS">%2$d</xliff:g> godz. <xliff:g id="MINUTES">%3$d</xliff:g> min"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> godz. <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Statystyki użycia"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Statystyki użycia"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sortuj wg:"</string>
@@ -1839,7 +1843,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Czytniki, wyświetlacz, sterowanie interakcją"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Dla niedowidzących"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Możesz dostosować urządzenie do swoich potrzeb. Ułatwienia dostępu możesz zawsze zmienić w Ustawieniach."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Zwiększ rozmiar czcionki"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Zmień rozmiar czcionki"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Czytniki ekranu"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Dźwięk i tekst na ekranie"</string>
     <string name="display_category_title" msgid="685461049938269166">"Wyświetlacz"</string>
@@ -1860,10 +1864,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Aby powiększyć"</b>", szybko kliknij ekran trzy raz.\n"<ul><li>"Przeciągnij co najmniej dwoma palcami, by przewijać ekran."</li>\n<li>"Ściągnij do siebie co najmniej dwa palce, by dostosować powiększenie."</li></ul>\n\n<b>"Aby tymczasowo powiększyć widok"</b>", szybko kliknij ekran trzy razy i przytrzymaj palec po trzecim kliknięciu.\n"<ul><li>"Przeciągaj palcem, by poruszać się po ekranie."</li>\n<li>"Unieś palec, by wyłączyć powiększenie."</li></ul>\n\n"Nie można powiększyć klawiatury ani paska nawigacji."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Gdy powiększenie jest włączone, użyj przycisku ułatwień dostępu u dołu ekranu, by szybko powiększyć widok.\n\n"<b>"Aby powiększyć"</b>", kliknij przycisk ułatwień dostępu, a potem dowolne miejsce na ekranie.\n"<ul><li>"Przeciągnij co najmniej dwoma palcami, by przewijać."</li>\n<li>"Ściągnij do siebie co najmniej dwa palce, by dostosować powiększenie."</li></ul>\n\n<b>"Aby powiększyć tymczasowo"</b>", dotknij przycisku ułatwień dostępu, a następnie dotknij i przytrzymaj dowolne miejsce na ekranie.\n"<ul><li>"Przeciągaj palcem, by poruszać się po ekranie "</li>\n<li>"Unieś palec, by wyłączyć powiększenie."</li></ul>\n\n"Nie można powiększyć klawiatury ani paska nawigacji."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Przycisk ułatwień dostępu włącza: <xliff:g id="SERVICE">%1$s</xliff:g>. Aby użyć powiększenia, dotknij i przytrzymaj przycisk ułatwień dostępu, a następnie wybierz powiększenie."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Skrót ułatwień dostępu"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Skrót z klawiszami głośności"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Usługa skrótu"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Pozwól na ekranie blokady"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Gdy skrót jest włączony, możesz przytrzymać naciśnięte oba przyciski głośności przez trzy sekundy, by uruchomić funkcję ułatwień dostępu."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Gdy skrót jest włączony, możesz przytrzymać naciśnięte oba klawisze głośności przez trzy sekundy, by uruchomić funkcję ułatwień dostępu."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Tekst o dużym kontraście"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Automatyczna aktualizacja powiększenia ekranu"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Aktualizuj powiększenie ekranu przy zmianie aplikacji"</string>
@@ -1876,7 +1880,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Może wpłynąć na wydajność"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Kliknij, gdy wskaźnik się zatrzyma"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Opóźnienie przed kliknięciem"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"WŁ."</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"WYŁ."</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Pokaż w szybkich ustawieniach"</string>
@@ -2402,6 +2405,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"wybrano <xliff:g id="NUMBER">%1$d</xliff:g> z <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Wybierz wszystkie"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Zarządzaj abonamentami"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Użycie danych"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Użycie danych w aplikacji"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operator sieci komórkowej może obliczać ilość przesłanych danych inaczej niż urządzenie."</string>
@@ -2487,6 +2491,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Sieci komórkowe"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Sieci Wi‑Fi z pomiarem"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Aby wybrać sieci z pomiarem, włącz Wi-Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatycznie"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Użycie danych jest mierzone"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Użycie danych nie jest mierzone"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Operator komórkowy może obliczać ilość przesłanych danych inaczej niż urządzenie."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Połączenie alarmowe"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Powrót do połączenia"</string>
@@ -2712,7 +2719,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Menedżer połączeń"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Komunikaty alarmowe"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Alerty o zagrożeniu"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Operatorzy sieci"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Nazwy punktów dostępu"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Tryb rozszerzonego 4G LTE"</string>
@@ -2781,6 +2788,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Karta SIM preferowana dla:"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Pytaj za każdym razem"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Wymagany wybór"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Wybór karty SIM"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Ustawienia"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="few">Pokaż %d ukryte elementy</item>
@@ -2936,18 +2944,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Powiadomienia aplikacji"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategoria powiadomienia"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Ważność"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Do decyzji aplikacji"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Zezwól na dźwięk"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nigdy nie pokazuj powiadomień"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Brak dźwięku i komunikatów wizualnych"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Brak dźwięku"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Sygnalizacja dźwiękiem"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Sygnalizacja dźwiękiem i wyświetlenie komunikatu"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Pokaż na ekranie"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Niska"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Średnia"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Wysoka"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Pilne"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Zezwól na dźwięk"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Nie sygnalizuj tych powiadomień dźwiękiem ani wibracjami ani nie wyświetlaj ich na bieżącym ekranie."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Zezwól na przerywanie"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Zezwól tej aplikacji na dźwięki, wibracje­i/lub wyświetlanie powiadomień na ekranie"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Mało ważne"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Średnio ważne"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Bardzo ważne"</string>
@@ -2980,7 +2989,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"PIP, obraz w obrazie"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Obraz w obrazie"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Pozwól na tryb obraz w obrazie"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Pozwala tej aplikacji na tworzenie okna typu obraz w obrazie, gdy jest ona otwarta lub gdy ją opuścisz (np. aby kontynuować oglądanie filmu). To okno wyświetla się nad innymi używanymi aplikacjami."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Pozwala tej aplikacji na tworzenie okna typu obraz w obrazie, gdy jest ona otwarta lub gdy ją opuścisz (aby np. kontynuować oglądanie filmu). To okno wyświetla się nad innymi używanymi aplikacjami."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Dostęp do „Nie przeszkadzać”"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Żadne zainstalowane aplikacje nie prosiły o dostęp do funkcji „Nie przeszkadzać”."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Wczytuję aplikacje..."</string>
@@ -3303,6 +3312,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Przesyłanie plików"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Przesyłanie zdjęć (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Używanie urządzenia jako MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Przekazywanie SMS-ów"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Kontrola działania w tle"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Pełny dostęp w tle"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Używanie tekstu na ekranie"</string>
@@ -3449,6 +3459,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="night_display_suggestion_title" msgid="6602129097059325291">"Ustal harmonogram Podświetlenia nocnego"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Ociepla barwy, by ułatwić Ci zaśnięcie"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Podświetlenie nocne jest włączone"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Ekran ma pomarańczowy odcień. Może to ułatwić zaśnięcie."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Sugestie"</string>
@@ -3471,6 +3483,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Używaj chłodniejszych kolorów na ekranie"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Aby zastosować zmianę kolorów, wyłącz ekran"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Aby zmiana ustawienia monitorowania telefonii zaczęła obowiązywać, zrestartuj urządzenie"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HAL HDR+ aparatu"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Aby zmiana HAL HDR+ aparatu zaczęła obowiązywać, zrestartuj urządzenie"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Czujnik lasera aparatu"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatyczne aktualizacje systemu"</string>
     <string name="usage" msgid="2977875522080448986">"Wykorzystanie danych"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobilna transmisja danych"</string>
@@ -3498,7 +3513,7 @@
     <string name="data_warning" msgid="209133958008062117">"Próg ostrzegawczy"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Ustaw limit transmisji danych"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limit danych"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"W okresie <xliff:g id="ID_2">%2$s</xliff:g> wykorzystano <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> w okresie <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Skonfiguruj"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Inne aplikacje korzystające z transmisji danych"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3571,7 +3586,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Wyczyść i przekształć"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Zresetuj ograniczanie szybkości w usłudze ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Zresetowano ograniczenie szybkości w usłudze ShortcutManager"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Skonfiguruj powiadomienia na ekranie blokady"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Zarządzaj informacjami wyświetlanymi 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="8483187649355540109">"Wsparcie i wskazówki"</string>
@@ -3579,7 +3594,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Żadna z zainstalowanych aplikacji nie prosiła o dostęp do SMS-ów specjalnych"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Za SMS-y specjalne może być pobierana dodatkowa, wyższa opłata, która pojawi się na Twoim rachunku telefonicznym. Po włączeniu tego uprawnienia możliwe będzie wysyłanie SMS-ów specjalnych z wybranej aplikacji."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Dostęp do SMS-ów specjalnych"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Niewidoczny dla innych urządzeń"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Wyłączony"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Połączono z: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Połączono z wieloma urządzeniami"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Tryb demonstracyjny interfejsu"</string>
@@ -3687,7 +3702,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Aplikacje błyskawiczne"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Otwieraj linki nawet w niezainstalowanych aplikacjach"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Aplikacje błyskawiczne"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Konto do aplikacji błyskawicznych"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Ustawienia aplikacji błyskawicznych"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Zainstalowane aplikacje"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Pamięcią zarządza teraz menedżer miejsca"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Konta użytkownika <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3738,7 +3753,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Wyłączono stały VPN w Twoim profilu osobistym"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Włączono stały VPN w Twoim profilu do pracy"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Ustawiono globalny serwer proxy HTTP"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Zaufane dane uwierzytelniające"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Zaufane dane logowania"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Zaufane dane logowania w Twoim profilu osobistym"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Zaufane dane logowania w Twoim profilu do pracy"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="few">Co najmniej <xliff:g id="COUNT_1">%d</xliff:g> certyfikaty urzędu certyfikacji</item>
       <item quantity="many">Co najmniej <xliff:g id="COUNT_1">%d</xliff:g> certyfikatów urzędu certyfikacji</item>
@@ -3811,7 +3828,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informacje o obsłudze administracyjnej operatora"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Uruchom obsługę administracyjną operatora"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Co nowego i fajnego?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Zobacz 5 najlepszych funkcji"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Poznaj swój nowy telefon"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Poznaj swój nowy tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Poznaj swoje nowe urządzenie"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ta funkcja jest niedostępna na tym urządzeniu."</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Stan rejestracji IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Zarejestrowane"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Niezarejestrowane"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 12e0172..36ab353 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s deseja acessar suas mensagens. Conceder acesso a %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitação de acesso ao cartão SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"O <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> deseja acessar seu cartão SIM. A concessão de acesso ao cartão SIM desativará a conectividade de dados no seu dispositivo durante a conexão. Conceda acesso ao <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visível como \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' para outros dispositivos"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visível como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para outros dispositivos"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Seus dispositivos"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Parear novo dispositivo"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data e hora"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Próxima"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Pular impressão digital?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"A configuração da impressão digital leva apenas um ou dois minutos. Se você pular essa etapa, poderá adicionar sua impressão digital mais tarde nas configurações."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Pular bloqueio de tela?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este tablet se ele for perdido, roubado ou redefinido."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este dispositivo se ele for perdido, roubado ou redefinido."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este smartphone se ele for perdido, roubado ou redefinido."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Você adicionou o número máximo de impressões digitais"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Não é possível adicionar mais impressões digitais"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Remover todas as impressões digitais?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Remover \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\""</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Deseja excluir esta impressão digital?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Você não poderá usar suas impressões digitais para desbloquear o smartphone, autorizar compras ou fazer login em apps."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Você não poderá usar suas impressões digitais para desbloquear seu perfil de trabalho, autorizar compras ou fazer login em apps de trabalho."</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Sim, remover"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Proteger o tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Proteger o dispositivo"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Proteger o smartphone"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Para aumentar a segurança, configure um bloqueio de tela alternativo."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Para aumentar a segurança, configure um bloqueio de tela alternativo."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Para impedir que outras pessoas usem este tablet sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Para impedir que outras pessoas usem este dispositivo sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Para impedir que outras pessoas usem este smartphone sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
@@ -497,35 +502,35 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Remover proteção do dispositivo?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Remover proteção de perfil?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Os recursos de proteção do dispositivo não funcionarão sem seu padrão."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Os recursos de proteção do dispositivo não funcionarão sem seu padrão.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Os recursos de proteção do dispositivo não funcionarão sem seu padrão.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Suas impressões digitais também serão removidas deste dispositivo e não será possível desbloquear o smartphone, autorizar compras ou fazer login em apps com elas.\""</string>
+</xliff:g>Suas impressões digitais salvas também serão removidas deste dispositivo e não será possível desbloquear o smartphone, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Os recursos de proteção do dispositivo não funcionarão sem seu PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Os recursos de proteção do dispositivo não funcionarão sem seu PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Os recursos de proteção do dispositivo não funcionarão sem seu PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Suas impressões digitais também serão removidas deste dispositivo e não será possível desbloquear o smartphone, autorizar compras ou fazer login em apps com elas.\""</string>
+</xliff:g>Suas impressões digitais salvas também serão removidas deste dispositivo e não será possível desbloquear o smartphone, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Os recursos de proteção do dispositivo não funcionarão sem sua senha."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Os recursos de proteção do dispositivo não funcionarão sem sua senha.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Os recursos de proteção do dispositivo não funcionarão sem sua senha.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Suas impressões digitais também serão removidas deste dispositivo e não será possível desbloquear o smartphone, autorizar compras ou fazer login em apps com elas.\""</string>
+</xliff:g>Suas impressões digitais salvas também serão removidas deste dispositivo e não será possível desbloquear o smartphone, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Os recursos de proteção do dispositivo não funcionarão sem seu bloqueio de tela."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Os recursos de proteção do dispositivo não funcionarão sem seu bloqueio de tela.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Os recursos de proteção do dispositivo não funcionarão sem seu bloqueio de tela.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Suas impressões digitais também serão removidas deste dispositivo e não será possível desbloquear o smartphone, autorizar compras ou fazer login em apps com elas.\""</string>
+</xliff:g>Suas impressões digitais salvas também serão removidas deste dispositivo e não será possível desbloquear o smartphone, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Os recursos de proteção de perfil não funcionam sem seu padrão."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Os recursos de proteção de perfil não funcionam sem seu padrão.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Os recursos de proteção de perfil não funcionarão sem seu padrão.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Suas impressões digitais salvas também serão removidas deste perfil e não será possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Os recursos de proteção de perfil não funcionam sem seu PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Os recursos de proteção de perfil não funcionam sem seu PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Os recursos de proteção de perfil não funcionarão sem seu PIN.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Suas impressões digitais salvas também serão removidas deste perfil e não será possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Os recursos de proteção de perfil não funcionam sem sua senha."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Os recursos de proteção de perfil não funcionam sem sua senha.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Os recursos de proteção de perfil não funcionarão sem sua senha.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Suas impressões digitais salvas também serão removidas deste perfil e não será possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Os recursos de proteção de perfil não funcionarão sem seu bloqueio de tela."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Os recursos de proteção de perfil não funcionam sem seu bloqueio de tela.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Os recursos de proteção de perfil não funcionarão sem seu bloqueio de tela.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Suas impressões digitais salvas também serão removidas deste perfil e não será possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Sim, remover"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Não é permitido usar uma sequência de dígitos em ordem crescente, decrescente ou repetidos"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancelar"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Limpar"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancelar"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Avançar"</string>
     <string name="lock_setup" msgid="3355847066343753943">"A configuração foi concluída."</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponível"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponível)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Insira a senha da rede"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Rede Wi‑Fi de operadora"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Conecte-se via <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para aumentar a precisão da localização e outras finalidades, <xliff:g id="APP_NAME">%1$s</xliff:g> quer ativar a verificação de rede, mesmo que o Wi-Fi esteja desligado.\n\nPermitir isto para todos os apps que quiserem verificar?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Para desativar esta opção, vá para \"Avançado\" no menu flutuante."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Falha ao conectar à rede"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Esquecer"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modificar"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Falha ao esquecer a rede"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Salvar"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Falha ao salvar a rede"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi avançado"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Endereço MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Endereço IP"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Informações da rede"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Máscara de sub-rede"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Endereços IPv6"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Cancelar convite?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Deseja cancelar o convite para se conectar com <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Esquecer este grupo?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Ponto de acesso Wi-Fi portátil"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Ponto de acesso Wi-Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Não está compartilhando a Internet ou conteúdo com outros dispositivos"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Compartilhando a conexão de Internet deste tablet via ponto de acesso"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Compartilhando a conexão de Internet deste smartphone via ponto de acesso"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"O app está compartilhando conteúdo. Para compartilhar a conexão com a Internet, desative e ative o ponto de acesso."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nome do Wi-Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Nome do ponto de acesso"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Ativando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Outros dispositivos podem se conectar a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Senha do Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Senha do ponto de acesso"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda de AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Use o ponto de acesso para criar uma rede Wi‑Fi para outros dispositivos. O ponto de acesso fornece Internet usando sua conexão de dados móveis. Pode haver cobrança adicional para dados móveis."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Os apps podem criar um ponto de acesso para compartilhamento de conteúdo com dispositivos nas proximidades."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Endereço usado como sua localização pelos serviços de emergência se você fizer uma chamada de emergência usando o Wi‑Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Tela"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Som"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Pesquisar"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Gerenciar configurações e histórico de pesquisa"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nenhum resultado"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Limpar histórico"</string>
     <string name="display_settings" msgid="7965901687241669598">"Tela"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Girar tela automaticamente"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Cores vívidas"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Restaurando as configurações APN padrão."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Redefinir para o padrão"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Redefinição das configurações padrão do APN concluída."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Redefinir"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Redefinir rede"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Redefinir opções"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"A rede, os apps ou o dispositivo podem ser redefinidos"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Redefinir Wi-Fi, rede móvel e Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Isso redefinirá todas as configurações de rede, inclusive:\n\n"<li>"Wi‑Fi"</li>\n<li>"dados móveis"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Redefinir configurações"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Redefinir todas as configurações de rede? Não é possível desfazer esta ação."</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Redefinir?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"A redefinição da rede não está disponível para esse usuário"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"As configurações de rede foram redefinidas"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Configuração original"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> conta será redefinida</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> contas serão redefinidas</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"O armazenamento interno e todos os dados serão redefinidos"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Limpar todos os dados (redefinição para configuração original)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" do seu tablet, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps transferidos"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" de seu smartphone, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps transferidos"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"No momento você está conectado às seguintes contas:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informações de segurança"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Você não tem uma conexão de dados. Para visualizar estas informações agora, acesse %s em qualquer computador conectado à Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Carregando..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Escolha a sua senha"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Definir um bloqueio de tela"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Por segurança, defina uma senha"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Para usar a impressão digital, defina uma senha"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Escolha seu padrão"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Para usar a impressão digital, defina um padrão"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Escolha o seu PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Por segurança, defina um PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Para usar a impressão digital, defina um PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirme sua senha"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Digite sua senha novamente"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirme seu padrão"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirme o seu PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Digite seu PIN novamente"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"As senhas não correspondem"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Os PINs não correspondem"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Selecionar desbloqueio"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Use seu padrão de trabalho para continuar"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Digite seu PIN de trabalho para continuar"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Digite sua senha de trabalho para continuar"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Para continuar, use o padrão do dispositivo, que é solicitado depois que o dispositivo é reiniciado."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Para continuar, digite o PIN do dispositivo, que é solicitado depois que o dispositivo é reiniciado."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Para continuar, digite a senha do dispositivo, que é solicitada depois que ele é reiniciado."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Para continuar, use seu padrão de trabalho, que é solicitado depois que o dispositivo é reiniciado."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Para continuar, digite seu PIN de trabalho, que é solicitado depois que o dispositivo é reiniciado."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Para continuar, digite a senha de trabalho, que é solicitada depois que o dispositivo é reiniciado."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Para aumentar a segurança, use o padrão do dispositivo"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Para aumentar a segurança, digite o PIN do dispositivo"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Para aumentar a segurança, digite a senha do dispositivo."</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Para aumentar a segurança, use o padrão de trabalho"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Para aumentar a segurança, digite o PIN de trabalho"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Para aumentar a segurança, digite a senha de trabalho"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Seu smartphone foi redefinido para a configuração original. Para usá-lo, digite seu padrão anterior."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Seu smartphone foi redefinido para a configuração original. Para usá-lo, digite seu PIN anterior."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Seu smartphone foi redefinido para a configuração original. Para usá-lo, digite sua senha anterior."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verificar padrão"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verificar PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verificar senha"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN incorreto"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Senha incorreta"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Padrão incorreto"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Criar widget e permitir acesso?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Após a criação do widget, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> poderá acessar todos os dados exibidos."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Sempre permitir que <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> crie widgets e acesse os dados"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Estatísticas de uso"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Estatísticas de uso"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Classificar por:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Controles de interação, leitores de tela, exibição"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Configuração visual"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"É possível personalizar este dispositivo para atender às suas necessidades. Esses recursos de acessibilidade podem ser alterados posteriormente em \"Configurar\"."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Aumentar tamanho da fonte"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Alterar tamanho da fonte"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Leitores de tela"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Áudio e texto na tela"</string>
     <string name="display_category_title" msgid="685461049938269166">"Tela"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Para aplicar zoom"</b>", toque três vezes na tela rapidamente.\n"<ul><li>"Arraste dois ou mais dedos para rolar"</li>\n<li>"Faça um gesto de pinça com dois ou mais dedos para ajustar o zoom"</li></ul>\n\n<b>"Para aplicar zoom temporariamente"</b>", toque rapidamente na tela três vezes e mantenha o dedo pressionado no terceiro toque.\n"<ul><li>"Arraste para mover pela tela"</li>\n<li>"Levante o dedo para diminuir o zoom"</li></ul>\n\n"Não é possível aumentar o zoom no teclado e na barra de navegação."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Se a ampliação estiver ativada, use o botão Acessibilidade localizado na parte inferior da tela para ampliar rapidamente.\n\n"<b>"Para aplicar zoom"</b>", toque no botão Acessibilidade e toque em qualquer ponto da tela.\n"<ul><li>"Arraste dois dedos ou mais para rolar"</li>\n<li>"Faça um gesto de pinça com dois ou mais dedos para ajustar o zoom"</li></ul>\n\n<b>"Para aplicar zoom temporariamente"</b>", toque no botão Acessibilidade e toque e mantenha pressionado qualquer ponto na tela.\n"<ul><li>"Arraste para mover pela tela"</li>\n<li>"Levante o dedo para diminuir o zoom"</li></ul>\n\n"Não é possível aumentar o zoom no teclado ou na barra de navegação."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"O botão Acessibilidade está definido para <xliff:g id="SERVICE">%1$s</xliff:g>. Para usar a ampliação, toque nesse botão, mantenha-o pressionado e selecione a ampliação."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Atalho de acessibilidade"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Atalho da tecla de volume"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Serviço de atalho"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Permitir na tela de bloqueio"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Se o atalho estiver ativado, pressione ambos os botões de volume por três segundos para iniciar um recurso de acessibilidade."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Quando o atalho estiver ativado, pressione ambos os botões de volume por três segundos para iniciar um recurso de acessibilidade."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Texto em alto contraste"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Atual. autom. da ampliação da tela"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Atualiz. ampliação da tela em transições de aplic."</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Pode afetar o desempenho"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clicar após parada do ponteiro"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Atraso antes do clique"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ATIVAR"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESATIVAR"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Mostrar em \"Configurações rápidas\""</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"selecionados <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Selecionar tudo"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Gerenciar planos"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de dados"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Dados uso de apps"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"O cálculo da operadora poderá ser diferente de seu dispositivo."</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Redes móveis"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Redes Wi-Fi limitadas"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Para selecionar redes limitadas, ative o Wi-Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automático"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Limitada"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Ilimitada"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"O cálculo da operadora poderá ser diferente de seu dispositivo."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Chamada de emergência"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Retornar à chamada"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Gerenciador de chamadas"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Transmissões de emergência"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Alertas de emergência"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Operadores de rede"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Nomes dos pontos de acesso"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Modo 4G LTE avançado"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"SIM preferido para"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Perguntar sempre"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Seleção necessária"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Seleção de SIM"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Configurações"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="one">Mostrar %d item oculto</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificações de apps"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoria da notificação"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importância"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Deixar o app decidir"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Permitir som"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nunca mostrar notificações"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Sem som ou interrupção visual"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Sem som"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Emitir som"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Emitir som e exibir na tela"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Exibir na tela"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Baixa"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Média"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Alta"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgente"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Permitir som"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Não emitir som, vibrar ou mostrar parcialmente essas notificações na tela atual."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Permitir interrupções"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Permitir que o app emita um som, vibre e/ou mostre notificações na tela"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Importância baixa"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Importância média"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Importância elevada"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip picture in"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Permitir picture-in-picture"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Permite que esse app crie uma janela picture-in-picture enquanto o app é aberto ou depois que você sai dele (por exemplo, para continuar a assistir um vídeo). Essa janela é sobreposta a outros apps que você está usando."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Permite que esse app crie uma janela picture-in-picture enquanto o app é aberto ou depois que você sai dele (por exemplo, para continuar a assistir um vídeo). Essa janela é sobreposta a outros apps que você está usando."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acesso \"Não perturbe\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nenhum app instalado solicitou o acesso \"Não perturbe\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Carregando apps…"</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transferência de arquivos"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transferência de fotos (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Uso do dispositivo como MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Espelhamento de SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Verificação em segundo plano"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Acesso completo ao segundo plano"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Usar texto da tela"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Definir programação do Modo noturno"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Tingir tela de âmbar p/ ajudar você a pegar no sono"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"O modo noturno está ativado"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"A cor da tela muda para âmbar. Isso pode ajudar você a adormecer."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Sugestões"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Usar cores de tela mais frias"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar a alteração de cor, desative a tela"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Para que a alteração do monitor de telefonia seja aplicada, reinicialize o dispositivo"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HDR+ da câmera HAL"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Para aplicar a alteração ao HDR+ da câmera HAL, reinicialize o dispositivo"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor a laser da câmera"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Atualizações automáticas do sistema"</string>
     <string name="usage" msgid="2977875522080448986">"Utilização"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Uso de dados móveis"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Aviso de dados"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Definir limite de dados"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limite de dados"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> usado(s) entre <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> usado(s) entre <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configurar"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Outros apps inclusos no uso"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Limpar e converter…"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Redefinir limite de taxa do ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"O limite de taxa do ShortcutManager foi redefinido"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Notificações da tela de bloqueio"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Controlar informações na 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="8483187649355540109">"Suporte e dicas"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Nenhum app instalado solicitou acesso a SMS premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"O SMS premium pode gerar custos e será adicionado ao faturamento da sua operadora. Se você conceder permissão para um app, será possível enviar SMS premium usando esse app."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Acesso a SMS premium"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Não visível para outros dispositivos"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Desativado"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Conectado a <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Conectado a vários dispositivos"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Modo de demonstração da IU do sistema"</string>
@@ -3535,7 +3552,7 @@
     <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>
+    <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telefone"</string>
     <string name="bluetooth_talkback_imaging" msgid="551146170554589119">"Imagem"</string>
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Headphone"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Periférico de entrada"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Apps instantâneos"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Abrir links em apps, mesmo que eles não estejam instalados"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Apps instantâneos"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Conta de apps instantâneos"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Preferências de Instant Apps"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Apps instalados"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Seu armazenamento está sendo controlado pelo gerenciador de armazenamento"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Contas de <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"\"VPN sempre ativa\" ativada no seu perfil pessoal"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"\"VPN sempre ativa\" ativada no seu perfil de trabalho"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy HTTP geral definido"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Credenciais confiáveis"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Credenciais confiáveis"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Credenciais confiáveis no seu perfil pessoal"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Credenciais confiáveis no seu perfil de trabalho"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">No mínimo <xliff:g id="COUNT_1">%d</xliff:g> certificado de CA</item>
       <item quantity="other">No mínimo <xliff:g id="COUNT_1">%d</xliff:g> certificados de CA</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informações de aprovisionamento da operadora"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Acionar aprovisionamento da operadora"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"O que há de novo e empolgante?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Confira os cinco melhores recursos"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Faça um tour pelo seu novo smartphone"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Faça um tour pelo seu novo tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Faça um tour pelo seu novo dispositivo"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Este recurso não está disponível neste dispositivo"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Estado do registro de IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrado"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Não registrado"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 4a32a90..ce9bd8e 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s pretende aceder às suas mensagens. Conceder acesso a %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Pedido de acesso ao SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> pretende aceder ao seu cartão SIM. Ao conceder acesso ao cartão SIM, desativa a conetividade de dados no seu dispositivo durante a ligação. Fornecer acesso a <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visível como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para outros dispositivos"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visível como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para outros dispositivos"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Os seus dispositivos"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Sincronizar o novo dispositivo"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data e hora"</string>
@@ -331,7 +331,7 @@
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Mostrar info. do proprietário no ecrã de bloqueio"</string>
     <string name="owner_info_settings_title" msgid="5530285568897386122">"Mensagem no ecrã de bloqueio"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Ativar widgets"</string>
-    <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Desativado pelo administrador"</string>
+    <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Desativado pelo gestor"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"Nenhum"</string>
     <string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"Por exemplo, Android do João."</string>
@@ -349,7 +349,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Definir A minha localização, desbloqueio do ecrã, bloqueio do cartão SIM, bloqueio do armazenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Definir O meu local, desbloqueio do ecrã, bloqueio do armazenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Privacidade"</string>
-    <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Desativada pelo administrador"</string>
+    <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Desativada pelo gestor"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Estado de segurança"</string>
     <string name="security_dashboard_summary" msgid="6757421634477554939">"Bloqueio de ecrã, impressão digital"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Bloqueio de ecrã"</string>
@@ -366,12 +366,15 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloq. com impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Utilizar a impressão digital"</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_message_unlock_disabled" msgid="1550756694054944874">"Utilize a sua impressão digital para desbloquear o telemóvel ou para autorizar compras.\n\nNota: não pode utilizar a sua impressão digital para desbloquear este dispositivo. Para mais informações, contacte o administrador da sua entidade."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"Utilize a sua impressão digital para desbloquear o telemóvel ou para autorizar compras.\n\nNota: não pode utilizar a sua impressão digital para desbloquear este dispositivo. Para mais informações, contacte o gestor da sua entidade."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"Utilize a sua impressão digital para desbloquear o telemóvel ou para autorizar compras.\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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Seguinte"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Ignorar impressão digital?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"A configuração da impressão digital demora apenas um ou dois minutos. Se ignorar este passo, pode adicionar a impressão digital mais tarde nas definições."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Ignorar bloqueio de ecrã?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"As funcionalidades de proteção do dispositivo não serão ativadas. Não poderá impedir terceiros de utilizar este tablet em caso de perda, de roubo ou de reposição."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"As funcionalidades de proteção do dispositivo não serão ativadas. Não poderá impedir terceiros de utilizar este dispositivo em caso de perda, de roubo ou de reposição."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"As funcionalidades de proteção do dispositivo não serão ativadas. Não poderá impedir terceiros de utilizar este telemóvel em caso de perda, de roubo ou de reposição."</string>
@@ -405,12 +408,14 @@
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Adicionar outra"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Seguinte"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Para além de desbloquear o telemóvel, também pode utilizar a sua impressão digital para autorizar compras e o acesso de aplicações. "<annotation id="url">"Saiba mais"</annotation></string>
-    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" A opção de bloqueio do ecrã está desativada. Para saber mais, contacte o administrador da sua entidade. "<annotation id="admin_details">"Mais detalhes"</annotation>\n\n"Pode continuar a utilizar a impressão digital para autorizar compras e o acesso a aplicações. "<annotation id="url">"Saiba mais"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" A opção de bloqueio do ecrã está desativada. Para saber mais, contacte o gestor da sua entidade. "<annotation id="admin_details">"Mais detalhes"</annotation>\n\n"Pode continuar a utilizar a impressão digital para autorizar compras e o acesso a aplicações. "<annotation id="url">"Saiba mais"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"Levante o dedo e toque no sensor novamente"</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Pode adicionar até <xliff:g id="COUNT">%d</xliff:g> impressões digitais"</string>
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Adicionou o número máximo de impressões digitais"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Não é possível adicionar mais impressões digitais"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Remover todas impressões digitais?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Remover \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\""</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Pretende eliminar esta impressão digital?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Não poderá utilizar as impressões digitais para desbloquear o telemóvel, autorizar compras ou iniciar sessão em aplicações"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Não poderá utilizar as impressões digitais para desbloquear o perfil de trabalho, autorizar compras ou iniciar sessão nas aplicações de trabalho"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Sim, remover"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Proteger o seu tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Proteger o dispositivo"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Proteger o telemóvel"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Para maior segurança, configure um bloqueio de ecrã de segurança."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Para maior segurança, configure um bloqueio de ecrã de segurança."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Impeça terceiros de utilizar este tablet sem a sua autorização ao ativar as funcionalidades de proteção do dispositivo. Escolha o bloqueio de ecrã que pretende utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Impeça terceiros de utilizar este dispositivo sem a sua autorização ao ativar as funcionalidades de proteção do dispositivo. Escolha o bloqueio de ecrã que pretende utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Impeça terceiros de utilizar este telemóvel sem a sua autorização ao ativar as funcionalidades de proteção do dispositivo. Escolha o bloqueio de ecrã que pretende utilizar."</string>
@@ -486,7 +491,7 @@
     <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"Impressão digital + palavra-passe"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="1441077909803666681">"Continuar sem impressão digital"</string>
     <string name="fingerprint_unlock_title" msgid="2826226740306003991">"Pode desbloquear o seu telemóvel através da sua impressão digital. Por motivos de segurança, esta opção requer um bloqueio de ecrã de segurança."</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"Desativada pelo administrador, política de encriptação ou armazenamento de credenciais"</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"Desativada pelo gestor, política de encriptação ou armazenamento de credenciais"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nenhum"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Deslizar rapidamente"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Sequência"</string>
@@ -497,37 +502,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Pretende remover a proteção do dispositivo?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Pretende remover a proteção do perfil?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"As funcionalidades de proteção do dispositivo não funcionam sem a sequência."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"As funcionalidades de proteção do dispositivo não funcionam sem a sequência.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"As funcionalidades de proteção do dispositivo não funcionam sem o padrão.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>As suas impressões digitais guardadas também são removidas deste dispositivo e não pode desbloquear o telemóvel, autorizar compras ou iniciar sessão em aplicações com elas.\""</string>
+</xliff:g>As impressões digitais guardadas também são removidas deste dispositivo e não pode desbloquear o telemóvel, autorizar compras ou iniciar sessão em aplicações com as mesmas."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"As funcionalidades de proteção do dispositivo não funcionam sem o PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"As funcionalidades de proteção do dispositivo não funcionam sem o PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"As funcionalidades de proteção do dispositivo não funcionam sem o PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>As suas impressões digitais guardadas também são removidas do dispositivo e não pode desbloquear o telemóvel, autorizar compras ou iniciar sessão em aplicações com elas.\""</string>
+</xliff:g>As impressões digitais guardadas também são removidas do dispositivo e não pode desbloquear o telemóvel, autorizar compras ou iniciar sessão em aplicações com as mesmas."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"As funcionalidades de proteção do dispositivo não funcionam sem a palavra-passe."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"As funcionalidades de proteção do dispositivo não funcionam sem a palavra-passe.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"As funcionalidades de proteção do dispositivo não funcionam sem a palavra-passe.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>As suas impressões digitais guardadas também são removidas deste dispositivo e não pode desbloquear o telemóvel, autorizar compras ou iniciar sessão em aplicações com elas."</string>
+</xliff:g>As impressões digitais guardadas também são removidas deste dispositivo e não pode desbloquear o telemóvel, autorizar compras ou iniciar sessão em aplicações com as mesmas."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"As funcionalidades de proteção do dispositivo não funcionam sem o bloqueio de ecrã."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"As funcionalidades de proteção do dispositivo não funcionam sem o bloqueio de ecrã.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"As funcionalidades de proteção do dispositivo não funcionam sem o bloqueio de ecrã.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>As suas impressões digitais guardadas também são removidas deste dispositivo e não pode desbloquear o telemóvel, autorizar compras ou iniciar sessão em aplicações com elas."</string>
+</xliff:g>As suas impressões digitais guardadas também são removidas deste dispositivo e não pode desbloquear o telemóvel, autorizar compras ou iniciar sessão em aplicações com as mesmas."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"As funcionalidades de proteção do perfil não funcionam sem o padrão."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"As funcionalidades de proteção do perfil não funcionam sem o padrão.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"As funcionalidades de proteção do perfil não funcionam sem o padrão.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>As impressões digitais guardadas também são removidas deste perfil e não pode desbloquear o perfil, autorizar compras ou iniciar sessão em aplicações com elas."</string>
+</xliff:g>As impressões digitais guardadas também são removidas deste perfil e não pode desbloquear o perfil, autorizar compras ou iniciar sessão em aplicações com as mesmas."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"As funcionalidades de proteção do perfil não funcionam sem o PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"As funcionalidades de proteção do perfil não funcionam sem o PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"As funcionalidades de proteção do perfil não funcionam sem o PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>As impressões digitais guardadas também são removidas deste perfil e não pode desbloquear o perfil, autorizar compras ou iniciar sessão em aplicações com elas."</string>
+</xliff:g>As impressões digitais guardadas também são removidas deste perfil e não pode desbloquear o perfil, autorizar compras ou iniciar sessão em aplicações com as mesmas."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"As funcionalidades de proteção do perfil não funcionam sem a palavra-passe."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"As funcionalidades de proteção do perfil não funcionam sem a palavra-passe.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"As funcionalidades de proteção do perfil não funcionam sem a palavra-passe.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>As impressões digitais guardadas também são removidas deste perfil e não pode desbloquear o perfil, autorizar compras ou iniciar sessão em aplicações com elas."</string>
+</xliff:g>As impressões digitais guardadas também são removidas deste perfil e não pode desbloquear o perfil, autorizar compras ou iniciar sessão em aplicações com as mesmas."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"As funcionalidades de proteção do perfil não funcionam sem o bloqueio de ecrã."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"As funcionalidades de proteção do perfil não funcionam sem o bloqueio de ecrã.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"As funcionalidades de proteção do perfil não funcionam sem o bloqueio de ecrã.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>As impressões digitais guardadas também são removidas deste perfil e não pode desbloquear o perfil, autorizar compras ou iniciar sessão em aplicações com elas."</string>
+</xliff:g>As impressões digitais guardadas também são removidas deste perfil e não pode desbloquear o perfil, autorizar compras ou iniciar sessão em aplicações com as mesmas."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Sim, remover"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Mudar padrão de desbloqueio"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Alterar PIN de desbloqueio"</string>
@@ -553,7 +558,7 @@
     <string name="lockpassword_password_too_long" msgid="4591720174765403476">"Tem de ter menos de <xliff:g id="NUMBER">%d</xliff:g> carateres"</string>
     <string name="lockpassword_pin_too_long" msgid="2079396149560490458">"Tem de ter menos de <xliff:g id="NUMBER">%d</xliff:g> dígitos"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="7284664023164191198">"Tem de incluir apenas dígitos de 0 a 9"</string>
-    <string name="lockpassword_pin_recently_used" msgid="1401569207976460727">"O administrador do dispositivo não permite utilizar um PIN recente"</string>
+    <string name="lockpassword_pin_recently_used" msgid="1401569207976460727">"O gestor do dispositivo não permite utilizar um PIN recente"</string>
     <string name="lockpassword_illegal_character" msgid="8049611046639943217">"Não pode incluir um caráter inválido"</string>
     <string name="lockpassword_password_requires_alpha" msgid="3036589522150097731">"Tem de incluir, pelo menos, uma letra"</string>
     <string name="lockpassword_password_requires_digit" msgid="5140062925787058765">"Tem de incluir, pelo menos, um dígito"</string>
@@ -586,10 +591,11 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Não é permitida uma sequência de dígitos ascendente, descendente ou repetida"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancelar"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Limpar"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancelar"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Seguinte"</string>
     <string name="lock_setup" msgid="3355847066343753943">"A configuração está concluída."</string>
-    <string name="manage_device_admin" msgid="537804979483211453">"Aplicações de administrador do dispositivo"</string>
+    <string name="manage_device_admin" msgid="537804979483211453">"Aplicações de gestor do dispositivo"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"Sem aplicações ativas"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> aplicação ativa</item>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponível"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponível)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introduzir a palavra-passe da rede"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Rede Wi-Fi do operador"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Ligar através de <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para melhorar a precisão da localização e para outros fins, <xliff:g id="APP_NAME">%1$s</xliff:g> pretende ativar a verificação de redes, mesmo quando o Wi-Fi está desativado.\n\nPermitir esta opção para todas as aplicações que pretenderem verificar?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Para desativar, aceda a Avançadas no menu adicional."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Ligar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Não foi possível estabelecer ligação à rede"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Esquecer"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modificar"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Não foi possível esquecer a rede"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Guardar"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Não foi possível guardar a rede"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi Avançada"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Endereço MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Endereço IP"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Informação da rede"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Máscara de sub-rede"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Endereços IPv6"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Cancelar convite?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Pretende cancelar o convite para se ligar a <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Esquecer este grupo?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Zona Wi-Fi portátil"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Zona Wi-Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Não está a partilhar Internet ou conteúdo com outros dispositivos"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"A partilhar a ligação à Internet deste tablet através de zona Wi-Fi"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"A partilhar a ligação à Internet deste telemóvel através de zona Wi-Fi"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"A aplicação está a partilhar conteúdo. Para partilhar a ligação à Internet, desative a zona Wi-Fi e, de seguida, ative-a"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nome de Wi-Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Nome da zona Wi-Fi"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"A ativar <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Podem ser ligados outros dispositivos a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Palavra-passe de Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Palavra-passe da zona Wi-Fi"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda do PA"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Utilize uma zona Wi-Fi para criar uma rede Wi-Fi para os seus outros dispositivos. A zona Wi-Fi disponibiliza Internet através da sua ligação móvel de dados. Podem ser aplicados custos de dados móveis adicionais."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"As aplicações podem criar uma zona Wi-Fi para partilhar conteúdo com dispositivos próximos."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"O endereço utilizado pelos serviços de emergência como a sua localização se efetuar uma chamada de emergência através de Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ecrã"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Som"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Pesquisar"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Gerir definições e histórico de pesquisa"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Sem resultados"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Limpar histórico"</string>
     <string name="display_settings" msgid="7965901687241669598">"Ecrã"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rodar ecrã automaticamente"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Cores vivas"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"A restaurar predefinições de APN"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Repor predefinição"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Reposição de predefinições de APN concluída."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Repor"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Repos. definições rede"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Opções de reposição"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"É possível repor a rede, as aplicações ou o dispositivo."</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Repor Wi-Fi, dados móveis e Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Esta ação repõe todas as definições de rede, incluindo:\n\n"<li>"Wi‑Fi"</li>\n<li>"Dados móveis"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Repor definições"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Pretende repor todas as definições de rede? Não é possível anular esta ação!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Pretende repor?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"A reposição de rede não está disponível para este utilizador"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"As definições de rede foram repostas"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Repos. dados/fábrica"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one">1 conta será reposta</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> contas serão repostas</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"A memória de armazenamento interno e todos os dados serão repostos"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Apagar todos os dados (reposição de dados de fábrica)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do tablet, incluindo:\n\n"<li>"A Conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do telemóvel, incluindo:\n\n"<li>"A Conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualmente, tem sessão iniciada nas seguintes contas:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informações de segurança"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Não tem uma ligação de dados. Para visualizar estas informações agora, aceda a %s a partir de qualquer computador ligado à internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"A carregar..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Escolha a palavra-passe"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Definir um bloqueio de ecrã"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Por motivos de segurança, defina uma palavra-passe."</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Defina palavra-passe para usar impressão digital"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Escolher o padrão"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Defina padrão para usar impressão digital"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Escolha o PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Por motivos de segurança, defina um PIN."</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Defina PIN para usar impressão digital"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirmar palavra-passe"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Reintroduzir a palavra-passe"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirmar o padrão"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirmar PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Reintroduzir o PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"As palavras-passe não correspondem"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Os PINs não correspondem"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Seleção de desbloqueio"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Utilize o padrão de trabalho para continuar"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Introduza o PIN de trabalho para continuar"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Introduza a palavra-passe de trabalho para continuar"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Utilize o padrão do dispositivo para continuar. Este é necessário após o dispositivo reiniciar."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Utilize o PIN do dispositivo para continuar. Este é necessário após o dispositivo reiniciar."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Introduza a palavra-passe do dispositivo para continuar. Esta é necessária após o disp. reiniciar."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Utilize o padrão de trabalho do disp. para continuar. Este é necessário após o disp. reiniciar."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Utilize o PIN de trabalho para continuar. Este é necessário após o dispositivo reiniciar."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Utilize a palavra-passe de trabalho para continuar. Esta é necessária após o dispositivo reiniciar."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Para maior segurança, utilize o padrão do dispositivo"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Para maior segurança, introduza o PIN do dispositivo"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Para maior segurança, introduza a palavra-passe do dispositivo"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Para maior segurança, utilize o padrão de trabalho"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Para maior segurança, introduza o PIN de trabalho"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Para maior segurança, introduza a palavra-passe de trabalho"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"As definições de fábrica do telemóvel foram repostas. Para o utilizar, introduza o padrão anterior."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"As definições de fábrica do telemóvel foram repostas. Para o utilizar, introduza o PIN anterior."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"As definições de fábrica do telem. foram repostas. Para o utilizar, introduza a pal.-passe anterior."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Validar padrão"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Validar o PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Validar palavra-passe"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN incorreto"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Palavra-passe incorreta"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Sequência incorreta"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Criar widget e permitir o acesso?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Depois de criar o widget, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> pode aceder a todos os dados apresentados."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Permitir sempre que <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> crie widgets e aceda aos seus dados"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> m"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Estatísticas de utilização"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Estatísticas de utilização"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Ordenar por:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Leitores de ecrã, controlos de interação, ecrã"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Definições de visão"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Pode personalizar este dispositivo de acordo com as suas necessidades. Pode alterar estas funcionalidades de acessibilidade mais tarde em Definições."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Aumentar tamanho do tipo de letra"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Alterar o tamanho do tipo de letra"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Leitores de ecrã"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Áudio e texto no ecrã"</string>
     <string name="display_category_title" msgid="685461049938269166">"Visualização"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Para utilizar o zoom"</b>", toque rapidamente no ecrã três vezes.\n"<ul><li>"Arraste dois ou mais dedos para se deslocar"</li>\n<li>"Junte dois ou mais dedos para ajustar o zoom"</li></ul>\n\n<b>"Para utilizar o zoom temporariamente"</b>", toque rapidamente no ecrã três vezes sem soltar ao terceiro toque.\n"<ul><li>"Arraste para se mover no ecrã"</li>\n<li>"Levante o dedo para diminuir o zoom"</li></ul>\n\n"Não é possível utilizar o teclado ou a barra de navegação para aumentar o zoom."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Quando a ampliação estiver ativada, utilize o botão de acessibilidade na parte inferior do ecrã para ampliar rapidamente.\n\n"<b>"Para utilizar o zoom"</b>", toque no botão de acessibilidade e, em seguida, toque em qualquer ponto do ecrã.\n"<ul><li>"Arraste dois ou mais dedos para se deslocar"</li>\n<li>"Junte dois ou mais dedos para ajustar o zoom"</li></ul>\n\n<b>"Para utilizar o zoom temporariamente"</b>", toque no botão de acessibilidade e, em seguida, toque sem soltar em qualquer ponto do ecrã.\n"<ul><li>"Arraste para se mover no ecrã"</li>\n<li>"Levante o dedo para diminuir o zoom"</li></ul>\n\n"Não é possível utilizar o teclado ou a barra de navegação para aumentar o zoom."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"O botão de acessibilidade está definido para o serviço <xliff:g id="SERVICE">%1$s</xliff:g>. Para utilizar a ampliação, toque sem soltar neste botão e, em seguida, selecione a ampliação."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Atalho de acessibilidade"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Atalho das teclas de volume"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Serviço do atalho"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Permitir a partir do ecrã de bloqueio"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Quando o atalho estiver ativado, pode premir ambos os botões de volume durante 3 segundos para iniciar uma funcionalidade de acessibilidade."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Quando o atalho estiver ativado, pode premir ambas as teclas de volume durante 3 segundos para iniciar uma funcionalidade de acessibilidade."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Texto de alto contraste"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Atualiz. auto da ampliação do ecrã"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Atualizar ampliação do ecrã em transições de aplic"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Pode afetar o desempenho"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clicar depois de o ponteiro parar de se mover"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Atraso antes de clicar"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ATIVADO"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESATIVADO"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Mostrar nas Definições rápidas"</string>
@@ -2258,8 +2263,8 @@
     <string name="device_admin_warning" msgid="7482834776510188134">"A ativação desta aplicação de administração permite que a aplicação <xliff:g id="APP_NAME">%1$s</xliff:g> execute as seguintes operações:"</string>
     <string name="device_admin_status" msgid="7234814785374977990">"Esta aplicação de administração está ativa e permite que a aplicação <xliff:g id="APP_NAME">%1$s</xliff:g> execute as seguintes operações:"</string>
     <string name="profile_owner_add_title" msgid="6249331160676175009">"Pretende ativar o Gestor de perfis?"</string>
-    <string name="adding_profile_owner_warning" msgid="1354474524852805802">"Ao continuar, o utilizador será gerido pelo seu administrador, que, para além dos seus dados pessoais, também poderá armazenar dados associados.\n\nO administrador pode monitorizar e gerir as definições, o acesso, as aplicações e os dados associados a este utilizador, incluindo a atividade da rede e as informações de localização do seu dispositivo."</string>
-    <string name="admin_disabled_other_options" msgid="7712694507069054530">"As outras opções estão desativadas pelo administrador"</string>
+    <string name="adding_profile_owner_warning" msgid="1354474524852805802">"Ao continuar, o utilizador será gerido pelo seu gestor, que, para além dos seus dados pessoais, também poderá armazenar dados associados.\n\nO gestor pode monitorizar e gerir as definições, o acesso, as aplicações e os dados associados a este utilizador, incluindo a atividade da rede e as informações de localização do seu dispositivo."</string>
+    <string name="admin_disabled_other_options" msgid="7712694507069054530">"As outras opções estão desativadas pelo gestor"</string>
     <string name="admin_more_details" msgid="7901420667346456102">"Mais detalhes"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Sem título"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Geral"</string>
@@ -2337,7 +2342,7 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"Pretende remover a conta?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"A remoção desta conta elimina todas as mensagens, contactos e outros dados do tablet!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"A remoção desta conta elimina todas as mensagens, contactos e outros dados do telemóvel!"</string>
-    <string name="remove_account_failed" msgid="3901397272647112455">"O administrador não permite esta alteração"</string>
+    <string name="remove_account_failed" msgid="3901397272647112455">"O gestor não permite esta alteração"</string>
     <string name="provider_label" msgid="7724593781904508866">"Subscrições de emissão"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
     <skip />
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"selecionado(s) <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Selecionar tudo"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Gerir planos de dados"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Utilização de dados"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Utilização dados da apli."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"A contagem do operador de dados pode diferir do seu dispositivo."</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Redes móveis"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Redes Wi‑Fi de acesso limitado"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Para selecionar redes de acesso limitado, ative o Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automático"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Acesso limitado"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Acesso ilimitado"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"A contagem de dados do operador pode ser diferente da do seu dispositivo."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Chamada de emergência"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Regressar à chamada"</string>
@@ -2544,12 +2553,12 @@
       <item quantity="other">Confiar ou remover os certificados</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="1489335297837656666">
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> instalou uma autoridade de certificação no seu dispositivo que pode permitir monitorizar a atividade na rede do dispositivo, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca deste certificado, contacte o administrador.</item>
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação no seu dispositivo que podem permitir monitorizar a atividade na rede do dispositivo, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca destes certificados, contacte o administrador.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> instalou uma autoridade de certificação no seu dispositivo que pode permitir monitorizar a atividade na rede do dispositivo, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca deste certificado, contacte o gestor.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação no seu dispositivo que podem permitir monitorizar a atividade na rede do dispositivo, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca destes certificados, contacte o gestor.</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="30645643499556573">
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> instalou uma autoridade de certificação para o seu perfil de trabalho que pode permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca deste certificado, contacte o administrador.</item>
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação para o seu perfil de trabalho que podem permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca destes certificados, contacte o administrador.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> instalou uma autoridade de certificação para o seu perfil de trabalho que pode permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca deste certificado, contacte o gestor.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação para o seu perfil de trabalho que podem permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca destes certificados, contacte o gestor.</item>
     </plurals>
     <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"A sua atividade de rede, incluindo emails, aplicações e Sites seguros, pode ser monitorizada por terceiros.\n\nIsto é possível através de uma credencial fidedigna instalada no seu dispositivo."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="2426799352517325228">
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Gestor de chamadas"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Transmissões de emergência"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Alertas de emergência"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Operadores de rede"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Nomes dos pontos de acesso"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Modo 4G LTE avançado"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Cartão SIM preferido para"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Perguntar sempre"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"A seleção é necessária"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Seleção de SIM"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Definições"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="one">Mostrar %d item oculto</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificações de aplicações"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoria de notificações"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importância"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Permitir que a aplicação decida"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Permitir som"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nunca mostrar notificações"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Sem interrupção sonora ou visual"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Sem som"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Emitir som"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Emitir som e aparecer no ecrã"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Aparecer no ecrã"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Baixa"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Média"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Alta"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgente"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Permitir som"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Não emitir som, vibrar, nem mostrar estas notificações no ecrã atual."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Permitir interrupções"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Permitir que a aplicação emita som, vibre e/ou apresente notificações no ecrã"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Importância baixa"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Importância média"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Importância alta"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip picture in"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Imagem na imagem"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Permitir imagem na imagem"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Permita que esta aplicação crie uma janela de imagem na imagem enquanto a aplicação está aberta ou depois de sair da mesma (por exemplo, para continuar a ver um vídeo). Esta janela é apresentada sobre as outras aplicações que estiver a utilizar."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Permita que esta aplicação crie uma janela de ecrã no ecrã enquanto a aplicação está aberta ou depois de sair da mesma (por exemplo, para continuar a ver um vídeo). Esta janela é apresentada sobre as outras aplicações que estiver a utilizar."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acesso Não incomodar"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nenhuma aplicação instalada solicitou acesso Não incomodar"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"A carregar aplicações..."</string>
@@ -3042,7 +3053,7 @@
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Quando o ecrã está ligado ou desligado"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Definições de notificações"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar comentários do dispositivo"</string>
-    <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Introduzir o PIN do administrador"</string>
+    <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Introduzir o PIN do gestor"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Ativado"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Desativado"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Fixação do ecrã"</string>
@@ -3203,9 +3214,9 @@
     <string name="additional_permissions" msgid="6463784193877056080">"Autorizações adicionais"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Mais <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="share_remote_bugreport_dialog_title" msgid="1124840737776588602">"Pretende partilhar o relatório de erro?"</string>
-    <string name="share_remote_bugreport_dialog_message_finished" msgid="4973886976504823801">"O seu administrador de TI solicitou um relatório de erro para ajudar na resolução de problemas deste dispositivo. As aplicações e os dados podem ser partilhados."</string>
-    <string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"O seu administrador de TI solicitou um relatório de erro para ajudar na resolução de problemas deste dispositivo. As aplicações e os dados podem ser partilhados e o dispositivo pode tornar-se temporariamente mais lento."</string>
-    <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"Este relatório de erro está a ser partilhado com o seu administrador de TI. Contacte-o para obter mais detalhes."</string>
+    <string name="share_remote_bugreport_dialog_message_finished" msgid="4973886976504823801">"O seu gestor de TI solicitou um relatório de erro para ajudar na resolução de problemas deste dispositivo. As aplicações e os dados podem ser partilhados."</string>
+    <string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"O seu gestor de TI solicitou um relatório de erro para ajudar na resolução de problemas deste dispositivo. As aplicações e os dados podem ser partilhados e o dispositivo pode tornar-se temporariamente mais lento."</string>
+    <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"Este relatório de erro está a ser partilhado com o seu gestor de TI. Contacte-o para obter mais detalhes."</string>
     <string name="share_remote_bugreport_action" msgid="532226159318779397">"Partilhar"</string>
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"Recusar"</string>
     <string name="usb_use_charging_only" msgid="2180443097365214467">"Carregar este dispositivo"</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transferir ficheiros"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transferir fotos (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Utilizar o dispositivo como MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Espelhamento de SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Verificação em segundo plano"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Acesso completo em segundo plano"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Utilizar o texto do ecrã"</string>
@@ -3266,7 +3278,7 @@
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Recomendado para aumentar a duração da bateria"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Permitir que <xliff:g id="APP">%s</xliff:g> ignore as otimizações da bateria?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Nenhuma"</string>
-    <string name="work_profile_usage_access_warning" msgid="2918050775124911939">"Se desativar o acesso de utilização desta aplicação, não impede que o administrador monitorize a utilização de dados de aplicações no seu perfil de trabalho."</string>
+    <string name="work_profile_usage_access_warning" msgid="2918050775124911939">"Se desativar o acesso de utilização desta aplicação, não impede que o gestor monitorize a utilização de dados de aplicações no seu perfil de trabalho."</string>
     <string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"<xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g> carateres utilizados"</string>
     <string name="draw_overlay" msgid="6564116025404257047">"Sobrepor a outras aplicações"</string>
     <string name="system_alert_window_settings" msgid="8466613169103527868">"Sobrepor a outras aplicações"</string>
@@ -3345,11 +3357,11 @@
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Os SMS não são permitidos"</string>
     <string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"A câmara não é permitida"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"A captura de ecrã não é permitida"</string>
-    <string name="default_admin_support_msg" msgid="2853684309779513863">"Esta ação está desativada. Para saber mais, contacte o administrador da sua entidade."</string>
+    <string name="default_admin_support_msg" msgid="2853684309779513863">"Esta ação está desativada. Para saber mais, contacte o gestor da sua entidade."</string>
     <string name="admin_support_more_info" msgid="8901377038510512654">"Mais detalhes"</string>
-    <string name="admin_profile_owner_message" msgid="5860816886981109626">"O administrador pode monitorizar e gerir as aplicações e os dados associados ao seu perfil de trabalho, incluindo as definições, as autorizações, o acesso empresarial, a atividade da rede e as informações de localização do dispositivo."</string>
-    <string name="admin_profile_owner_user_message" msgid="3842630535450382172">"O administrador pode monitorizar e gerir as aplicações e os dados associados a este utilizador, incluindo as definições, as autorizações, o acesso empresarial, a atividade da rede e as informações de localização do dispositivo."</string>
-    <string name="admin_device_owner_message" msgid="6232893638259790789">"O administrador pode monitorizar e gerir as aplicações e os dados associados a este dispositivo, incluindo as definições, as autorizações, o acesso empresarial, a atividade da rede e as informações de localização do dispositivo."</string>
+    <string name="admin_profile_owner_message" msgid="5860816886981109626">"O gestor pode monitorizar e gerir as aplicações e os dados associados ao seu perfil de trabalho, incluindo as definições, as autorizações, o acesso empresarial, a atividade da rede e as informações de localização do dispositivo."</string>
+    <string name="admin_profile_owner_user_message" msgid="3842630535450382172">"O gestor pode monitorizar e gerir as aplicações e os dados associados a este utilizador, incluindo as definições, as autorizações, o acesso empresarial, a atividade da rede e as informações de localização do dispositivo."</string>
+    <string name="admin_device_owner_message" msgid="6232893638259790789">"O gestor pode monitorizar e gerir as aplicações e os dados associados a este dispositivo, incluindo as definições, as autorizações, o acesso empresarial, a atividade da rede e as informações de localização do dispositivo."</string>
     <string name="condition_turn_off" msgid="1960945836880080298">"Desativar"</string>
     <string name="condition_turn_on" msgid="9089876276117874591">"Ativar"</string>
     <string name="condition_expand_show" msgid="608202020023489939">"Mostrar"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Definir o horário da Luz noturna"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Dar uma tonalidade âmbar ao ecrã para o ajudar a adormecer"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"A Luz noturna está ativada"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"O ecrã ficou com uma tonalidade âmbar. Isto pode ajudá-lo a adormecer."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Sugestões"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilizar cores de visualização mais frias"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar uma alteração de cor, desligue o ecrã"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Para aplicar a alteração ao Monitor de telefonia, reinicie o dispositivo"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Câmara HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Para aplicar a alteração da Câmara HAL HDR+, reinicie o dispositivo."</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor de laser da câmara"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Atualizações do sistema automáticas"</string>
     <string name="usage" msgid="2977875522080448986">"Utilização"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Utilização de dados móveis"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Aviso de dados"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Definir limite de dados"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limite de dados"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> utilizado(s) entre <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> utilizado(s) entre <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configurar"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Outras aplicações incluídas na utilização"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Limpar e converter"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Repor o limite de taxa do ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"O limite de taxa do ShortcutManager foi reposto"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlar notific. do ecrã de bloqueio"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Controlar as informações no 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="8483187649355540109">"Apoio técnico e sugestões"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Nenhuma aplicação instalada solicitou acesso a SMS premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"O serviço de SMS premium pode custar dinheiro e, nesse caso, será adicionado às faturas do seu operador. Se ativar a autorização para uma aplicação, poderá enviar SMS premium através da mesma."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Acesso a SMS premium"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Não visível para outros dispositivos"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Desativado"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Ligado a <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Ligado a vários dispositivos"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Modo de demonstração da IU do sistema"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Aplicações instantâneas"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Abrir links nas aplicações, mesmo que não estejam instaladas"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Aplicações instantâneas"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Conta de aplicações instantâneas"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Preferências das Aplicações instantâneas"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplicações instaladas"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"O seu armazenamento está agora a ser gerido pelo gestor de armazenamento"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Contas de <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3605,9 +3622,9 @@
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Informações do dispositivo gerido"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Alterações e definições geridas pela sua entidade"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Alterações e definições geridas pela <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
-    <string name="enterprise_privacy_header" msgid="7402406406883832509">"Para fornecer acesso aos seus dados de trabalho, a sua entidade pode alterar definições e instalar software no seu dispositivo.\n\nPara obter mais detalhes, contacte o administrador da sua entidade."</string>
+    <string name="enterprise_privacy_header" msgid="7402406406883832509">"Para fornecer acesso aos seus dados de trabalho, a sua entidade pode alterar definições e instalar software no seu dispositivo.\n\nPara obter mais detalhes, contacte o gestor da sua entidade."</string>
     <string name="enterprise_privacy_exposure_category" msgid="7313392680107938517">"Tipos de informação que a sua entidade pode ver"</string>
-    <string name="enterprise_privacy_exposure_changes_category" msgid="9079283547182933771">"Alterações efetuadas pelo administrador da sua entidade"</string>
+    <string name="enterprise_privacy_exposure_changes_category" msgid="9079283547182933771">"Alterações efetuadas pelo gestor da sua entidade"</string>
     <string name="enterprise_privacy_device_access_category" msgid="5423434164248819058">"O seu acesso a este dispositivo"</string>
     <string name="enterprise_privacy_enterprise_data" msgid="2773968662865848413">"Os dados associados à sua conta de trabalho, como o email e o calendário"</string>
     <string name="enterprise_privacy_installed_packages" msgid="2313698828178764590">"Lista de aplicações no seu dispositivo"</string>
@@ -3636,13 +3653,15 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"A opção VPN sempre ligada está ativada no seu perfil pessoal"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"A opção VPN sempre ligada está ativada no seu perfil de trabalho"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy HTTP global definido"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Credenciais fidedignas"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Credenciais fidedignas"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Credenciais fidedignas no seu perfil pessoal"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Credenciais fidedignas no seu perfil de trabalho"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">No mínimo, <xliff:g id="COUNT_0">%d</xliff:g> certificado da AC</item>
       <item quantity="other">No mínimo, <xliff:g id="COUNT_1">%d</xliff:g> certificados da AC</item>
     </plurals>
-    <string name="enterprise_privacy_lock_device" msgid="8791656477097208540">"O administrador pode bloquear o dispositivo e repor a palavra-passe"</string>
-    <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"O administrador pode eliminar todos os dados do dispositivo"</string>
+    <string name="enterprise_privacy_lock_device" msgid="8791656477097208540">"O gestor pode bloquear o dispositivo e repor a palavra-passe"</string>
+    <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"O gestor pode eliminar todos os dados do dispositivo"</string>
     <string name="enterprise_privacy_failed_password_wipe_device" msgid="1001255609345002878">"Tentativas de introdução da palavra-passe falhadas antes da eliminação de todos os dados do dispositivo"</string>
     <string name="enterprise_privacy_failed_password_wipe_work" msgid="4040565826652951057">"Tentativas de introdução da palavra-passe falhadas antes da eliminação de todos os dados do perfil de trabalho"</string>
     <plurals name="enterprise_privacy_number_failed_password_wipe" formatted="false" msgid="5279099270351036696">
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informações de fornecimento do operador"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Acionar fornecimento do operador"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Quais são as grandes novidades?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Conhecer as 5 principais funcionalidades"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Faça uma visita guiada ao seu novo telemóvel"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Faça uma visita guiada ao seu novo tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Faça uma visita guiada ao seu novo dispositivo"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Esta funcionalidade não está disponível neste dispositivo."</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Estado do registo IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Registado"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Não registado"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 12e0172..36ab353 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s deseja acessar suas mensagens. Conceder acesso a %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitação de acesso ao cartão SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"O <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> deseja acessar seu cartão SIM. A concessão de acesso ao cartão SIM desativará a conectividade de dados no seu dispositivo durante a conexão. Conceda acesso ao <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visível como \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' para outros dispositivos"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visível como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para outros dispositivos"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Seus dispositivos"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Parear novo dispositivo"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data e hora"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Próxima"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Pular impressão digital?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"A configuração da impressão digital leva apenas um ou dois minutos. Se você pular essa etapa, poderá adicionar sua impressão digital mais tarde nas configurações."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Pular bloqueio de tela?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este tablet se ele for perdido, roubado ou redefinido."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este dispositivo se ele for perdido, roubado ou redefinido."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este smartphone se ele for perdido, roubado ou redefinido."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Você adicionou o número máximo de impressões digitais"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Não é possível adicionar mais impressões digitais"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Remover todas as impressões digitais?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Remover \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\""</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Deseja excluir esta impressão digital?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Você não poderá usar suas impressões digitais para desbloquear o smartphone, autorizar compras ou fazer login em apps."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Você não poderá usar suas impressões digitais para desbloquear seu perfil de trabalho, autorizar compras ou fazer login em apps de trabalho."</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Sim, remover"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Proteger o tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Proteger o dispositivo"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Proteger o smartphone"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Para aumentar a segurança, configure um bloqueio de tela alternativo."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Para aumentar a segurança, configure um bloqueio de tela alternativo."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Para impedir que outras pessoas usem este tablet sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Para impedir que outras pessoas usem este dispositivo sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Para impedir que outras pessoas usem este smartphone sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
@@ -497,35 +502,35 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Remover proteção do dispositivo?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Remover proteção de perfil?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Os recursos de proteção do dispositivo não funcionarão sem seu padrão."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Os recursos de proteção do dispositivo não funcionarão sem seu padrão.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Os recursos de proteção do dispositivo não funcionarão sem seu padrão.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Suas impressões digitais também serão removidas deste dispositivo e não será possível desbloquear o smartphone, autorizar compras ou fazer login em apps com elas.\""</string>
+</xliff:g>Suas impressões digitais salvas também serão removidas deste dispositivo e não será possível desbloquear o smartphone, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Os recursos de proteção do dispositivo não funcionarão sem seu PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Os recursos de proteção do dispositivo não funcionarão sem seu PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Os recursos de proteção do dispositivo não funcionarão sem seu PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Suas impressões digitais também serão removidas deste dispositivo e não será possível desbloquear o smartphone, autorizar compras ou fazer login em apps com elas.\""</string>
+</xliff:g>Suas impressões digitais salvas também serão removidas deste dispositivo e não será possível desbloquear o smartphone, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Os recursos de proteção do dispositivo não funcionarão sem sua senha."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Os recursos de proteção do dispositivo não funcionarão sem sua senha.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Os recursos de proteção do dispositivo não funcionarão sem sua senha.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Suas impressões digitais também serão removidas deste dispositivo e não será possível desbloquear o smartphone, autorizar compras ou fazer login em apps com elas.\""</string>
+</xliff:g>Suas impressões digitais salvas também serão removidas deste dispositivo e não será possível desbloquear o smartphone, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Os recursos de proteção do dispositivo não funcionarão sem seu bloqueio de tela."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Os recursos de proteção do dispositivo não funcionarão sem seu bloqueio de tela.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Os recursos de proteção do dispositivo não funcionarão sem seu bloqueio de tela.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Suas impressões digitais também serão removidas deste dispositivo e não será possível desbloquear o smartphone, autorizar compras ou fazer login em apps com elas.\""</string>
+</xliff:g>Suas impressões digitais salvas também serão removidas deste dispositivo e não será possível desbloquear o smartphone, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Os recursos de proteção de perfil não funcionam sem seu padrão."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Os recursos de proteção de perfil não funcionam sem seu padrão.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Os recursos de proteção de perfil não funcionarão sem seu padrão.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Suas impressões digitais salvas também serão removidas deste perfil e não será possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Os recursos de proteção de perfil não funcionam sem seu PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Os recursos de proteção de perfil não funcionam sem seu PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Os recursos de proteção de perfil não funcionarão sem seu PIN.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Suas impressões digitais salvas também serão removidas deste perfil e não será possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Os recursos de proteção de perfil não funcionam sem sua senha."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Os recursos de proteção de perfil não funcionam sem sua senha.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Os recursos de proteção de perfil não funcionarão sem sua senha.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Suas impressões digitais salvas também serão removidas deste perfil e não será possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Os recursos de proteção de perfil não funcionarão sem seu bloqueio de tela."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Os recursos de proteção de perfil não funcionam sem seu bloqueio de tela.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Os recursos de proteção de perfil não funcionarão sem seu bloqueio de tela.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Suas impressões digitais salvas também serão removidas deste perfil e não será possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Sim, remover"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Não é permitido usar uma sequência de dígitos em ordem crescente, decrescente ou repetidos"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancelar"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Limpar"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancelar"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Avançar"</string>
     <string name="lock_setup" msgid="3355847066343753943">"A configuração foi concluída."</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponível"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponível)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Insira a senha da rede"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Rede Wi‑Fi de operadora"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Conecte-se via <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para aumentar a precisão da localização e outras finalidades, <xliff:g id="APP_NAME">%1$s</xliff:g> quer ativar a verificação de rede, mesmo que o Wi-Fi esteja desligado.\n\nPermitir isto para todos os apps que quiserem verificar?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Para desativar esta opção, vá para \"Avançado\" no menu flutuante."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Falha ao conectar à rede"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Esquecer"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modificar"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Falha ao esquecer a rede"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Salvar"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Falha ao salvar a rede"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi avançado"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Endereço MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Endereço IP"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Informações da rede"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Máscara de sub-rede"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Endereços IPv6"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Cancelar convite?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Deseja cancelar o convite para se conectar com <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Esquecer este grupo?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Ponto de acesso Wi-Fi portátil"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Ponto de acesso Wi-Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Não está compartilhando a Internet ou conteúdo com outros dispositivos"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Compartilhando a conexão de Internet deste tablet via ponto de acesso"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Compartilhando a conexão de Internet deste smartphone via ponto de acesso"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"O app está compartilhando conteúdo. Para compartilhar a conexão com a Internet, desative e ative o ponto de acesso."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nome do Wi-Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Nome do ponto de acesso"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Ativando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Outros dispositivos podem se conectar a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Senha do Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Senha do ponto de acesso"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda de AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Use o ponto de acesso para criar uma rede Wi‑Fi para outros dispositivos. O ponto de acesso fornece Internet usando sua conexão de dados móveis. Pode haver cobrança adicional para dados móveis."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Os apps podem criar um ponto de acesso para compartilhamento de conteúdo com dispositivos nas proximidades."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Endereço usado como sua localização pelos serviços de emergência se você fizer uma chamada de emergência usando o Wi‑Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Tela"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Som"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Pesquisar"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Gerenciar configurações e histórico de pesquisa"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nenhum resultado"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Limpar histórico"</string>
     <string name="display_settings" msgid="7965901687241669598">"Tela"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Girar tela automaticamente"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Cores vívidas"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Restaurando as configurações APN padrão."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Redefinir para o padrão"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Redefinição das configurações padrão do APN concluída."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Redefinir"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Redefinir rede"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Redefinir opções"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"A rede, os apps ou o dispositivo podem ser redefinidos"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Redefinir Wi-Fi, rede móvel e Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Isso redefinirá todas as configurações de rede, inclusive:\n\n"<li>"Wi‑Fi"</li>\n<li>"dados móveis"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Redefinir configurações"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Redefinir todas as configurações de rede? Não é possível desfazer esta ação."</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Redefinir?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"A redefinição da rede não está disponível para esse usuário"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"As configurações de rede foram redefinidas"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Configuração original"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> conta será redefinida</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> contas serão redefinidas</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"O armazenamento interno e todos os dados serão redefinidos"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Limpar todos os dados (redefinição para configuração original)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" do seu tablet, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps transferidos"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" de seu smartphone, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps transferidos"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"No momento você está conectado às seguintes contas:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informações de segurança"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Você não tem uma conexão de dados. Para visualizar estas informações agora, acesse %s em qualquer computador conectado à Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Carregando..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Escolha a sua senha"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Definir um bloqueio de tela"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Por segurança, defina uma senha"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Para usar a impressão digital, defina uma senha"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Escolha seu padrão"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Para usar a impressão digital, defina um padrão"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Escolha o seu PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Por segurança, defina um PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Para usar a impressão digital, defina um PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirme sua senha"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Digite sua senha novamente"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirme seu padrão"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirme o seu PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Digite seu PIN novamente"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"As senhas não correspondem"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Os PINs não correspondem"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Selecionar desbloqueio"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Use seu padrão de trabalho para continuar"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Digite seu PIN de trabalho para continuar"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Digite sua senha de trabalho para continuar"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Para continuar, use o padrão do dispositivo, que é solicitado depois que o dispositivo é reiniciado."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Para continuar, digite o PIN do dispositivo, que é solicitado depois que o dispositivo é reiniciado."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Para continuar, digite a senha do dispositivo, que é solicitada depois que ele é reiniciado."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Para continuar, use seu padrão de trabalho, que é solicitado depois que o dispositivo é reiniciado."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Para continuar, digite seu PIN de trabalho, que é solicitado depois que o dispositivo é reiniciado."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Para continuar, digite a senha de trabalho, que é solicitada depois que o dispositivo é reiniciado."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Para aumentar a segurança, use o padrão do dispositivo"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Para aumentar a segurança, digite o PIN do dispositivo"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Para aumentar a segurança, digite a senha do dispositivo."</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Para aumentar a segurança, use o padrão de trabalho"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Para aumentar a segurança, digite o PIN de trabalho"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Para aumentar a segurança, digite a senha de trabalho"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Seu smartphone foi redefinido para a configuração original. Para usá-lo, digite seu padrão anterior."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Seu smartphone foi redefinido para a configuração original. Para usá-lo, digite seu PIN anterior."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Seu smartphone foi redefinido para a configuração original. Para usá-lo, digite sua senha anterior."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verificar padrão"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verificar PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verificar senha"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN incorreto"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Senha incorreta"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Padrão incorreto"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Criar widget e permitir acesso?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Após a criação do widget, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> poderá acessar todos os dados exibidos."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Sempre permitir que <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> crie widgets e acesse os dados"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Estatísticas de uso"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Estatísticas de uso"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Classificar por:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Controles de interação, leitores de tela, exibição"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Configuração visual"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"É possível personalizar este dispositivo para atender às suas necessidades. Esses recursos de acessibilidade podem ser alterados posteriormente em \"Configurar\"."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Aumentar tamanho da fonte"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Alterar tamanho da fonte"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Leitores de tela"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Áudio e texto na tela"</string>
     <string name="display_category_title" msgid="685461049938269166">"Tela"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Para aplicar zoom"</b>", toque três vezes na tela rapidamente.\n"<ul><li>"Arraste dois ou mais dedos para rolar"</li>\n<li>"Faça um gesto de pinça com dois ou mais dedos para ajustar o zoom"</li></ul>\n\n<b>"Para aplicar zoom temporariamente"</b>", toque rapidamente na tela três vezes e mantenha o dedo pressionado no terceiro toque.\n"<ul><li>"Arraste para mover pela tela"</li>\n<li>"Levante o dedo para diminuir o zoom"</li></ul>\n\n"Não é possível aumentar o zoom no teclado e na barra de navegação."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Se a ampliação estiver ativada, use o botão Acessibilidade localizado na parte inferior da tela para ampliar rapidamente.\n\n"<b>"Para aplicar zoom"</b>", toque no botão Acessibilidade e toque em qualquer ponto da tela.\n"<ul><li>"Arraste dois dedos ou mais para rolar"</li>\n<li>"Faça um gesto de pinça com dois ou mais dedos para ajustar o zoom"</li></ul>\n\n<b>"Para aplicar zoom temporariamente"</b>", toque no botão Acessibilidade e toque e mantenha pressionado qualquer ponto na tela.\n"<ul><li>"Arraste para mover pela tela"</li>\n<li>"Levante o dedo para diminuir o zoom"</li></ul>\n\n"Não é possível aumentar o zoom no teclado ou na barra de navegação."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"O botão Acessibilidade está definido para <xliff:g id="SERVICE">%1$s</xliff:g>. Para usar a ampliação, toque nesse botão, mantenha-o pressionado e selecione a ampliação."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Atalho de acessibilidade"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Atalho da tecla de volume"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Serviço de atalho"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Permitir na tela de bloqueio"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Se o atalho estiver ativado, pressione ambos os botões de volume por três segundos para iniciar um recurso de acessibilidade."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Quando o atalho estiver ativado, pressione ambos os botões de volume por três segundos para iniciar um recurso de acessibilidade."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Texto em alto contraste"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Atual. autom. da ampliação da tela"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Atualiz. ampliação da tela em transições de aplic."</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Pode afetar o desempenho"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clicar após parada do ponteiro"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Atraso antes do clique"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ATIVAR"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESATIVAR"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Mostrar em \"Configurações rápidas\""</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"selecionados <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Selecionar tudo"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Gerenciar planos"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de dados"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Dados uso de apps"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"O cálculo da operadora poderá ser diferente de seu dispositivo."</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Redes móveis"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Redes Wi-Fi limitadas"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Para selecionar redes limitadas, ative o Wi-Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automático"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Limitada"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Ilimitada"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"O cálculo da operadora poderá ser diferente de seu dispositivo."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Chamada de emergência"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Retornar à chamada"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Gerenciador de chamadas"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Transmissões de emergência"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Alertas de emergência"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Operadores de rede"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Nomes dos pontos de acesso"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Modo 4G LTE avançado"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"SIM preferido para"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Perguntar sempre"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Seleção necessária"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Seleção de SIM"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Configurações"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="one">Mostrar %d item oculto</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificações de apps"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoria da notificação"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importância"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Deixar o app decidir"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Permitir som"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nunca mostrar notificações"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Sem som ou interrupção visual"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Sem som"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Emitir som"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Emitir som e exibir na tela"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Exibir na tela"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Baixa"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Média"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Alta"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgente"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Permitir som"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Não emitir som, vibrar ou mostrar parcialmente essas notificações na tela atual."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Permitir interrupções"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Permitir que o app emita um som, vibre e/ou mostre notificações na tela"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Importância baixa"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Importância média"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Importância elevada"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip picture in"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Permitir picture-in-picture"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Permite que esse app crie uma janela picture-in-picture enquanto o app é aberto ou depois que você sai dele (por exemplo, para continuar a assistir um vídeo). Essa janela é sobreposta a outros apps que você está usando."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Permite que esse app crie uma janela picture-in-picture enquanto o app é aberto ou depois que você sai dele (por exemplo, para continuar a assistir um vídeo). Essa janela é sobreposta a outros apps que você está usando."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acesso \"Não perturbe\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nenhum app instalado solicitou o acesso \"Não perturbe\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Carregando apps…"</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transferência de arquivos"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transferência de fotos (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Uso do dispositivo como MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Espelhamento de SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Verificação em segundo plano"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Acesso completo ao segundo plano"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Usar texto da tela"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Definir programação do Modo noturno"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Tingir tela de âmbar p/ ajudar você a pegar no sono"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"O modo noturno está ativado"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"A cor da tela muda para âmbar. Isso pode ajudar você a adormecer."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Sugestões"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Usar cores de tela mais frias"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar a alteração de cor, desative a tela"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Para que a alteração do monitor de telefonia seja aplicada, reinicialize o dispositivo"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HDR+ da câmera HAL"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Para aplicar a alteração ao HDR+ da câmera HAL, reinicialize o dispositivo"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor a laser da câmera"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Atualizações automáticas do sistema"</string>
     <string name="usage" msgid="2977875522080448986">"Utilização"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Uso de dados móveis"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Aviso de dados"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Definir limite de dados"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limite de dados"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> usado(s) entre <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> usado(s) entre <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configurar"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Outros apps inclusos no uso"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Limpar e converter…"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Redefinir limite de taxa do ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"O limite de taxa do ShortcutManager foi redefinido"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Notificações da tela de bloqueio"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Controlar informações na 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="8483187649355540109">"Suporte e dicas"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Nenhum app instalado solicitou acesso a SMS premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"O SMS premium pode gerar custos e será adicionado ao faturamento da sua operadora. Se você conceder permissão para um app, será possível enviar SMS premium usando esse app."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Acesso a SMS premium"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Não visível para outros dispositivos"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Desativado"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Conectado a <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Conectado a vários dispositivos"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Modo de demonstração da IU do sistema"</string>
@@ -3535,7 +3552,7 @@
     <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>
+    <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"Telefone"</string>
     <string name="bluetooth_talkback_imaging" msgid="551146170554589119">"Imagem"</string>
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Headphone"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Periférico de entrada"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Apps instantâneos"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Abrir links em apps, mesmo que eles não estejam instalados"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Apps instantâneos"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Conta de apps instantâneos"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Preferências de Instant Apps"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Apps instalados"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Seu armazenamento está sendo controlado pelo gerenciador de armazenamento"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Contas de <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"\"VPN sempre ativa\" ativada no seu perfil pessoal"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"\"VPN sempre ativa\" ativada no seu perfil de trabalho"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy HTTP geral definido"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Credenciais confiáveis"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Credenciais confiáveis"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Credenciais confiáveis no seu perfil pessoal"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Credenciais confiáveis no seu perfil de trabalho"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">No mínimo <xliff:g id="COUNT_1">%d</xliff:g> certificado de CA</item>
       <item quantity="other">No mínimo <xliff:g id="COUNT_1">%d</xliff:g> certificados de CA</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informações de aprovisionamento da operadora"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Acionar aprovisionamento da operadora"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"O que há de novo e empolgante?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Confira os cinco melhores recursos"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Faça um tour pelo seu novo smartphone"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Faça um tour pelo seu novo tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Faça um tour pelo seu novo dispositivo"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Este recurso não está disponível neste dispositivo"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Estado do registro de IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrado"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Não registrado"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 804e224..b906772 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -167,7 +167,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s dorește să acceseze mesajele dvs. Oferiți acces pentru %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitare de acces la SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> dorește să acceseze cardul SIM. Dacă acordați accesul la cardul SIM, conexiunea de date de pe dispozitiv va fi dezactivată pe durata conectării. Acordați accesul pentru <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Vizibil ca „<xliff:g id="DEVICE_NAME">^1</xliff:g>” pentru alte dispozitive"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Vizibil ca „<xliff:g id="DEVICE_NAME">^1</xliff:g>” pentru alte dispozitive"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Dispozitivele dvs."</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Asociați un nou dispozitiv"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data și ora"</string>
@@ -375,6 +375,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Înainte"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Omiteți amprenta?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Setarea amprentei durează doar un minut sau două. Dacă ignorați acest pas acum, puteți adăuga amprenta mai târziu din setări."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Omiteți blocarea ecranului?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Funcțiile de protecție a dispozitivului nu vor fi activate. Nu îi veți putea împiedica pe alții să folosească această tabletă dacă este pierdută, furată sau resetată."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Funcțiile de protecție a dispozitivului nu vor fi activate. Nu îi veți putea împiedica pe alții să folosească acest dispozitiv dacă este pierdut, furat sau resetat."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Funcțiile de protecție a dispozitivului nu vor fi activate. Nu îi veți putea împiedica pe alții să folosească acest telefon dacă este pierdut, furat sau resetat."</string>
@@ -414,6 +417,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Ați adăugat numărul maxim de amprente digitale"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Nu se mai pot adăuga amprente digitale"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Eliminați toate amprentele?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Eliminați „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>”"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Doriți să ștergeți această amprentă?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Nu veți putea folosi amprentele digitale ca să deblocați telefonul, să autorizați achiziții sau să vă conectați la aplicații"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Nu vă veți putea folosi amprentele digitale ca să deblocați profilul de serviciu, să autorizați achiziții sau să vă conectați la aplicațiile de serviciu"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Da, eliminați"</string>
@@ -458,7 +463,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protejați tableta"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protejați dispozitivul"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protejați telefonul"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Pentru mai multă siguranță, configurați o blocare a ecranului de rezervă."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Pentru mai multă siguranță, configurați o blocare a ecranului de rezervă."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activați funcțiile de protecție a dispozitivului pentru a împiedica alte persoane să folosească această tabletă fără permisiunea dvs. Alegeți blocarea ecranului pe care doriți să o folosiți."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activați funcțiile de protecție a dispozitivului pentru a împiedica alte persoane să folosească acest dispozitiv fără permisiunea dvs. Alegeți blocarea ecranului pe care doriți să o folosiți."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activați funcțiile de protecție a dispozitivului pentru a împiedica alte persoane să folosească acest telefon fără permisiunea dvs. Alegeți blocarea ecranului pe care doriți să o folosiți."</string>
@@ -500,35 +505,35 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Eliminați protecția dispozitivului?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Eliminați protecția profilului?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Funcțiile de protecție a dispozitivului nu vor funcționa fără model."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Funcțiile de protecție a dispozitivului nu vor funcționa fără model.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Funcțiile de protecție a dispozitivului nu vor funcționa fără model.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>De asemenea, amprentele salvate vor fi eliminate de pe acest dispozitiv și nu le veți putea folosi ca să vă deblocați telefonul, să autorizați achiziții sau să vă conectați la aplicații."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Funcțiile de protecție a dispozitivului nu vor funcționa fără codul PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Funcțiile de protecție a dispozitivului nu vor funcționa fără codul PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Funcțiile de protecție a dispozitivului nu vor funcționa fără codul PIN.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>De asemenea, amprentele salvate vor fi eliminate de pe acest dispozitiv și nu le veți putea folosi ca să vă deblocați telefonul, să autorizați achiziții sau să vă conectați la aplicații."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Funcțiile de protecție a dispozitivului nu vor funcționa fără parolă."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Funcțiile de protecție a dispozitivului nu vor funcționa fără parolă.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Funcțiile de protecție a dispozitivului nu vor funcționa fără parolă.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>De asemenea, amprentele salvate vor fi eliminate de pe acest dispozitiv și nu le veți putea folosi ca să vă deblocați telefonul, să autorizați achiziții sau să vă conectați la aplicații."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Funcțiile de protecție a dispozitivului nu vor funcționa fără blocarea ecranului."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Funcțiile de protecție a dispozitivului nu vor funcționa fără blocarea ecranului.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Funcțiile de protecție a dispozitivului nu vor funcționa fără blocarea ecranului.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>De asemenea, amprentele salvate vor fi eliminate de pe acest dispozitiv și nu le veți putea folosi ca să vă deblocați telefonul, să autorizați achiziții sau să vă conectați la aplicații."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Funcțiile de protecție a profilului nu vor funcționa fără model."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Funcțiile de protecție a profilului nu vor funcționa fără model.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Funcțiile de protecție a profilului nu vor funcționa fără model.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>De asemenea, amprentele salvate vor fi eliminate din acest profil și nu le veți putea folosi ca să vă deblocați profilul, să autorizați achiziții sau să vă conectați la aplicații."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Funcțiile de protecție a profilului nu vor funcționa fără codul PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Funcțiile de protecție a profilului nu vor funcționa fără codul PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Funcțiile de protecție a profilului nu vor funcționa fără codul PIN.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>De asemenea, amprentele salvate vor fi eliminate din acest profil și nu le veți putea folosi ca să vă deblocați profilul, să autorizați achiziții sau să vă conectați la aplicații."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Funcțiile de protecție a profilului nu vor funcționa fără parolă."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Funcțiile de protecție a profilului nu vor funcționa fără parolă.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Funcțiile de protecție a profilului nu vor funcționa fără parolă.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>De asemenea, amprentele salvate vor fi eliminate din acest profil și nu le veți putea folosi ca să vă deblocați profilul, să autorizați achiziții sau să vă conectați la aplicații."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Funcțiile de protecție a profilului nu vor funcționa fără blocarea ecranului."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Funcțiile de protecție a profilului nu vor funcționa fără blocarea ecranului.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Funcțiile de protecție a profilului nu vor funcționa fără blocarea ecranului.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>De asemenea, amprentele salvate vor fi eliminate din acest profil și nu le veți putea folosi ca să vă deblocați profilul, să autorizați achiziții sau să vă conectați la aplicații."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Da, eliminați"</string>
@@ -595,6 +600,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Șirurile de cifre ascendente, descendente sau repetate nu sunt permise"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Anulați"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Ștergeți"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Anulați"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Înainte"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Configurarea este completă."</string>
@@ -827,6 +833,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponibil"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponibil)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introduceți parola de rețea"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Rețeaua Wi‑Fi a operatorului"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Conectați-vă prin <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Pentru a îmbunătăți precizia locației, precum și pentru alte scopuri, <xliff:g id="APP_NAME">%1$s</xliff:g> solicită permisiunea să activeze scanarea rețelelor, chiar și atunci când rețeaua Wi-Fi este dezactivată.\n\nPermiteți acest lucru pentru toate aplicațiile care solicită scanarea?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Pentru a dezactiva, accesați Avansat din meniul suplimentar."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permiteți"</string>
@@ -844,6 +852,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Conectați-vă"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nu s-a putut stabili conexiunea la rețea"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Eliminați"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modificați"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Nu s-a putut elimina rețeaua"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Salvați"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Nu s-a putut salva rețeaua"</string>
@@ -857,6 +866,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Setări Wi-Fi avansate"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adresă MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Adresă IP"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Informații despre rețea"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Mască de subrețea"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Adrese IPv6"</string>
@@ -889,16 +899,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Anulați invitația?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Doriți să anulați invitația de conectare cu <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Eliminați acest grup?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Hotspot Wi-Fi portabil"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Hotspot Wi-Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Nu se permite altor dispozitive accesul la conexiunea de internet sau la conținut"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Se permite accesul la conexiunea de internet a tabletei prin hotspot"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Se permite accesul la conexiunea de internet a telefonului prin hotspot"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplicația trimite conținut. Pentru a permite accesul la conexiunea de internet, dezactivați hotspotul, apoi activați-l"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Numele Wi-Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Numele pentru hotspot"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Se activează <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Alte dispozitive se pot conecta la <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Parola rețelei Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Parola pentru hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Folosiți hotspotul pentru a crea o rețea Wi-Fi pentru celelalte dispozitive. Hotspotul oferă o conexiune de internet folosind conexiunea dvs. de date mobile. Este posibil să se aplice taxe suplimentare pentru datele mobile."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplicațiile pot crea un hotspot pentru a trimite conținut dispozitivelor din apropiere."</string>
@@ -950,7 +959,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Adresa folosită de serviciile de urgență drept locația dvs. dacă efectuați un apel de urgență prin Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Afișaj"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sunet"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volume"</string>
@@ -1004,6 +1013,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Căutați"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Gestionați setările și istoricul căutărilor"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Niciun rezultat"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Ștergeți istoricul"</string>
     <string name="display_settings" msgid="7965901687241669598">"Afișaj"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotire automată a ecranului"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Culori vii"</string>
@@ -1337,8 +1347,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Se restabilesc setările APN prestabilite."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Resetați la valorile prestabilite"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Resetarea setărilor APN prestabilite a fost finalizată."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Resetați"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Resetarea setărilor de rețea"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Opțiuni de resetare"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Rețeaua, aplicațiile sau dispozitivul pot fi resetate"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Resetați conexiunea Wi-Fi, conexiunea mobilă și prin Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Astfel, toate setările pentru rețea vor fi reinițializate, inclusiv:\n\n"<li>"Wi‑Fi,"</li>\n<li>"date mobile,"</li>\n<li>"Bluetooth."</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Resetați setările"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Reinițializați toate setările pentru rețea? Nu puteți anula această acțiune!"</string>
@@ -1346,13 +1357,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Resetați?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Resetarea rețelei nu este disponibilă pentru acest utilizator"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Setările pentru rețea au fost reinițializate"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Revenire la setările din fabrică"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="few"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> conturi vor fi resetate</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> de conturi vor fi resetate</item>
-      <item quantity="one">1 cont va fi resetat</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Se vor reseta stocarea internă și toate datele"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Ștergeți toate datele (reveniți la setările din fabrică)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Această acțiune va șterge toate datele din "<b>"stocarea internă"</b>" a tabletei dvs., inclusiv:\n\n"<li>"Contul dvs. Google;"</li>\n<li>"datele și setările sistemului și ale aplicațiilor;"</li>\n<li>"aplicațiile descărcate;"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Această acțiune va șterge toate datele din "<b>"stocarea internă"</b>" a telefonului dvs., inclusiv:\n\n"<li>"Contul dvs. Google;"</li>\n<li>"datele și setările sistemului și ale aplicațiilor;"</li>\n<li>"aplicațiile descărcate;"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"În prezent sunteți conectat(ă) la următoarele conturi:\n"</string>
@@ -1476,15 +1481,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informații privind siguranța"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nu aveți o conexiune de date. Pentru a vedea aceste informații acum, accesați %s de pe orice computer conectat la internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Se încarcă…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Alegeți parola"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Setați o blocare a ecranului"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Din motive de securitate, setați o parolă"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Pentru a utiliza amprenta, setați parola"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Alegeți modelul"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Pentru a utiliza amprenta, setați modelul"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Alegeți codul PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Din motive de securitate, setați un cod PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Pentru a utiliza amprenta, setați codul PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirmați parola"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Reintroduceți parola"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirmați modelul"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirmați codul PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Reintroduceți codul PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Parolele nu corespund"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Codurile PIN nu corespund"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Selectați metoda de deblocare"</string>
@@ -1497,12 +1503,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Pentru a continua, folosiți modelul de serviciu"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Pentru a continua, introduceți codul PIN de serviciu"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Pentru a continua, introduceți parola de serviciu"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Continuați folosind modelul dispozitivului. Este necesar după ce dispozitivul repornește."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Continuați introducând codul PIN al dispozitivului. Este necesar după ce dispozitivul repornește."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Continuați introducând parola dispozitivului. Este necesară după ce dispozitivul repornește."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Continuați folosind modelul de serviciu. Este necesar după ce dispozitivul repornește."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Continuați introducând codul PIN de serviciu. Este necesar după ce dispozitivul repornește."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Continuați introducând parola de serviciu. Este necesară după ce dispozitivul repornește."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Pentru mai multă siguranță, folosiți modelul dispozitivului"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Pentru mai multă siguranță, introduceți codul PIN al dispozitivului"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Pentru mai multă siguranță, introduceți parola dispozitivului"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Pentru mai multă siguranță, folosiți modelul de serviciu"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Pentru mai multă siguranță, introduceți codul PIN de serviciu"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Pentru mai multă siguranță, introduceți parola de serviciu"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"S-a revenit la setările din fabrică ale telefonului. Pentru a-l folosi, formați modelul precedent."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"S-a revenit la setările din fabrică ale telefonului. Pentru a-l folosi, scrieți codul PIN precedent."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"S-a revenit la setările din fabrică ale telefonului. Pentru a-l folosi, scrieți parola precedentă."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Confirmați modelul"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Confirmați codul PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Confirmați parola"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Cod PIN greșit"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Parolă greșită"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Model greșit"</string>
@@ -1806,13 +1818,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Creați widgetul și permiteți accesul?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"După ce creați widgetul, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> poate accesa toate datele pe care acesta le afișează."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Permiteți întotdeauna ca <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> să creeze widgeturi și să acceseze datele acestora"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> z <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> m <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> m <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> sec."</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>z <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Statistici de utilizare"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Statistici de utilizare"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sortați după:"</string>
@@ -1824,7 +1829,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Cititoare de ecran, afișaj, comenzi pentru interacțiune"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Setări pentru vedere"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Puteți personaliza acest dispozitiv conform dorințelor dvs. Aceste funcții de accesibilitate pot fi modificate ulterior în Setări."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Măriți dimensiunea fontului"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Modificați dimensiunea fontului"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Cititoare de ecran"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio și text pe ecran"</string>
     <string name="display_category_title" msgid="685461049938269166">"Afișare"</string>
@@ -1845,10 +1850,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Pentru a mări sau micșora"</b>", atingeți rapid ecranul de 3 ori.\n"<ul><li>"Trageți cu 2 sau mai multe degete pentru a derula"</li>\n<li>"Ciupiți cu 2 sau mai multe degete pentru a ajusta nivelul de zoom"</li></ul>\n\n<b>"Pentru a mări temporar"</b>", atingeți rapid ecranul de 3 ori și țineți apăsat cu degetul la a treia atingere.\n"<ul><li>"Trageți cu degetul pentru a mișca imaginea pe ecran."</li>\n<li>"Ridicați degetul pentru a micșora."</li></ul>\n\n"Nu puteți mări pe tastatură și pe bara de navigare."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Când este activată mărirea, folosiți butonul Accesibilitate din partea de jos a ecranului pentru a mări rapid.\n\n"<b>"Pentru a mări/micșora imaginea"</b>", atingeți butonul Accesibilitate și apoi atingeți orice loc de pe ecran.\n"<ul><li>"Trageți cu 2 sau mai multe degete pentru a derula."</li>\n<li>"Ciupiți cu 2 sau mai multe degete pentru a ajusta nivelul de zoom."</li></ul>\n\n<b>"Pentru a mări temporar"</b>", atingeți butonul Accesibilitate și apoi țineți apăsat orice loc de pe ecran.\n"<ul><li>"Trageți pentru a mișca imaginea pe ecran."</li>\n<li>"Ridicați degetul pentru a micșora la loc."</li></ul>\n\n"Nu puteți mări pe tastatură sau pe bara de navigare."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Butonul Accesibilitate este setat pe <xliff:g id="SERVICE">%1$s</xliff:g>. Pentru a folosi mărirea, atingeți lung butonul Accesibilitate și apoi selectați mărirea."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Comandă rapidă accesibilitate"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Comandă rapidă pentru butoane volum"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Serviciul comenzii rapide"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Permiteți din ecranul de blocare"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Când este activată comanda rapidă, puteți apăsa ambele butoane pentru volum timp de 3 secunde pentru a lansa o funcție de accesibilitate."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Când este activată comanda rapidă, puteți apăsa ambele butoane pentru volum timp de 3 secunde pentru a lansa o funcție de accesibilitate."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Text cu contrast ridicat"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Actualizați auto. mărirea ecranului"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Actualiz. mărirea ecran. la tranziția între aplic."</string>
@@ -1861,7 +1866,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Poate afecta performanța"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clic după ce cursorul a încetat să se mai miște"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Întârziere înainte de clic"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ACTIVAT"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DEZACTIVAT"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Afișați în Setări rapide"</string>
@@ -2380,6 +2384,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"au fost selectate <xliff:g id="NUMBER">%1$d</xliff:g> din <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> din <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Selectați-le pe toate"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Gestionați planurile"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Utilizarea datelor"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Utilizarea datelor aplic."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Datele pot fi contorizate diferit la operator și pe dispozitiv."</string>
@@ -2465,6 +2470,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Rețele mobile"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Rețele Wi‑Fi contorizate"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Pentru a selecta rețelele Wi-Fi contorizate, porniți Wi-Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automat"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Contorizată"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Necontorizată"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Datele pot fi contorizate diferit la operator și pe dispozitiv."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Apel de urgență"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Reveniți la apel"</string>
@@ -2686,7 +2694,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Manager de apeluri"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Transmisiuni de urgență"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Alerte de urgență"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Operatori de rețea"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Numele punctelor de acces"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Mod 4G LTE îmbunătățit"</string>
@@ -2755,6 +2763,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Cartelă SIM preferată pentru"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Întreabă mereu"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Selectați o opțiune"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Selectare SIM"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Setări"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="few">Afișați %d elemente ascunse</item>
@@ -2908,18 +2917,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificări din aplicații"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoria notificării"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importanță"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Permiteți aplicației să decidă"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Permiteți sunetul"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nu afișați niciodată notificările"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Fără sunet sau întrerupere vizuală"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Fără sunet"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Se emite un sunet"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Se emite un sunet și se evidențiază pe ecran"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Evidențiere pe ecran"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Scăzută"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Medie"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Ridicată"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgentă"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Permiteți sunetul"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Sunetul și vibrațiile sunt dezactivate, iar aceste notificări nu se afișează pentru o scurtă durată pe ecranul actual."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Permiteți întreruperi"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Permiteți aplicației să emită sunete, să vibreze și/sau să trimită notificări pe ecran"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Importanță redusă"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Importanță medie"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Importanță ridicată"</string>
@@ -2951,7 +2961,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip picture in"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Permiteți modul picture-in-picture"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Permiteți acestei aplicații să creeze o fereastră picture-in-picture în timp ce aplicația este deschisă sau după ce ieșiți (de exemplu, pentru a continua vizionarea unui videoclip). Această fereastră se afișează peste alte aplicații pe care le folosiți."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Permiteți acestei aplicații să creeze o fereastră picture-in-picture în timp ce aplicația este deschisă sau după ce ieșiți (de exemplu, pentru a continua vizionarea unui videoclip). Această fereastră se afișează peste alte aplicații pe care le folosiți."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acces la funcția Nu deranja"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nicio aplicație instalată nu a solicitat accesul Nu deranja"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Se încarcă aplicațiile..."</string>
@@ -2979,7 +2989,7 @@
     <string name="notification_content_block_title" msgid="5854232570963006360">"Afișați notificările"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nu afișați niciodată notificările în umbră sau pe dispozitive periferice"</string>
     <string name="notification_badge_title" msgid="6370122441168519809">"Permiteți punct de notificare"</string>
-    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Afișați punctul de notificare"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Afișează punctul de notificare"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignoră Nu deranja"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permiteți acestor notificări să vă întrerupă când modul Nu deranja este setat la Numai cu prioritate"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Pe ecranul de blocare"</string>
@@ -3264,6 +3274,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transfer de fișiere"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transferul de fotografii (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Dispozitivul se folosește ca MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Oglindirea SMS-urilor"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Verificare de fundal"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Acces complet la fundal"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Folosește textul de pe ecran"</string>
@@ -3408,6 +3419,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="night_display_suggestion_title" msgid="6602129097059325291">"Setați programul pe Lumină de noapte"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Colorați ecranul chihlimbar pentru a adormi mai ușor"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Lumina de noapte este activată"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Ecranul are o tentă de chihlimbar. Acest lucru vă poate ajuta să adormiți."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Sugestii"</string>
@@ -3428,6 +3441,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Folosiți culori mai reci pentru afișare"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Pentru a aplica modificarea culorilor, dezactivați ecranul"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Pentru a aplica modificarea pentru Telephony Monitor, reporniți dispozitivul"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Camera foto HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Pentru a aplica modificarea Camerei foto HAL HDR+, reporniți dispozitivul"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Senzor laser al camerei foto"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Actualizări automate de sistem"</string>
     <string name="usage" msgid="2977875522080448986">"Utilizare"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Utilizarea datelor mobile"</string>
@@ -3454,7 +3470,7 @@
     <string name="data_warning" msgid="209133958008062117">"Avertisment pentru date"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Setați limita de date"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limită de date"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"Date utilizate în intervalul <xliff:g id="ID_2">%2$s</xliff:g>: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"S-au folosit <xliff:g id="ID_1">%1$s</xliff:g> pe <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configurați"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Alte aplicații incluse în utilizare"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3525,7 +3541,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Ștergeți și convertiți"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Resetați limitarea frecvenței pentru ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Limitarea frecvenței pentru ShortcutManager a fost resetată"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlați notificările pe ecranul de blocare"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Controlați informațiile de 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="8483187649355540109">"Asistență și sfaturi"</string>
@@ -3533,7 +3549,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Nicio aplicație instalată nu a solicitat accesul la SMS-urile premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"SMS-urile premium pot genera costuri care se vor adăuga la factura operatorului. Dacă activați permisiunea pentru o aplicație, veți putea trimite SMS-uri premium folosind acea aplicație."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Acces la SMS-uri premium"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Nu este vizibil pentru alte dispozitive"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Dezactivat"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Conectat la <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Conectat la mai multe dispozitive"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Mod demonstrativ pentru IU sistem"</string>
@@ -3638,7 +3654,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Aplicații instantanee"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Deschideți linkuri în aplicații, chiar dacă acestea nu sunt instalate"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Aplicații instantanee"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Cont de aplicații instantanee"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Preferințe pentru aplicații instantanee"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplicații instalate"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Spațiul de stocare este acum gestionat de managerul spațiului de stocare"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Conturi pentru <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3687,7 +3703,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Rețeaua VPN activată permanent a fost activată în profilul dvs. personal"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Rețeaua VPN activată permanent a fost activată în profilul dvs. de serviciu"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy global HTTP setat"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Acreditări de încredere"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Acreditări de încredere"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Acreditări de încredere în profilul personal"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Acreditări de încredere în profilul de serviciu"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="few">Cel puțin <xliff:g id="COUNT_1">%d</xliff:g> certificate CA</item>
       <item quantity="other">Cel puțin <xliff:g id="COUNT_1">%d</xliff:g> de certificate CA</item>
@@ -3755,7 +3773,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informații despre provizionarea operatorului"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Declanșați provizionarea operatorului"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Ce este nou și interesant?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Încercați cele 5 funcții principale"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Faceți un tur al noului dvs. telefon"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Faceți un tur al noii dvs. tablete"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Faceți un tur al noului dvs. dispozitiv"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Această caracteristică nu este disponibilă pe acest dispozitiv"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Situația înregistrării IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Înregistrat"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Neînregistrat"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 47380c4..e895365 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -168,7 +168,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s хочет получить доступ к вашим сообщениям. Предоставить доступ %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Запрос на доступ к SIM-карте"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Устройство \"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>\" запрашивает доступ к вашей SIM-карте. Если вы его предоставите, будет установлено соединение, на время которого будут отключены все сервисы передачи данных. Открыть доступ устройству \"<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>\""</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Название в списке устройств: <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Название в списке устройств: <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Ваши устройства"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Подключение нового устройства"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Дата и время"</string>
@@ -378,6 +378,9 @@
     <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="1961957425135180242">"Далее"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Не настраивать отпечатки?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Ввод отпечатков пальцев занимает 1–2 минуты. Вы можете добавить их позже через настройки устройства."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Не настраивать блокировку?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Защита устройства не будет активирована. В случае потери или кражи планшета либо сброса его настроек им смогут воспользоваться посторонние."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Защита не будет активирована. В случае потери или кражи устройства либо сброса его настроек им смогут воспользоваться посторонние."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Защита устройства не будет активирована. В случае потери или кражи телефона либо сброса его настроек им смогут воспользоваться посторонние."</string>
@@ -417,6 +420,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Вы уже добавили максимальное количество отпечатков"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Больше нельзя добавить отпечатки пальцев"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Удалить отпечатки пальцев?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Удалить \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\"?"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Удалить отпечаток пальца?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Вы больше не сможете использовать отпечатки пальцев для разблокировки телефона, подтверждения покупок и входа в приложения."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Вы больше не сможете использовать отпечатки пальцев для разблокировки рабочего профиля, подтверждения покупок и входа в рабочие приложения."</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Удалить"</string>
@@ -461,7 +466,7 @@
     <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="5585650064305600578">"Для более надежной защиты настройте дополнительный способ блокировки экрана."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Для более надежной защиты настройте дополнительный способ блокировки экрана."</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>
@@ -503,35 +508,35 @@
     <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_fingerprint" msgid="8212242533942400457">"Без графического ключа не будет работать защита устройства.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Без графического ключа защита устройства работать не будет.<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_fingerprint" msgid="875669051899437197">"Без PIN-кода не будет работать защита устройства.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Без 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_fingerprint" msgid="2228159168587170445">"Без пароля не будет работать защита устройства.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Без пароля защита устройства работать не будет.<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_fingerprint" msgid="6363091330281670692">"Без блокировки экрана не будет работать защита устройства.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Без блокировки экрана защита устройства работать не будет.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Сохраненные отпечатки пальцев будут удалены, поэтому вы больше не сможете снимать блокировку, совершать покупки и входить в приложения с их помощью."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Без графического ключа защита профиля работать не будет."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Без графического ключа защита профиля работать не будет.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Без графического ключа защита профиля работать не будет.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сохраненные отпечатки пальцев также будут удалены: вы больше не сможете снимать блокировку, совершать покупки и входить в приложения с их помощью."</string>
+</xliff:g>Сохраненные отпечатки пальцев будут удалены, поэтому вы больше не сможете снимать блокировку, совершать покупки и входить в приложения с их помощью."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Без PIN-кода не будет работать защита профиля."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Без PIN-кода не будет работать защита профиля.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Без PIN-кода не будет работать защита профиля.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сохраненные отпечатки пальцев также будут удалены: вы больше не сможете снимать блокировку, совершать покупки и входить в приложения с их помощью."</string>
+</xliff:g>Сохраненные отпечатки пальцев будут удалены, поэтому вы больше не сможете снимать блокировку, совершать покупки и входить в приложения с их помощью."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Без пароля защита профиля работать не будет."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Без пароля защита профиля работать не будет.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Без пароля защита профиля работать не будет.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сохраненные отпечатки пальцев также перестанут действовать: вы больше не сможете снимать блокировку, совершать покупки и входить в приложения с их помощью."</string>
+</xliff:g>Сохраненные отпечатки пальцев будут удалены, поэтому вы больше не сможете снимать блокировку, совершать покупки и входить в приложения с их помощью."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Без блокировки экрана защита профиля работать не будет."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Без блокировки экрана защита профиля работать не будет.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Без блокировки экрана защита профиля работать не будет.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Сохраненные отпечатки пальцев будут удалены, поэтому вы больше не сможете снимать блокировку, совершать покупки и входить в приложения с их помощью."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Да, отключить"</string>
@@ -604,6 +609,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Нельзя использовать последовательности из идущих подряд или повторяющихся цифр"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ОК"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Отмена"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Сбросить"</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>
@@ -737,7 +743,7 @@
     <string name="wifi_error" msgid="3207971103917128179">"Ошибка"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"Частота 5 ГГц недоступна в этой стране"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Режим полета"</string>
-    <string name="wifi_notify_open_networks" msgid="76298880708051981">"Оповещения об открытых сетях"</string>
+    <string name="wifi_notify_open_networks" msgid="76298880708051981">"Уведомления об открытых сетях"</string>
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Сообщать о наличии общедоступных сетей с хорошим сигналом"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Включать Wi‑Fi автоматически"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Включать Wi‑Fi в зоне действия сохраненных сетей (например, домашней) с хорошим сигналом"</string>
@@ -838,6 +844,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Поддерживает WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (доступно WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Введите пароль для подключения к сети."</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Сеть Wi‑Fi оператора связи"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Подключиться через <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Чтобы определение местоположения и некоторые другие функции работали лучше, приложению \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" необходимо выполнять поиск сетей, даже если модуль Wi-Fi отключен.\n\nРазрешить?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Этот параметр можно отключить в расширенных настройках в дополнительном меню."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Разрешить"</string>
@@ -855,6 +863,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Подключить"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Не удалось подключиться к сети."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Удалить"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Изменить"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Не удалось удалить сеть."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Сохранить"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Не удалось сохранить сеть."</string>
@@ -869,6 +878,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Дополнительные функции"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-адрес"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-адрес"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Информация о сети"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Маска подсети"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-адреса"</string>
@@ -901,16 +911,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Отмена приглашения"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Вы собираетесь отменить приглашение на подключение к устройству \"<xliff:g id="PEER_NAME">%1$s</xliff:g>\". Продолжить?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Удалить эту группу?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Точка доступа Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Точка доступа Wi‑Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Другим устройствам закрыт доступ к Интернету или контенту"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Доступ к интернет-соединению планшета через точку доступа открыт"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Доступ к интернет-подключению телефона через точку доступа открыт"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Предоставлен доступ к контенту приложения. Чтобы открыть другим устройствам доступ к интернет-соединению, отключите и снова включите точку доступа."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Название точки доступа Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Название точки доступа"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Подключение к точке доступа \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\"..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Другие устройства могут подключаться к точке доступа \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\""</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Пароль Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Пароль точки доступа"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Диапазон частот Wi-Fi"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Создайте сеть Wi‑Fi для других своих устройств с помощью точки доступа. Она позволяет пользоваться мобильным Интернетом. За передачу и скачивание данных может взиматься дополнительная плата."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Приложения могут создавать точки доступа, чтобы делиться контентом с устройствами поблизости."</string>
@@ -962,7 +971,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Когда функция \"Звонки по Wi-Fi\" включена, для исходящих вызовов может использоваться как Wi-Fi, так и мобильная сеть (в зависимости от ваших предпочтений и уровня сигнала). Прежде чем включить эту функцию, свяжитесь со своим оператором и уточните детали."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Изменение адреса для экстренных случаев"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"Адрес, по которому будут направлены экстренные службы в случае вызова по номеру 112 через сеть Wi-Fi"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"Адрес, по которому будут направлены экстренные службы в случае вызова по сети Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Экран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Громкость"</string>
@@ -1016,6 +1025,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Поиск"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Настроить параметры и управлять историей поиска"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Ничего не найдено"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Очистить историю"</string>
     <string name="display_settings" msgid="7965901687241669598">"Экран"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Автоповорот экрана"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Насыщенные цвета"</string>
@@ -1350,8 +1360,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Восстановление настроек APN по умолчанию..."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Сбросить настройки"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Настройки по умолчанию восстановлены"</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Сброс"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Сбросить сетевые настройки"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Сброс настроек"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Вы можете сбросить настройки сети, приложений или устройства"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Сбросить настройки Wi-Fi, мобильного Интернета и Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"На устройстве будут сброшены все сетевые настройки, в том числе:\n\n"<li>"Wi‑Fi"</li>\n<li>"Мобильный Интернет"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Сбросить настройки"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Сброшенные настройки нельзя будет восстановить. Продолжить?"</string>
@@ -1359,14 +1370,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Сбросить настройки?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Этот пользователь не может сбрасывать настройки сети"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Сетевые настройки сброшены"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Сбросить к заводским настройкам"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one">Будет сброшен <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> аккаунт</item>
-      <item quantity="few">Будет сброшено <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> аккаунта</item>
-      <item quantity="many">Будет сброшено <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> аккаунтов</item>
-      <item quantity="other">Будет сброшено <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> аккаунта</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Внутренняя память и все данные будут очищены"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Удалить все данные (сброс к заводским настройкам)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Будут удалены все данные из "<b>"внутренней памяти"</b>" устройства, в том числе:\n\n"<li>"Ваш аккаунт Google"</li>\n<li>"Настройки/данные системы и приложений"</li>\n<li>"Загруженные приложения"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Будут удалены все данные из "<b>"внутренней памяти"</b>" устройства, в том числе:\n\n"<li>"Ваш аккаунт Google"</li>\n<li>"Настройки/данные системы и приложений"</li>\n<li>"Загруженные приложения"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Аккаунты на этом устройстве:\n"</string>
@@ -1490,15 +1494,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Сведения о безопасности"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Устройство не подключено к Интернету. Чтобы просмотреть эту информацию, откройте страницу %s на любом компьютере с интернет-доступом."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Загрузка…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Выберите пароль"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Настройте блокировку экрана"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Защитите устройство: задайте пароль"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Задайте пароль"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Создайте графический ключ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Задайте графический ключ"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Введите PIN-код"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Защитите устройство: задайте PIN-код"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Задайте PIN-код"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Подтвердите пароль"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Введите пароль ещё раз"</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_pin_header" msgid="7744513791910572550">"Введите 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>
@@ -1511,12 +1516,18 @@
     <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_strong_auth_required_device_pattern" msgid="530802132223800623">"Укажите графический ключ"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Введите PIN-код"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Введите пароль устройства"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Укажите графический ключ от рабочего профиля"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Введите PIN-код рабочего профиля"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Введите пароль от рабочего профиля"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Настройки вашего телефона были сброшены. Чтобы использовать его, введите свой прежний графический ключ."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Настройки вашего телефона были сброшены. Чтобы использовать его, введите свой прежний PIN-код."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Настройки вашего телефона были сброшены. Чтобы использовать его, введите свой прежний пароль."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Подтверждение графического ключа"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Подтверждение PIN-кода"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Подтверждение пароля"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Неверный PIN-код"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Неверный пароль"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Неверный ключ"</string>
@@ -1688,7 +1699,7 @@
     <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">"О приложении"</string>
-    <string name="app_install_details_summary" msgid="6464796332049327547">"Приложение скачано из <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="app_install_details_summary" msgid="6464796332049327547">"Откуда скачано приложение: <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="instant_app_details_summary" msgid="4529934403276907045">"Подробнее (<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>
@@ -1821,13 +1832,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Создать виджет и разрешить доступ?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Когда вы создаете виджет, приложение \"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>\" получает доступ ко всем его данным."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Всегда разрешать приложению \"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>\" создавать виджеты и получать их данные"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> д. <xliff:g id="HOURS">%2$d</xliff:g> ч. <xliff:g id="MINUTES">%3$d</xliff:g> м. <xliff:g id="SECONDS">%4$d</xliff:g> с."</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> ч. <xliff:g id="MINUTES">%2$d</xliff:g> м. <xliff:g id="SECONDS">%3$d</xliff:g> с."</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> м. <xliff:g id="SECONDS">%2$d</xliff:g> с."</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> с."</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"Статистика использования"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Статистика использования"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Упорядочить по:"</string>
@@ -1839,7 +1843,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Программы чтения с экрана, экран, элементы управления"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Настройки спец. возможностей"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Используйте специальные возможности для удобной работы с устройством. Эти параметры можно изменить в настройках."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Увеличьте размер шрифта"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Измените размер шрифта"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Программы чтения с экрана"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Аудио и озвучивание текста"</string>
     <string name="display_category_title" msgid="685461049938269166">"Экран"</string>
@@ -1860,10 +1864,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505">"Чтобы "<b>"увеличить масштаб"</b>", быстро коснитесь экрана одним пальцем три раза.\n"<ul><li>"Для прокрутки проведите двумя пальцами."</li>\n<li>"Чтобы изменить масштаб, сведите два пальца вместе или разведите их."</li></ul>\n\n"Если нужно "<b>"временно увеличить масштаб"</b>", быстро нажмите на экран три раза и удерживайте на третьем нажатии.\n"<ul><li>"Для обзора проводите по экрану."</li>\n<li>"Чтобы уменьшить масштаб, отпустите палец."</li></ul>\n\n"Эти жесты не работают на клавиатуре и панели навигации."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Чтобы использовать увеличение, когда оно включено, нажимайте кнопку специальных возможностей в нижней части экрана.\n\nЧтобы "<b>"увеличить масштаб"</b>", нажмите кнопку специальный возможностей, а затем коснитесь экрана.\n"<ul><li>"Для прокрутки проведите двумя пальцами."</li>\n<li>"Чтобы изменить масштаб, сведите два пальца вместе или разведите их."</li></ul>\n\n"Если нужно "<b>"временно увеличить масштаб"</b>", нажмите кнопку специальных возможностей, коснитесь экрана и удерживайте.\n"<ul><li>"Для обзора проводите по экрану."</li>\n<li>"Чтобы уменьшить масштаб, отпустите палец."</li></ul>\n\n"Эти жесты не работают на клавиатуре и панели навигации."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Кнопка специальных возможностей настроена на сервис \"<xliff:g id="SERVICE">%1$s</xliff:g>\". Чтобы использовать увеличение, удерживайте ее, а затем выберите \"Увеличение изображения на экране\"."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Быстрое включение"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Кнопки регулировки громкости"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Быстрое включение сервиса"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Разрешить на заблокированном экране"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Чтобы использовать функцию специальных возможностей, когда она включена, нажмите и удерживайте три секунды обе кнопки регулировки громкости."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Чтобы использовать функцию специальных возможностей, когда она включена, нажмите и удерживайте обе кнопки регулировки громкости в течение трех секунд."</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">"Сохранять масштаб"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Сохранять масштаб при переходе между приложениями"</string>
@@ -1876,7 +1880,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Может снизить производительность"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Нажатие после остановки указателя"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Задержка перед нажатием"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="DESCRIPTION">%2$s</xliff:g>: <xliff:g id="STATE">%1$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ВКЛ."</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ОТКЛ."</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Показывать в быстрых настройках"</string>
@@ -2402,6 +2405,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Управление тарифами"</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>
@@ -2487,6 +2491,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мобильные сети"</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_metered_auto" msgid="1262028400911918865">"Автоматически"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Сеть с тарификацией трафика"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Сеть без тарификации трафика"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Статистика оператора связи может отличаться от статистики устройства."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Вызов службы экстренной помощи"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Вернуться к вызову"</string>
@@ -2712,7 +2719,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Менеджер звонков"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Оповещения о чрезвычайных ситуациях"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Сообщения экстренных служб"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Операторы связи"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Названия точек доступа"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Режим 4G LTE"</string>
@@ -2781,6 +2788,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Использование SIM-карт"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Всегда спрашивать"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Выберите SIM-карту"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Выбор SIM-карты"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Настройки"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="one">Показать %d скрытый объект</item>
@@ -2936,18 +2944,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Уведомления приложений"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Категория уведомления"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Важность"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"На усмотрение приложения"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Разрешить звуковой сигнал"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Отключить уведомления"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Без уведомлений"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Без звука"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Звук"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Звук и всплывающее окно"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Всплывающее окно"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Низкий"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Средний"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Высокий"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Крайняя важность"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Разрешить звуковой сигнал"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Отключить звуковой сигнал и вибрацию, не показывать оповещения поверх других приложений."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Разрешить оповещения"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Включить звуковой сигнал, вибрацию, а также показывать уведомления поверх других приложений"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Низкая важность"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Средняя важность"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Высокая важность"</string>
@@ -2980,7 +2989,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"картинка в картинке"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Картинка в картинке"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Поддержка режима \"Картинка в картинке\""</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Когда приложение открыто или когда вы выходите из него, оно может создавать окно \"Картинка в картинке\". Так вы можете, например, продолжить просмотр видео. Это окно отображается поверх остальных приложений."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Когда приложение открыто или когда вы выходите из него, оно может создавать окно \"Картинка в картинке\". Так вы можете, например, продолжить просмотр видео. Это окно отображается поверх остальных приложений."</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>
@@ -3303,6 +3312,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Передача файлов"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Передача фото (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Использование устройства как MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Трансляция SMS"</string>
     <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>
@@ -3449,6 +3459,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="night_display_suggestion_title" msgid="6602129097059325291">"Расписание ночного режима"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Желтоватый экран для засыпания"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Ночной режим включен"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Экран теперь имеет желтоватый оттенок. Это поможет вам быстрее заснуть."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Подсказки"</string>
@@ -3471,6 +3483,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Использовать более холодные цвета на экране"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Для изменения цветовых настроек нужно отключить экран"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Чтобы включить Telephony Monitor, перезагрузите устройство"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HDR+ HAL камеры"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Чтобы включить HDR+ HAL камеры, перезагрузите устройство"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Лазерный датчик камеры"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматические обновления системы"</string>
     <string name="usage" msgid="2977875522080448986">"Передача данных"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Мобильный трафик"</string>
@@ -3498,7 +3513,7 @@
     <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_2">%2$s</xliff:g>: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"Использовано <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">
@@ -3517,9 +3532,9 @@
     <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="5471253233176471245">"Добавьте отпечаток другого пальца"</string>
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"Включено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -3571,7 +3586,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Очистить и перейти"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Сброс счетчиков ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Готово"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Уведомления на заблоки­рованном экране"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Выберите параметры для информации на заблокированном экране"</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="8483187649355540109">"Помощь и советы"</string>
@@ -3579,7 +3594,7 @@
     <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="2456198532288640046">"Не виден другим устройствам"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Отключено"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Подключено к устройству <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Подключено к нескольким устройствам"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Интерфейс системы: деморежим"</string>
@@ -3687,7 +3702,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Приложения с мгновенным запуском"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Открывать ссылки в приложениях, даже если они не установлены на устройстве"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Приложения с мгновенным запуском"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Аккаунт для приложений с мгновенным запуском"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Настройки приложений с мгновенным запуском"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Установленные приложения"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Память устройства теперь управляется менеджером хранилища"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Аккаунты для пользователя <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3738,7 +3753,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Постоянная VPN включена в вашем личном профиле"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Постоянная VPN включена в вашем рабочем профиле"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Выбран глобальный прокси-сервер HTTP"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Надежные сертификаты"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Надежные сертификаты"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Надежные сертификаты в персональном профиле"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Надежные сертификаты в рабочем профиле"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">Не менее <xliff:g id="COUNT_1">%d</xliff:g> сертификата ЦС</item>
       <item quantity="few">Не менее <xliff:g id="COUNT_1">%d</xliff:g> сертификатов ЦС</item>
@@ -3811,7 +3828,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Сведения об операторе"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Запустить синхронизацию оператора"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Что нового?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"5 функций, которые вам пригодятся"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Познакомьтесь со своим новым телефоном"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Познакомьтесь со своим новым планшетом"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Познакомьтесь со своим новым устройством"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Функция недоступна на этом устройстве."</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Статус регистрации сервиса IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Зарегистрирован"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Не зарегистрирован"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 45f34bf..f4b58d0 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s හට ඔබගේ පණිවිඩ වෙත ප්‍රවේශ විමට අවශ්‍යයි. %2$s හට ප්‍රවේශය දෙන්නද?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM කාඩ්පත් ප්‍රවේශය ඉල්ලීම"</string>
     <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="bluetooth_device_name_summary" msgid="4757990010751789977">"වෙනත් උපාංගවලට <xliff:g id="DEVICE_NAME">^1</xliff:g> ලෙස දෘශ්‍යමානයි"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"වෙනත් උපාංගවලට <xliff:g id="DEVICE_NAME">^1</xliff:g> ලෙස දෘශ්‍යමානයි"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ඔබගේ උපාංග"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"නව උපාංගය යුගල කරන්න"</string>
     <string name="date_and_time" msgid="9062980487860757694">"දිනය සහ වේලාව"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"ඊළඟ"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"ඇඟිලි සලකුණ මඟ හරින්නද?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"ඇඟිලි සලකුණු සැකසීම මිනිත්තුවක් හෝ දෙකක් පමණක් ගනී. ඔබ මෙය මඟ හරින්නේ නම්, ඔබට පසුව ඔබගේ ඇඟිලි සලකුණු සැකසීම් තුළ සැකසිය හැක."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"තිර අගුල මග හරින්නද?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"උපාංග ආරක්ෂණ විශේෂාංග ක්‍රියාත්මක නොකරනු ඇත. මෙම ටැබ්ලට් පරිගණකය නැති වුවහොත්, සොරකම් කළහොත්, හෝ යළි සැකසුවහොත් වෙනත් අය එය භාවිත කිරීම වැළැක්වීමට ඔබට නොහැකි වනු ඇත."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"උපාංග ආරක්ෂණ විශේෂාංග ක්‍රියාත්මක නොකරනු ඇත. මෙම උපාංගය නැති වුවහොත්, සොරකම් කළහොත්, හෝ යළි සැකසුවහොත් වෙනත් අය එය භාවිත කිරීම වැළැක්වීමට ඔබට නොහැකි වනු ඇත."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"උපාංග ආරක්ෂණ විශේෂාංග ක්‍රියාත්මක නොකරනු ඇත. මෙම දුරකථනය නැති වුවහොත්, සොරකම් කළහොත්, හෝ යළි සැකසුවහොත් වෙනත් අය එය භාවිත කිරීම වැළැක්වීමට ඔබට නොහැකි වනු ඇත."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"ඔබ ඇඟිලි සලකුණු උපරිම සංඛ්‍යාව එක් කර ඇත"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"තවත් ඇඟිලි සලකුණු එක් කළ නොහැකිය"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"සියලු ඇඟිලි සලකුණු ඉවත් කරන්නද?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' ඉවත් කරන්න"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"ඔබට මෙම ඇඟිලි සලකුණ මකා දැමීමට අවශ්‍යද?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"ඔබට ඔබේ දුරකථනය අගුලු හැරීමට, මිලදී ගැනීම්වලට අවසර දීමට, හෝ ඒවා සමගින් යෙදුම්වලට පිරීමට ඔබේ ඇඟිලි සලකුණු භාවිත කළ නොහැකි වනු ඇත"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"ඔබට ඔබේ කාර්යාල පැතිකඩ අගුලු හැරීමට, මිලදී ගැනීම්වලට අවසර දීමට, හෝ කාර්යාල යෙදුම්වලට පිරීමට ඔබේ ඇඟිලි සලකුණු භාවිත කළ නොහැකි වනු ඇත"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"ඔව්, ඉවත් කරන්න"</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"අමතර ආරක්ෂාව සඳහා, උපස්ථ තිර අගුලක් සකසන්න."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"අමතර ආරක්ෂාව සඳහා, උපස්ථ තිර අගුලක් සකසන්න."</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>
@@ -497,37 +502,37 @@
     <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_fingerprint" msgid="8212242533942400457">"උපාංග ආරක්ෂණ විශේෂාංග ඔබගේ රටාව නොමැතිව ක්‍රියා නොකරනු ඇත.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"උපාංග ආරක්ෂණ විශේෂාංග ඔබගේ රටාව නොමැතිව ක්‍රියා නොකරනු ඇත.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ඔබගේ සුරකින ලද ඇඟිලි සලකුණු මෙම උපාංගයෙන් ඉවත් කරන අතර ඔබගේ දුරකථනය අගුළු හැරීම, මිලදී ගැනීම් වෙත අවසර දීම, හෝ ඒවා සමඟ යෙදුම් වෙත පුරන්න වීමට නොහැකි වේ.\""</string>
+</xliff:g>ඔබගේ සුරකින ලද ඇඟිලි සලකුණු මෙම උපාංගයෙන් ඉවත් කරන අතර ඔබගේ දුරකථනය අගුළු හැරීම, මිලදී ගැනීම් වෙත අවසර දීම, හෝ ඒවා සමඟ යෙදුම් වෙත පුරනය වීමට නොහැකි වේ."</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">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"උපාංග ආරක්ෂණ විශේෂාංග ඔබගේ PIN එක නොමැතිව ක්‍රියා නොකරනු ඇත.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ඔබගේ සුරකින ලද ඇඟිලි සලකුණු මෙම උපාංගයෙන් ඉවත් කරන අතර ඔබගේ දුරකථනය අගුළු හැරීම, මිලදී ගැනීම් වෙත අවසර දීම, හෝ ඒවා සමඟ යෙදුම් වෙත පුරන්න වීමට නොහැකි වේ.\""</string>
+</xliff:g>ඔබගේ සුරකින ලද ඇඟිලි සලකුණු මෙම උපාංගයෙන් ඉවත් කරන අතර ඔබගේ දුරකථනය අගුළු හැරීම, මිලදී ගැනීම් වෙත අවසර දීම, හෝ ඒවා සමඟ යෙදුම් වෙත පුරනය වීමට නොහැකි වේ."</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"උපාංග ආරක්ෂණ විශේෂාංග ඔබගේ මුරපදය නොමැතිව ක්‍රියා නොකරනු ඇත.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ඔබගේ සුරකින ලද ඇඟිලි සලකුණු මෙම උපාංගයෙන් ඉවත් කරන අතර ඔබගේ දුරකථනය අගුළු හැරීම, මිලදී ගැනීම් වෙත අවසර දීම, හෝ ඒවා සමඟ යෙදුම් වෙත පුරන්න වීමට නොහැකි වේ.\""</string>
+</xliff:g>ඔබගේ සුරකින ලද ඇඟිලි සලකුණු මෙම උපාංගයෙන් ඉවත් කරන අතර ඔබගේ දුරකථනය අගුළු හැරීම, මිලදී ගැනීම් වෙත අවසර දීම, හෝ ඒවා සමඟ යෙදුම් වෙත පුරනය වීමට නොහැකි වේ."</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"උපාංග ආරක්ෂණ විශේෂාංග ඔබගේ තිර අගුල නොමැතිව ක්‍රියා නොකරනු ඇත.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ඔබගේ සුරකින ලද ඇඟිලි සලකුණු මෙම උපාංගයෙන් ඉවත් කරන අතර ඔබගේ දුරකථනය අගුළු හැරීම, මිලදී ගැනීම් වෙත අවසර දීම, හෝ ඒවා සමඟ යෙදුම් වෙත පුරන්න වීමට නොහැකි වේ.\""</string>
+</xliff:g>ඔබගේ සුරකින ලද ඇඟිලි සලකුණු මෙම උපාංගයෙන් ඉවත් කරන අතර ඔබගේ දුරකථනය අගුළු හැරීම, මිලදී ගැනීම් වෙත අවසර දීම, හෝ ඒවා සමඟ යෙදුම් වෙත පුරනය වීමට නොහැකි වේ."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"පැතිකඩ ආරක්ෂණ විශේෂාංග ඔබගේ රටාව නොමැතිව ක්‍රියා නොකරනු ඇත."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"පැතිකඩ ආරක්ෂණ විශේෂාංග ඔබගේ රටාව නොමැතිව ක්‍රියා නොකරනු ඇත.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"පැතිකඩ ආරක්ෂණ විශේෂාංග ඔබගේ රටාව නොමැතිව ක්‍රියා නොකරනු ඇත.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ඔබගේ සුරකින ලද ඇඟිලි සලකුණුද මෙම පැතිකඩෙන් ඉවත් කරනු ඇති අතර ඔබගේ පැතිකඩ අගුලු හැරීමට, මිලදී ගැනීම්වලට අනුමැතිය දීමට, හෝ ඒවා සමඟින් යෙදුම් වෙත පිරීමට නොහැකි වනු ඇත.\""</string>
+</xliff:g>ඔබගේ සුරකින ලද ඇඟිලි සලකුණුද මෙම පැතිකඩෙන් ඉවත් කරනු ඇති අතර ඔබගේ පැතිකඩ අගුලු හැරීමට, මිලදී ගැනීම්වලට අනුමැතිය දීමට, හෝ ඒවා සමඟින් යෙදුම් වෙත පුරනය වීමට නොහැකි වනු ඇත."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"පැතිකඩ ආරක්ෂණ විශේෂාංග ඔබගේ PIN අංකය නොමැතිව ක්‍රියා නොකරනු ඇත."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"පැතිකඩ ආරක්ෂණ විශේෂාංග ඔබගේ PIN අංකය නොමැතිව ක්‍රියා නොකරනු ඇත.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"පැතිකඩ ආරක්ෂණ විශේෂාංග ඔබගේ PIN අංකය නොමැතිව ක්‍රියා නොකරනු ඇත.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ඔබගේ සුරකින ලද ඇඟිලි සලකුණුද මෙම උපාංගයෙන් ඉවත් කරනු ඇති අතර ඔබගේ පැතිකඩ අගුලු හැරීමට, මිලදී ගැනීම්වලට අනුමැතිය දීමට, හෝ ඒවා සමඟින් යෙදුම් වෙත පිරීමට නොහැකි වනු ඇත.\""</string>
+</xliff:g>ඔබගේ සුරකින ලද ඇඟිලි සලකුණුද මෙම උපාංගයෙන් ඉවත් කරනු ඇති අතර ඔබගේ පැතිකඩ අගුලු හැරීමට, මිලදී ගැනීම්වලට අනුමැතිය දීමට, හෝ ඒවා සමඟින් යෙදුම් වෙත පුරනය වීමට නොහැකි වනු ඇත."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"පැතිකඩ ආරක්ෂණ විශේෂාංග ඔබගේ මුරපදය නොමැතිව ක්‍රියා නොකරනු ඇත."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"පැතිකඩ ආරක්ෂණ විශේෂාංග ඔබගේ මුරපදය නොමැතිව ක්‍රියා නොකරනු ඇත.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"පැතිකඩ ආරක්ෂණ විශේෂාංග ඔබගේ මුරපදය නොමැතිව ක්‍රියා නොකරනු ඇත.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ඔබගේ සුරකින ලද ඇඟිලි සලකුණුද මෙම පැතිකඩෙන් ඉවත් කරනු ඇති අතර ඔබගේ පැතිකඩ අගුලු හැරීමට, මිලදී ගැනීම්වලට අනුමැතිය දීමට, හෝ ඒවා සමඟින් යෙදුම් වෙත පිරීමට නොහැකි වනු ඇත.\""</string>
+</xliff:g>ඔබගේ සුරකින ලද ඇඟිලි සලකුණුද මෙම පැතිකඩෙන් ඉවත් කරනු ඇති අතර ඔබගේ පැතිකඩ අගුලු හැරීමට, මිලදී ගැනීම්වලට අනුමැතිය දීමට, හෝ ඒවා සමඟින් යෙදුම් වෙත පුරනය වීමට නොහැකි වනු ඇත."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"පැතිකඩ ආරක්ෂණ විශේෂාංග ඔබගේ තිර අගුල නොමැතිව ක්‍රියා නොකරනු ඇත."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"පැතිකඩ ආරක්ෂණ විශේෂාංග ඔබගේ තිර අගුල නොමැතිව ක්‍රියා නොකරනු ඇත.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"පැතිකඩ ආරක්ෂණ විශේෂාංග ඔබගේ තිර අගුල නොමැතිව ක්‍රියා නොකරනු ඇත.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ඔබගේ සුරකින ලද ඇඟිලි සලකුණුද මෙම පැතිකඩෙන් ඉවත් කරනු ඇති අතර ඔබගේ පැතිකඩ අගුලු හැරීමට, මිලදී ගැනීම්වලට අනුමැතිය දීමට, හෝ ඒවා සමඟින් යෙදුම් වෙත පිරීමට නොහැකි වනු ඇත.\""</string>
+</xliff:g>ඔබගේ සුරකින ලද ඇඟිලි සලකුණුද මෙම පැතිකඩෙන් ඉවත් කරනු ඇති අතර ඔබගේ පැතිකඩ අගුලු හැරීමට, මිලදී ගැනීම්වලට අනුමැතිය දීමට, හෝ ඒවා සමඟින් යෙදුම් වෙත පුරනය වීමට නොහැකි වනු ඇත."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"ඔව්, ඉවත් කරන්න"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"අගුළු ඇරීමේ රටාව වෙනස් කරන්න"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"අගුළු ඇරීමේ PIN එක වෙනස් කරන්න"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"ආරෝහණ, අවරෝහණ හෝ ප්‍රනරාවර්ත අනුක්‍රමයේ අංක වෙත අවසර නැත"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"හරි"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"අවලංගු කරන්න"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"හිස් කරන්න"</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>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ඇත"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS පවතී)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ඔබගේ ජාල මුරපදය ඇතුළත් කරන්න"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"වාහක Wi-Fi ජාලය"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> හරහා සම්බන්ධ කරන්න"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ස්ථාන නිරවද්‍යතාවය වැඩි කිරීමට සහ වෙනත් අරමුණු සඳහා, Wi-Fi අක්‍රිය වුවද <xliff:g id="APP_NAME">%1$s</xliff:g>  හට ජාල පරිලෝකනය සක්‍රිය කිරීමට අවශ්‍යය. \n\nපරිලෝකනය අවශ්‍ය සියලු යෙදුම් සඳහා මෙයට අවසර දෙන්නේ ද?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"මෙය අක්‍රිය කිරීමට, ඉතිරී ගිය මෙනුව තුළ උසස් වෙත යන්න."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"අවසර දෙන්න"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"සම්බන්ධ කරන්න"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ජාලය වෙත සම්බන්ධ වීම අසාර්ථක විය"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"අමතක කරන්න"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"වෙනස් කරන්න"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"ජාලය අමතක කිරීම අසාර්ථක වුණි"</string>
     <string name="wifi_save" msgid="3331121567988522826">"සුරකින්න"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"ජාලය සුරැකීම අසාර්ථක වුණි"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"උසස් Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC ලිපිනය"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP ලිපිනය"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"ජාල තොරතුරු"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"සබ්නෙට් මාස්ක්"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 ලිපින"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ආරාධනාව අවලංගු කරන්නද?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g> සමඟ සම්බන්ධ වීමට ඇති ආරාධනාව අවලංගු කිරීමට ඔබට අවශ්‍යද?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"මෙම කණ්ඩායම අමතකද?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"ජංගම Wi-Fi හොට්ස්පොට්"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi හොට්ස්පොට්"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"වෙනත් උපාංග සමග අන්තර්ජාලය හෝ අන්තර්ගතය බෙදා නොගනී"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"හොට්ස්පොට් හරහා මෙම ටැබ්ලට් පරිගණකයේ අන්තර්ජාල සබැඳුම බෙදා ගනිමින්"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"හොට්ස්පොට් හරහා මෙම දුරකථනයේ අන්තර්ජාල සබැඳුම බෙදා ගනිමින්"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"යෙදුම අන්තර්ගතය බෙදා ගනිමින් සිටී. අන්තර්ජාල සබැඳුමක් බෙදා ගැනීමට, හොට්ස්පොට් ක්‍රියාවිරහිත කර, අනතුරුව ක්‍රියාත්මක කරන්න"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi-Fi නම"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"හොට්ස්පොට් නම"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ක්‍රියාත්මක කරමින්..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"වෙනත් උපාංගවලට <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> වෙත සම්බන්ධ විය හැකිය"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi මුරපදය"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"හොට්ස්පොට් මුරපදය"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP කලාපය"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"ඔබගේ අනෙකුත් උපාංග සඳහා Wi-Fi ජාලයක් තැනීමට හොට්ස්පොට් භාවිත කරන්න. හොට්ස්පොට් ඔබගේ ජංගම දත්ත සබැඳුම භාවිත කරමින් අන්තර්ජාල සපයයි. අමතර ජංගම දත්ත ගාස්තු අදාළ විය හැකිය."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"යෙදුම් අවට උපාංග සමග අන්තර්ගතය බෙදා ගැනීමට හොට්ස්පොට් එකක් සෑදිය හැකිය."</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi ඇමතීම ක්‍රියාත්මකයි, ඔබේ දුරකථනයට ඔබේ මනාපය සහ සංඥා ප්‍රබලතාව අනුව, Wi-Fi ජාල හරහා හෝ ඔබේ වාහකයේ ජාලය හරහා ඇමතුම් ගමන් කරවිය හැකිය. මෙම විශේෂාංගය ක්‍රියාත්මක කිරීමට පෙර, ගාස්තු සහ අනෙකුත් විස්තර පිළිබඳව ඔබේ වාහකය සමගින් පරීක්ෂා කර බලන්න."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"හදිසි අවස්ථා ලිපිනය යාවත්කාලීන කරන්න"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"ඔබ WiFi භාවිත කර 911 වෙත ඇමතුමක් කළ විට හදිසි අවස්ථා සේවා විසින් භාවිත කරන ලිපිනය"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"ඔබ WiFi භාවිත කර හදිසි අවස්ථා ඇමතුමක් කළ විට හදිසි අවස්ථා සේවා විසින් භාවිත කරන ලිපිනය"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"සංදර්ශකය"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ශබ්ද"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ශබ්ද තීව්‍රතා"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"සෙවීම"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"සෙවුම් සැකසීම් සහ ඉතිහාසය කළමනාකරණය කරන්න"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"ප්‍රතිඵල නැත"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"ඉතිහාසය හිස් කරන්න"</string>
     <string name="display_settings" msgid="7965901687241669598">"සංදර්ශකය"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"ස්වයංක්‍රීයව-භ්‍රමණය වන තීරය"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"විචිත්‍ර වර්ණ"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"සුපුරුදු APN සැකසුම් යළි පිහිටුවමින්."</string>
     <string name="menu_restore" msgid="8260067415075573273">"සුපුරුදු වෙත යළි සකසන්න"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"සුපුරුදු APN සැකසීම නැවත සැකසීම සම්පූර්ණ කරන ලදි."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"යළි පිහිටුවන්න"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"ජාල සැකසීම් යළි පිහිටුවන ලදි"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"යළි සැකසීමේ විකල්ප"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"ජාල, යෙදුම්, හෝ උපාංගය යළි සැකසිය හැකිය"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi, ජංගම, බ්ලූටූත් යළි සක."</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"මෙය, පහත ඒවා ඇතුළුව සියලු ජාල සැකසීම් යළි සකසනු ඇත:\n\n"<li>"Wi‑Fi"</li>\n<li>"ජංගම දත්ත"</li>\n<li>"බ්ලූටූත්"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"සැකසීම් යළි පිහිටුවන ලදි"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"සියලු ජාල සැකසීම් යළි පිහිටුවන්නද? ඔබට මෙම ක්‍රියාව ආපසු හැරවිය නොහැකිය!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"යළි පිහිටුවන්නද?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"මෙම පරිශීලකයා වෙත ජාලය යළි පිහිටුවීමේ හැකියාව නැත"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"ජාල සැකසීම් යළි පිහිටුවන ලදි"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"කර්මාන්තශාලා දත්ත යළි පිහිටුම"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one">ගිණුම් <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g>ක් යළි පිහිටුවනු ලැබේ</item>
-      <item quantity="other">ගිණුම් <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g>ක් යළි පිහිටුවනු ලැබේ</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"අභ්‍යන්තර ආචයනය සහ සියලු දත්ත යළි පිහිටුවනු ලැබේ"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"සියලු දත්ත මකන්න (කර්මාන්තශාලා යළි සැකසීම)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ඔබගේ ටැබ්ලටයේ "<b>"අභ්‍යන්තර ආචනය"</b>", සියලු දත්ත මකයි:\n\n"<li>"ඔබගේ Google ගිණුම"</li>\n<li>"පද්ධති සහ යෙදුම් දත්ත සහ සැකසීම්"</li>\n<li>"බාගත යෙදුම්"</li>" අන්තර්ගතය."</string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"මෙය ඔබගේ දුරකථනයේ "<b>"අභ්‍යන්තර ගබඩාවේ"</b>" සියලු දත්ත මකයි:\n\n"<li>"ඔබගේ Google ගිණුම"</li>\n<li>"පද්ධති සහ යෙදුම් දත්ත සහ සැකසීම්"</li>\n<li>"බාගත යෙදුම්"</li>" අන්තර්ගතය."</string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ඔබ දැනට පහත ගිණුම් වෙත පුරනය වී සිටියි:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"ආරක්ෂක තොරතුරු"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"ඔබට දත්ත සම්බන්ධතාවයක් නොමැත. දැන් මෙම තොරතුරු නැරඹීමට, අන්තර්ජාලයට සම්බන්ධ ඕනෑම පරිගණකයකින් %s වෙත යන්න."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"පූරණය වෙමින්..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"ඔබගේ මුරපදය තෝරන්න"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"තිර අගුලක් සකසන්න"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"ආරක්ෂාව සඳහා, මුරපදයක් සකසන්න"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"ඇඟිලි සලකුණ භාවිත කිරීමට, මුරපදයක් සකසන්න"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"ඔබගේ රටාව තෝරන්න"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ඇඟිලි සලකුණ භාවිත කිරීමට, රටාවක් සකසන්න"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"ඔබගේ PIN තෝරාගන්න"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"ආරක්ෂාව සඳහා, PIN එකක් සකසන්න"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"ඇඟිලි සලකුණ භාවිත කිරීමට, PIN අංකයක් සකසන්න"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"ඔබගේ මුරපදය තහවුරු කරන්න"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"ඔබගේ මුරපදය නැවතත් ඇතුළු කරන්න"</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_pin_header" msgid="7744513791910572550">"ඔබගේ 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>
@@ -1483,12 +1490,18 @@
     <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_strong_auth_required_device_pattern" msgid="530802132223800623">"අමතර ආරක්ෂාව සඳහා, ඔබේ උපාංග රටාව භාවිතා කරන්න"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"අමතර ආරක්ෂාව සඳහා, ඔබේ උපාංග PIN එක ඇතුලත් කරන්න"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"අමතර ආරක්ෂාව සඳහා, ඔබේ උපාංග මුරපදය ඇතුලත් කරන්න"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"අමතර ආරක්ෂාව සඳහා, ඔබේ කාර්යාල රටාව ඇතුලත් කරන්න"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"අමතර ආරක්ෂාව සඳහා, ඔබේ කාර්යාල PIN එක ඇතුලත් කරන්න"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"අමතර ආරක්ෂාව සඳහා, ඔබේ කාර්යාල මුරපදය ඇතුලත් කරන්න"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"ඔබගේ දුරකථනය කර්මාන්තශාලා සැකසීම්වලට නැවත සකසා ඇත. මෙම දුරකථනය භාවිතා කිරීම සඳහා, ඔබගේ පෙර රටාව ඇතුළත් කරන්න."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"ඔබගේ දුරකථනය කර්මාන්තශාලා සැකසීම්වලට නැවත සකසා ඇත. මෙම දුරකථනය භාවිතා කිරීම සඳහා, ඔබගේ පෙර PIN අංකය ඇතුළත් කරන්න."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"ඔබගේ දුරකථනය කර්මාන්තශාලා සැකසීම්වලට නැවත සකසා ඇත. මෙම දුරකථනය භාවිතා කිරීම සඳහා, ඔබගේ පෙර මුරපදය ඇතුළත් කරන්න."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"රටාව තහවුරු කරන්න"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"PIN අංකය තහවුරු කරන්න"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"මුරපදය තහවුරු කරන්න"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN එක වැරදියි"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"වැරදි මුරපදය"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"වැරදි රටාවකි"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"විජට් සාදා ප්‍රවේශයට ඉඩ ලබා දෙන්නද?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"විජටය නිර්මාණයෙන් පසුව, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> වෙත එය පෙන්වන සියලු දත්ත ප්‍රවේශ කළ හැක."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> හට සෑමවිටම විජට සෑදීමට සහ ඒවායේ දත්ත වෙත ප්‍රවේශ වීමට ඉඩ ලබා දෙන්න"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"දි<xliff:g id="DAYS">%1$d</xliff:g> පැ<xliff:g id="HOURS">%2$d</xliff:g> මි<xliff:g id="MINUTES">%3$d</xliff:g> ත<xliff:g id="SECONDS">%4$d</xliff:g>"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"පැ<xliff:g id="HOURS">%1$d</xliff:g> මි<xliff:g id="MINUTES">%2$d</xliff:g> ත<xliff:g id="SECONDS">%3$d</xliff:g>"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"තත් <xliff:g id="SECONDS">%1$d</xliff:g> කින්"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"දි<xliff:g id="DAYS">%1$d</xliff:g> පැ<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="usage_stats_label" msgid="5890846333487083609">"භාවිතා සංඛ්‍යාන"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"භාවිතා සංඛ්‍යාන"</string>
     <string name="display_order_text" msgid="8592776965827565271">"පෙළ ගස්වා ඇත්තේ:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"තිර කියවන, සංදර්ශක, අන්තර්ක්‍රියා පාලන"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"දෘශ්‍ය සැකසීම්"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"ඔබට ඔබේ අවශ්‍යතාවන්ට ගැළපෙන පරිදි මෙම උපාංගය අභිරුචිකරණය කළ හැකිය. මෙම ප්‍රවේශ්‍යතා විශේෂාංග සැකසීම්වල පසුව වෙනස් කළ හැකිය."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"ෆොන්ට තරම වැඩි කරන්න"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"ෆොන්ට තරම වෙනස් කරන්න"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"තිර කියවන"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ශ්‍රව්‍ය සහ තිරය මත පෙළ"</string>
     <string name="display_category_title" msgid="685461049938269166">"සංදර්ශකය"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><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_screen_magnification_navbar_summary" msgid="1996584694050087161">"විශාලනය සක්‍රිය විට, ඉක්මනින් විශාලනය කිරීමට තිරයේ පහළ ඇති ප්‍රවේශ්‍යතා බොත්තම භාවිතා කරන්න.\n\n"<b>"විශාලනය කිරීමට"</b>", ප්‍රවේශ්‍යතා බොත්තම තට්ටු කර තිරයේ ඕනෑම තැනක තට්ටු කරන්න.\n"<ul><li>"අනුචලනය කිරීමට ඇඟිලි 2කක් හෝ ඊට වැඩි ගණනක් ඇඳගෙන යන්න"</li>\n<li>"විශාලනය සීරුමාරු කිරීමට ඇඟිලි 2කක් හෝ ඊට වැඩි ගණනක් පින්ච් කරන්න"</li></ul>\n\n<b>"තාවකාලිකව විශාලනය කිරීමට"</b>", ප්‍රවේශ්‍යතා බොත්තම තට්ටු කර තිරයේ ඕනෑම තැනක ස්පර්ශ කරගෙන සිටින්න.\n"<ul><li>"තිරය වටා යාමට අඳින්න"</li>\n<li>"විශාලනය අඩු කිරීමට ඇඟිල්ල ඔසවන්න"</li></ul>\n\n"යතුරු පුවරුව හෝ සංචලන තීරුව තුළට ඔබට විශාලනය කළ නොහැක."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"ප්‍රවේශ්‍යතා බොත්තම <xliff:g id="SERVICE">%1$s</xliff:g> වෙත සකසා ඇත. විශාලනය භාවිතා කිරීමට ප්‍රවේශ්‍යතා බොත්තම ස්පර්ශ කරගෙන විශාලනය තෝරන්න."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"ළඟාවිය හැකි කෙටිමග"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"ශබ්ද බොත්තම් කෙටිමඟ"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"කෙටිමඟ සේවා"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"අගුලු තිරයෙන් ඉඩ දෙන්න"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"කෙටිමඟ සක්‍රිය විට, ප්‍රවේශ්‍යතා අංගය සක්‍රිය කිරීමට ඔබට ශබ්ද බොත්තම් තත්පර 3කට ඔබාගෙන සිටිය හැක."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"කෙටිමඟ සක්‍රිය විට, ප්‍රවේශ්‍යතා අංගය සක්‍රිය කිරීමට ඔබට ශබ්ද බොත්තම් තත්පර 3කට ඔබාගෙන සිටිය හැක."</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">"තිර විශාලනය ස්වයංක්‍රීයව යාවත්කාලීන කරන්න"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"යෙදුම් සංක්‍රමණයේදී තිර විශාලනය යාවත්කාලීන කරන්න"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"ඇතැම් විට ක්‍රියාකාරිත්වයට බලපෑ හැක"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"දර්ශකය චලනය නැවතුණ පසු ක්ලික් කිරීම"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"ක්ලික් කිරීමට පෙර පමාව"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ක්‍රියාත්මකයි"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ක්‍රියාවිරහිතයි"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"ඉක්මන් සැකසීම් තුළ පෙන්වන්න"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g> වලින් තෝරා ගත් <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g> ගෙන් <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"සියල්ල තෝරන්න"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"සැලසුම් කළමනාකරණය කරන්න"</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>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"ජංගම ජාල"</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_metered_auto" msgid="1262028400911918865">"ස්වයංක්‍රිය"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"මනිනු ලැබේ"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"මනිනු නොලැබේ"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"ඔබගේ උපාංගයේ වාහක දත්ත ගිණුම් ගත කිරීම ඇතැම් විට වැර දේ."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"හදිසි ඇමතුම්"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"ඇමතුමට නැවත යන්න"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"ඇමතුම් කළමනාකරු"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"හදිසි විකාශන"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"හදිසි ඇඟවීම්"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"ජාල ක්‍රියාකරුවන්"</string>
     <string name="access_point_names" msgid="1381602020438634481">"ප්‍රවේශ ලක්ෂ්‍ය වල නම්"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"දියුණු කරන ලද 4G LTE ආකාරය"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"සඳහා වඩා කැමති SIM"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"සෑම වේලාවකම ආසන්න"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"තේරීමක් අවශ්‍යයි"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"SIM තේරීම"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"සැකසීම්"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="one">සඟවන ලද අයිතම %dක් පෙන්වන්න</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"යෙදුම් දැනුම්දීම්"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"දැනුම්දීම් ප්‍රවර්ගය"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"වැදගත්කම"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"යෙදුමට තීරණය කිරීමට ඉඩ දෙන්න"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"ශබ්දයට ඉඩ දෙන්න"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"දැනුම්දීම් කිසිදා නොපෙන්වන්න"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ශබ්ද හෝ දෘශ්‍ය බාධා නැත"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"ශබ්ද නැත"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"ශබ්ද කරන්න"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"ශබ්ද කර තිරය මත උත්පතනය කරන්න"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"තිරය මත උත්පතනය"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"පහළ"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"මධ්‍යම"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"ඉහළ"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"හදිසි"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"ශබ්දයට ඉඩ දෙන්න"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"ශබ්ද කිරීම, කම්පනය කිරීම, හෝ මෙම දැනුම්දීම් වත්මන් තිරයේ දසුන මතට එබිකම් කිරීම නොකරන්න."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"බාධා කිරීම්වලට ඉඩ දෙන්න"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"යෙදුමට ශබ්ද ඇති කිරීමට, කම්පනය වීමට, සහ/හෝ තිරය මත දැනුම්දීම් උත්පතනයට ඉඩ දෙන්න"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"අඩු වැදගත්කම"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"මධ්‍යම වැදගත්කම"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"වැඩි වැදගත්කම"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"පින්තූරය-තුළ-පින්තූරය පින්තූරය තුළ"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"පින්තූරය-තුළ-පින්තූරය"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"පින්තූරය-තුළ-පින්තූරය වෙත ඉඩ දෙන්න"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"මෙම යෙදුම විවෘතව තිබෙන අතරතුර හෝ එයින් ඉවත් වන විට පින්තූරය-තුළ-පින්තූරය කවුළුවක් සැදීමට ඉඩ දෙන්න (උදාහරණයකට, වීඩියෝව දිගටම බැලීමට). මෙම කවුළුව ඔබ භාවිතා කරන අනෙක් යෙදුම් උඩින් පෙන්වයි."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"මෙම යෙදුම විවෘතව තිබෙන අතරතුර හෝ එයින් ඉවත් වන විට පින්තූරය-තුළ-පින්තූරය කවුළුවක් සැදීමට ඉඩ දෙන්න (උදාහරණයකට, වීඩියෝව දිගටම බැලීමට). මෙම කවුළුව ඔබ භාවිතා කරන අනෙක් යෙදුම් උඩින් පෙන්වයි."</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>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"ගොනු හුවමාරු කරමින්"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"ඡායාරූප හුවමාරු කරමින් (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"උපාංගය MIDI ලෙස භාවිත කිරීම"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS Mirroring"</string>
     <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>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"රාත්‍රී ආලෝක කාලසටහන සකසන්න"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"ඇම්බර් වර්ණ තිරය මඟින් ඔබට නිදාගැනීමට උදව් කරයි"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"රාත්‍රී ආලෝකය ක්‍රියාත්මකයි"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"තිරය ඇම්බර් වර්ණ ගන්වා ඇත. මෙය ඔබට නින්දට පත් වීමට උදවු විය හැකිය."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"යෝජනා"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"වඩා සිසිල් සංදර්ශක වර්ණ භාවිත කිරීම"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"වර්ණ වෙනස් කිරීම යෙදීමට තිරය ක්‍රියාවිරහිත කරන්න"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telephony Monitor වෙනස්කම සක්‍රිය කිරීමට, උපාංගය නැවත පණ ගන්වන්න"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"කැමරා HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"කැමරා HAL HDR+ වෙනස් කිරීම යෙදීමට, උපාංගය නැවත පණ ගන්වන්න"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"කැමරා ලේසර් සංවේදකය"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ස්වයංක්‍රිය පද්ධති යාවත්කාලීන"</string>
     <string name="usage" msgid="2977875522080448986">"භාවිතය"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"ජංගම දත්ත භාවිතය"</string>
@@ -3410,7 +3427,7 @@
     <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="data_usage_template" msgid="2923744765873163859">"<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">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"මකා පරිවර්තනය කරන්න"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager අගය-සීමා කිරීම යළි සකසන්න"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager අගය-සීමා කිරීම යළි සකසා ඇත"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"අගුලු තිර දැනුම්දීම් පාලනය කරන්න"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"අගුලු තිරය මත පාලන තොරතුරු"</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="8483187649355540109">"සහාය සහ ඉඟි"</string>
@@ -3487,7 +3504,7 @@
     <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="2456198532288640046">"වෙනත් උපාංග වෙතට දෘශ්‍ය නොවේ"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"ක්‍රියාවිරහිතයි"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> වෙත සම්බන්ධිතයි"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"උපාංග කිහිපයකට සම්බන්ධිතයි"</string>
     <string name="demo_mode" msgid="2798762752209330277">"පද්ධති UI ආදර්ශන ප්‍රකාරය"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"ක්ෂණික යෙදුම්"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"යෙදුම්වල සබැඳි, ඒවා ස්ථාපනය කර නැති විටද විවෘත කරන්න"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"ක්ෂණික යෙදුම්"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"ක්ෂණික යෙදුම් ගිණුම"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"ක්ෂණික යෙදුම් මනාප"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ස්ථාපිත යෙදුම්"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"ඔබේ ගබඩාව දැන් ගබඩා කළමනාකරු විසින් පාලනය කරනු ලැබේ"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> සඳහා ගිණුම්"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"ඔබේ පුද්ගලික පැතිකඩ මත සැම විට ක්‍රියාත්මක VPN ක්‍රියාත්මකයි"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"ඔබේ කාර්යාල පැතිකඩ මත සැම විට ක්‍රියාත්මක VPN ක්‍රියාත්මකයි"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"ගෝලීය HTTP ප්‍රොක්සි සකසන ලදී"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"විශ්වාසි අක්තපත්‍ර"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"විශ්වාසි අක්තපත්‍ර"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"ඔබගේ පුද්ගලික පැතිකඩෙහි විශ්වාසී අක්තපත්‍ර"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"ඔබගේ වැඩ පැතිකඩෙහි විශ්වාසී අක්තපත්‍ර"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">අඩුම වශයෙන් CA සහතික <xliff:g id="COUNT_1">%d</xliff:g>ක්</item>
       <item quantity="other">අඩුම වශයෙන් CA සහතික <xliff:g id="COUNT_1">%d</xliff:g>ක්</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"වාහක ප්‍රතිපාදන තතු"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"උත්ප්‍රේරක වාහක ප්‍රතිපාදන"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"අලුත් සහ උද්යෝගිමත් දේවල් මොනවාද?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ඉහළම විශේෂාංග 5 පරීක්ෂා කරන්න"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"ඔබගේ නව දුරකථනය ගැන දැන ගන්න"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ඔබගේ නව ටැබ්ලට් පරිගණකය ගැන දැන ගන්න"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"ඔබගේ නව උපාංගය ගැන දැන ගන්න"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"මෙම අංගය මෙම උපාංගයේ ලබා ගත නොහැක"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS ලියාපදිංචි තත්ත්වය"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"ලියාපදිංචි වී ඇත"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"ලියාපදිංචි වී නැත"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 48a2f8d..1f13d7e 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -168,7 +168,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Zariadenie %1$s chce získať prístup k vašim správam. Chcete zariadeniu %2$s tento prístup umožniť?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Žiadosť o prístup k SIM karte"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Zariadenie <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> chce pristupovať k vašej SIM karte. Udelenie prístupu k SIM karte zakáže na vašom zariadení dátové pripojenie po dobu jeho trvania. Udeliť prístup zariadeniu <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Viditeľné pre ostatné zariadenia ako <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Viditeľné pre ostatné zariadenia ako <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaše zariadenia"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Párovanie nového zariadenia"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Dátum a čas"</string>
@@ -378,6 +378,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Ďalej"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Preskočiť odtlačok prsta?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Nastavenie odtlačku prsta trvá približne minútu. Ak tento krok preskočíte, môžete si odtlačok prsta pridať neskôr v Nastaveniach."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Preskočiť zámku obrazovky?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Funkcie ochrany zariadenia sa nezapnú. V prípade straty, krádeže alebo obnovenia nebudete môcť cudzím osobám zabrániť v používaní tohto tabletu."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Funkcie ochrany zariadenia sa nezapnú. V prípade straty, krádeže alebo obnovenia nebudete môcť cudzím osobám zabrániť v používaní tohto zariadenia."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Funkcie ochrany zariadenia sa nezapnú. V prípade straty, krádeže alebo obnovenia nebudete môcť cudzím osobám zabrániť v používaní tohto telefónu."</string>
@@ -417,6 +420,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Pridali ste maximálny počet odtlačkov prstov"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Nie je možné pridať ďalšie odtlačky prstov"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Odstrániť všetky odtlačky prstov?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Odstránenie odtlačku prsta <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Chcete tento odtlačok prsta odstrániť?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Pomocou odtlačkov prstov nebudete môcť odomknúť telefón, schvaľovať nákupy ani sa prihlásiť do aplikácií."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Pomocou odtlačkov prstov nebudete môcť odomknúť pracovný profil, schváliť nákupy ani sa prihlásiť do pracovných aplikácií."</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Áno, odstrániť"</string>
@@ -461,7 +466,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Chráňte svoj tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Chráňte svoje zariadenie"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Chráňte svoje telefón"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Získajte vyššiu bezpečnosť a nastavte si dodatočnú zámku obrazovky."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Získajte vyššiu bezpečnosť a nastavte si dodatočnú zámku obrazovky."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Aktivujte funkcie ochrany zariadenia a zabráňte tak ostatným v používaní tohto tabletu bez vášho povolenia. Vyberte zámku obrazovky, ktorú chcete používať."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Aktivujte funkcie ochrany zariadenia a zabráňte tak ostatným v používaní tohto zariadenia bez vášho povolenia. Vyberte zámku obrazovky, ktorú chcete používať."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Aktivujte funkcie ochrany zariadenia a zabráňte tak ostatným v používaní tohto telefónu bez vášho povolenia. Vyberte zámku obrazovky, ktorú chcete používať."</string>
@@ -503,37 +508,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Odstrániť ochranu zariadenia?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Odstrániť ochranu profilu?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Funkcie ochrany zariadenia nebudú bez vášho vzoru fungovať."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Funkcie ochrany zariadenia nebudú fungovať bez vášho vzoru.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Funkcie ochrany zariadenia nebudú fungovať bez vášho vzoru.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Z tohto zariadenia sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj telefón, schvaľovať nákupy ani sa prihlasovať do aplikácií.“"</string>
+</xliff:g>Z tohto zariadenia sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj telefón, schvaľovať nákupy ani sa prihlasovať do aplikácií."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Funkcie ochrany zariadenia nebudú fungovať bez vášho kódu PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Funkcie ochrany zariadenia nebudú fungovať bez vášho kódu PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Funkcie ochrany zariadenia nebudú fungovať bez vášho kódu PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Z tohto zariadenia sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj telefón, schvaľovať nákupy ani sa prihlasovať do aplikácií.“"</string>
+</xliff:g>Z tohto zariadenia sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj telefón, schvaľovať nákupy ani sa prihlasovať do aplikácií."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Funkcie ochrany zariadenia nebudú fungovať bez vášho hesla."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Funkcie ochrany zariadenia nebudú fungovať bez vášho hesla.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Funkcie ochrany zariadenia nebudú fungovať bez vášho hesla.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Z tohto zariadenia sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj telefón, schvaľovať nákupy ani sa prihlasovať do aplikácií.“"</string>
+</xliff:g>Z tohto zariadenia sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj telefón, schvaľovať nákupy ani sa prihlasovať do aplikácií."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Funkcie ochrany zariadenia nebudú fungovať bez vašej zámky obrazovky."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Funkcie ochrany zariadenia nebudú fungovať bez vašej zámky obrazovky.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Funkcie ochrany zariadenia nebudú fungovať bez vašej zámky obrazovky.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Z tohto zariadenia sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj telefón, schvaľovať nákupy ani sa prihlasovať do aplikácií.“"</string>
+</xliff:g>Z tohto zariadenia sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj telefón, schvaľovať nákupy ani sa prihlasovať do aplikácií."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Funkcie ochrany zariadenia nebudú fungovať bez vášho bezpečnostného vzoru."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Funkcie na ochranu zariadenia nebudú fungovať bez vášho bezpečnostného vzoru.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Funkcie ochrany profilu nebudú fungovať bez vášho bezpečnostného vzoru.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Vaše uložené odtlačky prstov budú tiež odstránené z tohto profilu, takže nebudete môcť odomknúť profil, schvaľovať nákupy ani sa pomocou nich prihlásiť do aplikácií."</string>
+</xliff:g>Z tohto profilu sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj profil, schvaľovať nákupy ani sa prihlasovať do aplikácií."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Funkcie ochrany zariadenia nebudú fungovať bez vášho kódu PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Funkcie ochrany zariadenia nebudú fungovať bez vášho kódu PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Funkcie ochrany profilu nebudú fungovať bez vášho kódu PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Vaše uložené odtlačky prstov budú tiež odstránené z tohto profilu, takže nebudete môcť odomknúť profil, schvaľovať nákupy ani sa pomocou nich prihlásiť do aplikácií."</string>
+</xliff:g>Z tohto profilu sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj profil, schvaľovať nákupy ani sa prihlasovať do aplikácií."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Funkcie na ochranu zariadenia nebudú fungovať bez vášho hesla."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Funkcie na ochranu zariadenia nebudú fungovať bez vášho hesla.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Funkcie ochrany profilu nebudú fungovať bez vášho hesla.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Vaše uložené odtlačky prstov budú tiež odstránené z tohto profilu, takže nebudete môcť odomknúť profil, schvaľovať nákupy ani sa pomocou nich prihlásiť do aplikácií."</string>
+</xliff:g>Z tohto profilu sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj profil, schvaľovať nákupy ani sa prihlasovať do aplikácií."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Funkcie ochrany zariadenia nebudú fungovať bez vašej zámky obrazovky."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Funkcie ochrany zariadenia nebudú fungovať bez vašej zámky obrazovky.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Funkcie ochrany profilu nebudú fungovať bez vašej zámky obrazovky.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Vaše uložené odtlačky prstov budú tiež odstránené z tohto profilu, takže nebudete môcť odomknúť profil, schvaľovať nákupy ani sa pomocou nich prihlásiť do aplikácií."</string>
+</xliff:g>Z tohto profilu sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj profil, schvaľovať nákupy ani sa prihlasovať do aplikácií."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Áno, odstrániť"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Zmena bezpečnostného vzoru"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Zmena bezpečnostného kódu PIN"</string>
@@ -604,6 +609,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Vzostupná, zostupná alebo opakovaná sekvencia čísiel nie je povolená"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Zrušiť"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Vymazať"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Zrušiť"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Ďalej"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Nastavenie je dokončené."</string>
@@ -838,6 +844,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je k dispozícii"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je k dispozícii)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Zadajte heslo siete"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Sieť Wi‑Fi operátora"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Pripojené prostredníctvom operátora <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> chce zapnúť vyhľadávanie sietí (z dôvodu dosiahnutia vyššej presnosti určovania polohy aj z iných dôvodov) a hľadať siete aj v prípade, že je vypnutý modul Wi‑Fi.\n\nChcete túto možnosť povoliť všetkým aplikáciám, ktoré chcú vyhľadávať siete?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Ak chcete toto nastavenie vypnúť, prejdite na položku Rozšírené v rozšírenej ponuke."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Povoliť"</string>
@@ -855,6 +863,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Pripojiť"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nepodarilo sa pripojiť k sieti"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Odstrániť"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Upraviť"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Sieť sa nepodarilo odstrániť"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Uložiť"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Nepodarilo sa uložiť sieť"</string>
@@ -869,6 +878,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi‑Fi, rozšírené"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adresa MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Adresa IP"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Informácie o sieti"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska podsiete"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Adresy IPv6"</string>
@@ -901,16 +911,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Zrušiť pozvánku?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Chcete zrušiť pozvánku na spojenie s klientom <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Odstrániť túto skupinu?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Prenosný hotspot Wi‑Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Hotspot Wi‑Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"S inými zariadeniami sa nezdieľa internet ani obsah"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Internetové pripojenie tohto tabletu sa zdieľa cez hotspot"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Internetové pripojenie tohto telefónu sa zdieľa cez hotspot"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplikácia zdieľa obsah. Ak chcete zdieľať internetové pripojenie, vypnite hotspot a potom ho zapnite."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Názov siete Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Názov hotspotu"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Zapína sa hotspot <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Iné zariadenia sa môžu pripojiť k hotspotu <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Heslo siete Wi‑Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Heslo hotspotu"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Pásmo pre prístupový bod"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Použite hotspot na vytvorenie siete Wi‑Fi pre ostatné zariadenia. Hotspot poskytuje internet pomocou mobilného dátového pripojenia. Môžu vám byť účtované ďalšie poplatky za mobilné dáta."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikácie tiež môžu vytvoriť hostpot na zdieľanie obsahu so zariadeniami v okolí."</string>
@@ -962,7 +971,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Aktualizácia tiesňovej 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="emergency_address_summary" msgid="3266760199681945746">"Adresa, ktorú tiesňové služby použijú ako vašu polohu, ak uskutočníte tiesňové volanie pomocou siete Wi‑Fi."</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Obrazovka"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Hlasitosti"</string>
@@ -1016,6 +1025,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Hľadať"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Správa nastavení a histórie vyhľadávaní"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Žiadne výsledky"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Vymazať históriu"</string>
     <string name="display_settings" msgid="7965901687241669598">"Obrazovka"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Automaticky otáčať obrazovku"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Živé farby"</string>
@@ -1350,8 +1360,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Prebieha obnovovanie predvolených nastavení názvu prístupového bodu (APN)."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Obnoviť predvolené"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Predvolené nastavenia prístupových bodov boli obnovené"</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Obnoviť"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Obnovenie nastavení siete"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Obnovenie možností"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Sieť, aplikácie a zariadenie sa dajú obnoviť"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Resetovať Wi‑Fi, dáta a Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Touto akciou obnovíte nastavenia všetkých sietí vrátane\n\n"<li>"Wi‑Fi"</li>\n<li>"mobilnej siete"</li>\n<li>"siete Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Obnoviť nastavenia"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Chcete resetovať všetky nastavenia sietí? Túto akciu nie je možné vrátiť späť."</string>
@@ -1359,14 +1370,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Resetovať?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Tento používateľ nemôže resetovať nastavenia siete"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Sieťové nastavenia boli obnovené"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Obnovenie výrobných nastavení"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="few">Obnovia sa <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> účty</item>
-      <item quantity="many">Obnoví sa <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> účtu</item>
-      <item quantity="other">Obnoví sa <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> účtov</item>
-      <item quantity="one">Obnoví sa 1 účet</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Obnovia sa všetky dáta a vnútorné úložisko"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Vymazať všetky dáta (obnovenie výrobných nastavení)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Táto operácia vymaže všetky dáta v "<b>"internom úložisku"</b>" tabletu, vrátane:\n\n"<li>"účtu Google"</li>\n<li>"dát a nastavení systému a aplikácií"</li>\n<li>"stiahnutých aplikácií"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Táto operácia vymaže všetky dáta v "<b>"internom úložisku"</b>" telefónu, vrátane:\n\n"<li>"účtu Google"</li>\n<li>"dát a nastavení systému a aplikácií"</li>\n<li>"stiahnutých aplikácií"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Aktuálne ste prihlásení do nasledujúcich účtov:\n"</string>
@@ -1490,15 +1494,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Bezpečnostné informácie"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nemáte dátové pripojenie. Ak chcete tieto informácie zobraziť teraz, prejdite v ľubovoľnom počítači pripojenom na Internet na adresu %s."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Načítava sa…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Zvoľte si heslo"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Nastavenie zámky obrazovky"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Z bezpečnostných dôvodov si nastavte heslo"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Ak chcete použiť odtlačok prsta, nastavte heslo"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Zvoľte si vzor"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Ak chcete použiť odtlačok prsta, nastavte vzor"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Zvoľte si PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Z bezpečnostných dôvodov si nastavte kód PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Ak chcete použiť odtlačok prsta, nastavte PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Potvrďte heslo"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Znova zadajte heslo"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrďte svoj vzor"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Potvrďte kód PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Znova zadajte kód PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Heslá sa nezhodujú"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Kódy PIN nie sú zhodné"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Spôsob odomknutia"</string>
@@ -1511,12 +1516,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Ak chcete pokračovať, použite pracovný bezpečnostný vzor"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Ak chcete pokračovať, zadajte pracovný kód PIN"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Ak chcete pokračovať, zadajte pracovné heslo"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Ak chcete pokračovať, použite bezpečnostný vzor zariadenia. Vyžaduje sa po reštartovaní zariadenia."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Ak chcete pokračovať, zadajte kód PIN zariadenia. Vyžaduje sa po reštartovaní zariadenia."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Ak chcete pokračovať, zadajte heslo zariadenia. Vyžaduje sa po reštartovaní zariadenia."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Ak chcete pokračovať, použite pracovný bezpečnostný vzor. Vyžaduje sa po reštartovaní zariadenia."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Ak chcete pokračovať, zadajte pracovný kód PIN. Vyžaduje sa po reštartovaní zariadenia."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Ak chcete pokračovať, zadajte pracovné heslo. Vyžaduje sa po reštartovaní zariadenia."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Zadajte bezpečnostný vzor zariadenia a získajte vyššiu mieru zabezpečenia"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Zadajte kód PIN zariadenia a získajte vyššiu mieru zabezpečenia"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Zadajte heslo zariadenia a získajte vyššiu mieru zabezpečenia"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Zadajte bezpečnostný pracovný vzor a získajte vyššiu mieru zabezpečenia"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Zadajte pracovný kód PIN a získajte vyššiu mieru zabezpečenia"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Zadajte pracovné heslo a získajte vyššiu mieru zabezpečenia"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"V telefóne boli obnovené výrobné nastavenia. Ak ho chcete použiť, zadajte predchádzajúci vzor."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"V telefóne boli obnovené výrobné nastavenia. Ak ho chcete použiť, zadajte predchádzajúci PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"V telefóne boli obnovené výrobné nastavenia. Ak ho chcete použiť, zadajte predchádzajúce heslo."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Overenie vzoru"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Overenie kódu PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Overenie hesla"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Nesprávny kód PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Nesprávne heslo"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Nesprávny vzor"</string>
@@ -1821,13 +1832,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vytvoriť miniaplikáciu a povoliť prístup?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Po vytvorení miniaplikácie bude môcť hostiteľ <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> získať prístup ku všetkým údajom, ktoré miniaplikácia zobrazuje."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Vždy povoliť aplikácii <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> vytvárať miniaplikácie a pristupovať k ich údajom"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> dní <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> min <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> min"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Štatistiky používania"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Štatistiky používania"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Zoradiť podľa:"</string>
@@ -1839,7 +1843,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Čítačky obrazovky, zobrazenie, ovládacie prvky interakcie"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Pre slabozrakých"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Zariadenie môžete prispôsobiť, aby zodpovedalo vašim potrebám. Tieto funkcie dostupnosti môžete neskôr zmeniť v Nastaveniach."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Zväčšiť veľkosť písma"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Zmeniť veľkosť písma"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Čítačky obrazovky"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Zvuk a text na obrazovke"</string>
     <string name="display_category_title" msgid="685461049938269166">"Zobrazenie"</string>
@@ -1860,10 +1864,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Ak chcete zobrazenie priblížiť"</b>", trikrát rýchlo klepnite na obrazovku.\n"<ul><li>"Zobrazenie posuniete presunutím dvoch alebo viacerých prstov po obrazovke."</li>\n<li>"Priblíženie upravíte priblížením dvoch alebo viacerých prstov."</li></ul>\n\n<b>"Zobrazenie dočasne priblížite"</b>" tak, že trikrát rýchlo klepnete na obrazovku jedným prstom a po poslednom klepnutí prst pridržíte.\n"<ul><li>"Obrazovku môžete posúvať presúvaním prsta."</li>\n<li>"Zdvihnutím prsta zobrazenie oddialite."</li></ul>\n\n"Klávesnica ani navigačný panel sa nedajú priblížiť."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Keď je funkcia priblíženia zapnutá, môžete pomocou tlačidla dostupnosti v dolnej časti obrazovky zobrazenie rýchlo priblížiť.\n\n"<b>"Zobrazenie priblížite"</b>" klepnutím na tlačidlo dostupnosti a následne na ľubovoľné miesto na obrazovke.\n"<ul><li>"Zobrazenie posuniete presúvaním dvoch alebo viacerých prstov."</li>\n<li>"Priblíženie upravíte priblížením dvoch alebo viacerých prstov."</li></ul>\n\n<b>"Ak chcete zobrazenie priblížiť iba dočasne"</b>", klepnite na tlačidlo dostupnosti a následne sa dotknite ľubovoľného miesta na obrazovke a podržte ho.\n"<ul><li>"Obrazovku môžete posúvať presúvaním prsta."</li>\n<li>"Zdvihnutím prsta zobrazenie oddialite."</li></ul>\n\n"Klávesnica ani navigačný panel sa nedajú priblížiť."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Tlačidlo dostupnosti je nastavené na službu <xliff:g id="SERVICE">%1$s</xliff:g>. Ak chcete použiť priblíženie, klepnite na tlačidlo dostupnosti, podržte ho a potom vyberte priblíženie."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Skratka dostupnosti"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Skratka klávesa hlasitosti"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Služba klávesových skratiek"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Povoliť z uzamknutej obrazovky"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Keď je klávesová skratka zapnutá, stlačením obidvoch tlačidiel hlasitosti na tri sekundy spustíte funkciu dostupnosti."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Keď je klávesová skratka zapnutá, stlačením obidvoch klávesov hlasitosti na tri sekundy spustíte funkciu dostupnosti."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Text s vysokým kontrastom"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Auto. aktualiz. priblíž. obrazovky"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Aktualizovať priblíž. obrazov. pri prechodoch apl."</string>
@@ -1876,7 +1880,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Môže ovplyvniť výkonnosť"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Kliknutie po zastavení kurzora"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Oneskorenie pred kliknutím"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ZAPNUTÉ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"VYPNUTÉ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Zobraziť v Rýchlych nastaveniach"</string>
@@ -2402,6 +2405,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"vybraté: <xliff:g id="NUMBER">%1$d</xliff:g> z <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Vybrať všetko"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Spravovať plány"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Spotreba dát"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Spotreba dát apl."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Účtovanie dát operátorom sa môže líšiť od údajov zariadenia."</string>
@@ -2487,6 +2491,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilné siete"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Merané siete Wi‑Fi"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Ak chcete vybrať merané siete, zapnite Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automaticky"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"S meraním dát"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Bez merania dát"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Účtovanie dát operátorom sa môže líšiť od údajov zariadenia."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Tiesňové volanie"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Späť na hovor"</string>
@@ -2712,7 +2719,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Správca hovorov"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Tiesňové správy"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Tiesňové upozornenia"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Sieťoví operátori"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Názvy prístupových bodov"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Zlepšený režim 4G LTE"</string>
@@ -2781,6 +2788,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Preferovaná SIM karta pre"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Vždy sa opýtať"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Vyžaduje sa výber"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Výber SIM karty"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Nastavenia"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="few">Zobraziť %d skryté položky</item>
@@ -2936,18 +2944,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Upozornenia aplikácií"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategória upozornenia"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Dôležitosť"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Umožnite aplikácii rozhodovať sa"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Povoliť zvuk"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nikdy nezobrazovať upozornenia"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Bez zvuku a vizuálneho vyrušenia"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Bez zvuku"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Vydať zvukový signál"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Vydať zvukový signál a vyskočiť na obrazovku"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Vyskočiť na obrazovke"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Nízka"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Stredná"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Vysoká"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Neodkladná"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Povoliť zvuk"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Bez zvukov, vibrovania alebo posunutia do zobrazenia na aktuálnej obrazovke"</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Povoliť vyrušenia"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Povoliť aplikácii prehrávať zvuk, vibrovať alebo zobrazovať upozornenia na obrazovke"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Nízka dôležitosť"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Stredná dôležitosť"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Vysoká dôležitosť"</string>
@@ -2980,7 +2989,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"obraz v obraze"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Obraz v obraze"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Povoliť obraz v obraze"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Povoliť tejto aplikácii vytvoriť okno obrazu v obraze, kým je otvorená alebo keď ju opustíte (napríklad pokračovanie v pozeraní videa). Toto okno sa zobrazuje cez ďalšie aplikácie, ktoré používate."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Povoľte tejto aplikácii vytvoriť okno obrazu v obraze, kým je otvorená alebo keď ju opustíte (napríklad pokračovanie v pozeraní videa). Toto okno sa zobrazuje cez ďalšie aplikácie, ktoré používate."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Prístup k režimu Nerušiť"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Prístup k nastaveniu Nerušiť si nevyžiadali žiadne nainštalované aplikácie"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Načítavajú sa aplikácie..."</string>
@@ -3303,6 +3312,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Prenos súborov"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Prenos fotiek (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Zariadenie sa používa v režime MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Zrkadlenie SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Kontrola na pozadí"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Úplný prístup na pozadí"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Použiť text z obrazovky"</string>
@@ -3449,6 +3459,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="night_display_suggestion_title" msgid="6602129097059325291">"Nastavenie harmonogramu Nočného režimu"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Zafarbiť obrazovku dožlta na jednoduchšie zaspávanie"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Nočný režim je zapnutý"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Obrazovka je zafarbená na žltohnedo, vďaka čomu sa vám bude lepšie zaspávať."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Návrhy"</string>
@@ -3471,6 +3483,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Používať studenšie farby obrazovky"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Ak chcete použiť zmenu farby, vypnite obrazovku"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Ak chcete použiť zmenu monitorovania telefonických služieb, reštartujte zariadenie"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Režim HAL HDR+ fotoaparátu"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Ak chcete uplatniť zmenu režimu HAL HDR+ fotoaparátu, reštartujte zariadenie"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Laserový snímač fotoaparátu"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatické aktualizácie systému"</string>
     <string name="usage" msgid="2977875522080448986">"Spotreba"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Spotreba mobilných dát"</string>
@@ -3498,7 +3513,7 @@
     <string name="data_warning" msgid="209133958008062117">"Dátové upozornenie"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Nastaviť dátový limit"</string>
     <string name="data_limit" msgid="1885406964934590552">"Dátový limit"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> ste spotrebovali <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g> spotreba <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurovať"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Iné aplikácie zahrnuté v prehľade spotreby dát"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3571,7 +3586,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Vymazať a konvertovať"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Resetovať obmedzovanie frekvencie žiadostí v službe ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Obmedzovanie frekvencie žiadostí v službe ShortcutManager bolo resetované"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Ovládajte upozornenia na zamk. obrazovke"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Ovládajte informácie na uzamknutej 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="8483187649355540109">"Podpora a tipy"</string>
@@ -3579,7 +3594,7 @@
     <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>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Za prémiové správy SMS sa môžu účtovať poplatky, ktoré sa naúčtujú na faktúru operátora. Ak aktivujete toto povolenie pre aplikáciu, budete môcť pomocou nej posielať prémiové správy SMS."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Prístup k prémiovým správam SMS"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Neviditeľné pre ostatné zariadenia"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Vypnuté"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Pripojené k zariadeniu <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Pripojené k viacerým zariadeniam"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Ukážka používateľského rozhrania systému"</string>
@@ -3687,7 +3702,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Okamžité aplikácie"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Otvárajte odkazy v aplikáciách, aj keď nie sú nainštalované"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Okamžité aplikácie"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Účet okamžitých aplikácií"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Predvoľby okamžitých aplikácií"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Nainštalované aplikácie"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Vaše úložisko odteraz riadi správca úložiska"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Účty používateľa <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3738,7 +3753,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Trvalé pripojenie k sieti VPN je zapnuté vo vašom osobnom profile"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Trvalé pripojenie k sieti VPN je zapnuté vo vašom pracovnom profile"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Bol nastavený globálny proxy server protokolu HTTP"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Dôveryhodné poverenia"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Dôveryhodné poverenia"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Dôveryhodné poverenia vo vašom osobnom profile"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Dôveryhodné poverenia vo vašom pracovnom profile"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="few">Minimálne <xliff:g id="COUNT_1">%d</xliff:g> certifikáty CA</item>
       <item quantity="many">Minimálne <xliff:g id="COUNT_1">%d</xliff:g> certifikátu CA</item>
@@ -3811,7 +3828,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informácie o poskytovaní služieb operátorom"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Spustiť poskytovanie služieb operátorom"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Aké sú najaktuálnejšie novinky?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Prezrite si 5 najlepších funkcií"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Pozrite si prehliadku nového telefónu"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Pozrite si prehliadku nového tabletu"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Pozrite si prehliadku nového zariadenia"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Táto funkcia nie je v zariadení k dispozícii"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Stav registrácie IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrované"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Neregistrované"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index b23b67f..33e8b86 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -168,7 +168,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s želi dostopati do vaših sporočil. Želite omogočiti dostop za %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Zahteva za dostop do kartice SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> želi dostopati do vaše kartice SIM. Z omogočanjem dostopa do kartice SIM bodo v napravi za čas trajanja povezave onemogočene podatkovne povezave. Omogočite dostop za <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Drugim napravam vidno kot »<xliff:g id="DEVICE_NAME">^1</xliff:g>«"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Drugim napravam vidno kot »<xliff:g id="DEVICE_NAME">^1</xliff:g>«"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaše naprave"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Seznanitev nove naprave"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum in ura"</string>
@@ -378,6 +378,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Naprej"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Preskok nast. prstnega odtisa?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Nastavitev prstnega odtisa vam bo vzela le minuto ali dve. Če nastavitev preskočite, lahko prstni odtis dodate pozneje v nastavitvah."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Preskok zaklepanja zaslona?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Funkcije za zaščito naprave ne bodo vklopljene. Če tablični računalnik izgubite, vam ga ukradejo ali ponastavijo na tovarniške nastavitve, drugim osebam ne boste mogli preprečiti njegove uporabe."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Funkcije za zaščito naprave ne bodo vklopljene. Če napravo izgubite, vam jo ukradejo ali ponastavijo na tovarniške nastavitve, drugim osebam ne boste mogli preprečiti njene uporabe."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Funkcije za zaščito naprave ne bodo vklopljene. Če telefon izgubite, vam ga ukradejo ali ponastavijo na tovarniške nastavitve, drugim osebam ne boste mogli preprečiti njegove uporabe."</string>
@@ -417,6 +420,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Dodali ste največje dovoljeno število prstnih odtisov"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Prstnih odtisov ni več mogoče dodati"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Odstranitev vseh prstnih odtisov?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Odstrani »<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>«"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Ali želite izbrisati ta prstni odtis?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Za odklepanje telefona, odobritev nakupov ali prijavo v aplikacije ne boste mogli uporabljati prstnih odtisov."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Za odklepanje delovnega profila, odobritev nakupov ali prijavo v delovne aplikacije, ne boste mogli uporabljati prstnih odtisov."</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Da, odstrani"</string>
@@ -461,7 +466,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Zaščita tablič. račun."</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Zaščita naprave"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Zaščita telefona"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Zaradi večje varnosti nastavite nadomestno zaklepanje zaslona."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Zaradi večje varnosti nastavite nadomestno zaklepanje zaslona."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Vklopite zaščitne funkcije naprave, da drugim preprečite uporabo tega tabličnega računalnika brez vašega dovoljenja. Izberite zaklepanje zaslona, ki ga želite uporabljati."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Vklopite zaščitne funkcije naprave, da drugim preprečite njeno uporabo brez vašega dovoljenja. Izberite zaklepanje zaslona, ki ga želite uporabljati."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Vklopite zaščitne funkcije naprave, da drugim preprečite uporabo tega telefona brez vašega dovoljenja. Izberite zaklepanje zaslona, ki ga želite uporabljati."</string>
@@ -503,37 +508,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Želite odstraniti zaščito naprave?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Želite odstraniti zaščito profila?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Funkcije za zaščito naprave ne bodo delovale brez vzorca."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Funkcije za zaščito naprave ne bodo delovale brez vzorca.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Funkcije za zaščito naprave ne bodo delovale brez vzorca.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Shranjeni prstni odtisi bodo prav tako odstranjeni iz te naprave in z njimi ne boste mogli odkleniti telefona, omogočiti nakupov ali se prijaviti v aplikacije.«"</string>
+</xliff:g>Iz naprave bodo prav tako odstranjeni shranjeni prstni odtisi, tako da z njimi ne boste mogli odkleniti telefona, odobriti nakupov ali se prijaviti v aplikacije."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Funkcije za zaščito naprave ne bodo delovale brez kode PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Funkcije za zaščito naprave ne bodo delovale brez kode PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Funkcije za zaščito naprave ne bodo delovale brez kode PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Shranjeni prstni odtisi bodo prav tako odstranjeni iz te naprave in z njimi ne boste mogli odkleniti telefona, omogočiti nakupov ali se prijaviti v aplikacije.«"</string>
+</xliff:g>Iz naprave bodo prav tako odstranjeni shranjeni prstni odtisi, tako da z njimi ne boste mogli odkleniti telefona, odobriti nakupov ali se prijaviti v aplikacije."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Funkcije za zaščito naprave ne bodo delovale brez gesla."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Funkcije za zaščito naprave ne bodo delovale brez gesla.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Funkcije za zaščito naprave ne bodo delovale brez gesla.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Shranjeni prstni odtisi bodo prav tako odstranjeni iz te naprave in z njimi ne boste mogli odkleniti telefona, omogočiti nakupov ali se prijaviti v aplikacije.«"</string>
+</xliff:g>Iz naprave bodo prav tako odstranjeni shranjeni prstni odtisi, tako da z njimi ne boste mogli odkleniti telefona, odobriti nakupov ali se prijaviti v aplikacije."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Funkcije za zaščito naprave ne bodo delovale brez zaklepanja zaslona."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Funkcije za zaščito naprave ne bodo delovale brez zaklepanja zaslona.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Funkcije za zaščito naprave ne bodo delovale brez zaklepanja zaslona.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Shranjeni prstni odtisi bodo prav tako odstranjeni iz te naprave in z njimi ne boste mogli odkleniti telefona, omogočiti nakupov ali se prijaviti v aplikacije.«"</string>
+</xliff:g>Iz naprave bodo prav tako odstranjeni shranjeni prstni odtisi, tako da z njimi ne boste mogli odkleniti telefona, odobriti nakupov ali se prijaviti v aplikacije."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Funkcije za zaščito profila ne bodo delovale brez vzorca."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Funkcije za zaščito profila ne bodo delovale brez vzorca.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Funkcije za zaščito profila ne bodo delovale brez vzorca.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Iz profila bodo izbrisani tudi shranjeni prstni odtisi, tako da z njimi ne boste mogli odkleniti profila, dovoliti nakupov ali se prijaviti v aplikacije.«"</string>
+</xliff:g>Iz profila bodo prav tako odstranjeni shranjeni prstni odtisi, tako da z njimi ne boste mogli odkleniti profila, odobriti nakupov ali se prijaviti v aplikacije."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Funkcije za zaščito profila ne bodo delovale brez kode PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Funkcije za zaščito profila ne bodo delovale brez kode PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Funkcije za zaščito profila ne bodo delovale brez kode PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Iz profila bodo izbrisani tudi shranjeni prstni odtisi, tako da z njimi ne boste mogli odkleniti profila, dovoliti nakupov ali se prijaviti v aplikacije.«"</string>
+</xliff:g>Iz profila bodo prav tako odstranjeni shranjeni prstni odtisi, tako da z njimi ne boste mogli odkleniti profila, odobriti nakupov ali se prijaviti v aplikacije."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Funkcije za zaščito profila ne bodo delovale brez gesla."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Funkcije za zaščito profila ne bodo delovale brez gesla.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Funkcije za zaščito profila ne bodo delovale brez gesla.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Iz profila bodo izbrisani tudi shranjeni prstni odtisi, tako da z njimi ne boste mogli odkleniti profila, dovoliti nakupov ali se prijaviti v aplikacije.«"</string>
+</xliff:g>Iz profila bodo prav tako odstranjeni shranjeni prstni odtisi, tako da z njimi ne boste mogli odkleniti profila, odobriti nakupov ali se prijaviti v aplikacije."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Funkcije za zaščito profila ne bodo delovale brez zaklepanja zaslona."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Funkcije za zaščito profila ne bodo delovale brez zaklepanja zaslona.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Funkcije za zaščito profila ne bodo delovale brez zaklepanja zaslona.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Iz profila bodo izbrisani tudi shranjeni prstni odtisi, tako da z njimi ne boste mogli odkleniti profila, dovoliti nakupov ali se prijaviti v aplikacije.«"</string>
+</xliff:g>Iz profila bodo prav tako odstranjeni shranjeni prstni odtisi, tako da z njimi ne boste mogli odkleniti profila, odobriti nakupov ali se prijaviti v aplikacije."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Da, odstrani"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Spremeni vzorec za odklepanje"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Spremeni kodo PIN za odklepanje"</string>
@@ -604,6 +609,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Naraščajoč, padajoč ali ponavljajoč se niz števk je prepovedan."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"V redu"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Prekliči"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Izbriši"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Prekliči"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Naprej"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Namestitev je končana."</string>
@@ -838,6 +844,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je na voljo"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je na voljo)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Vnesite geslo za omrežje"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Omrežje Wi‑Fi operaterja"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Povezava prek omrežja <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Za izboljšanje natančnosti lokacijskih podatkov in druge namene želi <xliff:g id="APP_NAME">%1$s</xliff:g> vklopiti iskanje omrežij, tudi ko je Wi-Fi izklopljen.\n\nŽelite to dovoliti vsem aplikacijam, ki želijo iskati omrežja?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Če želite to možnost izklopiti, v meniju z dodatnimi elementi odprite »Dodatno«."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Dovoli"</string>
@@ -855,6 +863,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Vzpostavi povezavo"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Vzpostavljanje povezave z omrežjem ni uspelo"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Pozabi"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Spremeni"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Pozabljanje omrežja ni uspelo"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Shrani"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Shranjevanje omrežja ni uspelo"</string>
@@ -869,6 +878,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Dodatne nast. za Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Naslov MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Naslov IP"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Podatki o omrežju"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska podomrežja"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Naslovi IPv6"</string>
@@ -901,16 +911,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Želite preklicati povabilo?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Ali želite preklicati povabilo za povezavo z napravo <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Želite pozabiti to skupino?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Prenosna dostopna točka Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Dostopna točka Wi-Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Internetna povezava ali vsebina ni v skupni rabi z drugimi napravami"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Skupna raba internetne povezave tega tabličnega računalnika prek dostopne točke"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Skupna raba internetne povezave tega telefona prek dostopne točke"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplikacija daje vsebino v skupno rabo. Če želite omogočiti skupno rabo internetne povezave, dostopno točko izklopite in znova vklopite."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Ime dostopne točke Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Ime dostopne točke"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Vklapljanje dostopne točke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Druge naprave se lahko povežejo z dostopno točko <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Geslo za Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Geslo za dostopno točko"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Pas dostopne točke"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Uporabite dostopno točko, da ustvarite omrežje Wi‑Fi za druge svoje naprave. Dostopna točka omogoča uporabo interneta prek mobilne podatkovne povezave, zato lahko nastanejo dodatni stroški prenosa podatkov po mobilnem omrežju."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikacije lahko ustvarijo dostopno točko za skupno rabo vsebin z napravami v bližini."</string>
@@ -962,7 +971,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Naslov, ki ga intervencijske službe uporabijo kot vašo lokacijo, če opravite klic v sili prek omrežja Wi‑Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Zaslon"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvok"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Glasnost"</string>
@@ -1016,6 +1025,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Iskanje"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Upravljaj nastavitve iskanja in zgodovine"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Ni rezultatov"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Počisti zgodovino"</string>
     <string name="display_settings" msgid="7965901687241669598">"Zaslon"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Samodejno zasukaj zaslon"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Intenzivne barve"</string>
@@ -1350,8 +1360,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Obnavljanje privzetih nastavitev APN-jev"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Ponastavi na privzeto"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Ponastavitev privzetih nastavitev APN-jev končana"</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Ponastavi"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Ponastavitev omr. nast."</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Ponastavi možnosti"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Ponastavite lahko omrežje, aplikacije ali napravo"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Ponastavi Wi-Fi, prenos podatkov v mobilnem omrežju in Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"S tem boste ponastavili vse omrežne nastavitve, vključno s temi:\n\n"<li>"Wi‑Fi"</li>\n<li>"Prenos podatkov v mobilnih omrežjih"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Ponastavi nastavitve"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Ali želite ponastaviti vse omrežne nastavitve? Tega dejanja ni mogoče razveljaviti."</string>
@@ -1359,14 +1370,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Želite ponastaviti?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Ponastavitev omrežnih nastavitev ni na voljo za tega uporabnika"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Omrežne nastavitve so ponastavljene"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Pon. na tovarniške nast."</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> račun bo ponastavljen</item>
-      <item quantity="two"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> računa bosta ponastavljena</item>
-      <item quantity="few"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> računi bodo ponastavljeni</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> računov bo ponastavljenih</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Notranji pomnilnik in vsi podatki bodo ponastavljeni"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Izbriši vse podatke (ponastavitev na tovarniške nastavitve)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"S tem boste iz "<b>"notranjega pomnilnika"</b>" tabličnega računalnika izbrisali vse podatke:\n\n"<li>"Google Račun"</li>\n<li>"Podatke in nastavitve sistema in aplikacij"</li>\n<li>"Prenesene aplikacije"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"S tem boste iz "<b>"notranjega pomnilnika"</b>" telefona izbrisali vse podatke:\n\n"<li>"Google Račun"</li>\n<li>"Podatke in nastavitve sistema in aplikacij"</li>\n<li>"Prenesene aplikacije"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutno ste prijavljeni v te račune:\n"</string>
@@ -1490,15 +1494,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informacije o varnosti"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nimate podatkovne povezave. Če si želite te podatke ogledati zdaj, odprite %s iz katerega koli računalnika z internetno povezavo."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Nalaganje …"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Izberite geslo"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Nastavitev zaklepanja zaslona"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Zaradi varnosti nastavite geslo"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Nastavite geslo za prstni odtis"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Izberite vzorec"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Nastavite vzorec za prstni odtis"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Izberite kodo PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Zaradi varnosti nastavite kodo PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Nastavite kodo PIN za prstni odtis"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Potrdite geslo"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Znova vnesite geslo"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potrdite vzorec"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Potrdite kodo PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Znova vnesite kodo PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Gesli se ne ujemata"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Kodi PIN se ne ujemata"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Izbira načina odklepanja"</string>
@@ -1511,12 +1516,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Če želite nadaljevati, uporabite vzorec za delovni profil"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Če želite nadaljevati, vnesite kodo PIN za delovni profil"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Če želite nadaljevati, vnesite geslo za delovni profil"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Če želite nadaljevati, vnesite vzorec naprave. Obvezno po vnovičnem zagonu."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Če želite nadaljevati, vnesite PIN naprave. Obvezno po vnovičnem zagonu."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Če želite nadaljevati, vnesite geslo naprave. Obvezno po vnovičnem zagonu."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Če želite nadaljevati, vnesite vzorec za službo. Obvezno po vnovičnem zagonu."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Če želite nadaljevati, vnesite PIN za službo. Obvezno po vnovičnem zagonu."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Če želite nadaljevati, vnesite geslo za službo. Obvezno po vnovičnem zagonu."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Zaradi večje varnosti vnesite vzorec za to napravo"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Zaradi večje varnosti vnesite kodo PIN za to napravo"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Zaradi večje varnosti vnesite geslo za to napravo"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Zaradi večje varnosti vnesite vzorec za delovni profil"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Zaradi večje varnosti vnesite kodo PIN za delovni profil"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Zaradi večje varnosti vnesite geslo za delovni profil"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Telefon je bil ponastavljen na tovarniške nastavitve. Če želite uporabljati ta telefon, vnesite prejšnji vzorec."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Telefon je bil ponastavljen na tovarniške nastavitve. Če želite uporabljati ta telefon, vnesite prejšnjo kodo PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Telefon je bil ponastavljen na tovarniške nastavitve. Če želite uporabljati ta telefon, vnesite prejšnje geslo."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Potrdite vzorec"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Potrdite PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Potrdite geslo"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Napačna koda PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Napačno geslo"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Napačen vzorec"</string>
@@ -1821,13 +1832,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Želite ustvariti pripomoček in dovoliti dostop?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Ko ustvarite pripomoček, ima <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> dostop do vseh podatkov, ki jih ta prikazuje."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Vedno dovoli, da <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ustvari pripomočke in dostopa do njihovih podatkov"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> min"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Statistika uporabe"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Statistika uporabe"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Razvrsti po:"</string>
@@ -1839,7 +1843,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Bralniki zaslona, prikaz, interakcija"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Nastavitve vidnosti"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"To napravo lahko prilagodite svojim potrebam. Te funkcije za ljudi s posebnimi potrebami lahko pozneje spremenite v nastavitvah."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Povečanje velikosti pisave"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Spremenite velikost pisave"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Bralniki zaslona"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Zvok in besedilo na zaslonu"</string>
     <string name="display_category_title" msgid="685461049938269166">"Zaslon"</string>
@@ -1860,10 +1864,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Če želite povečati"</b>", se hitro trikrat dotaknite zaslona.\n"<ul><li>"Povlecite z dvema ali več prsti po zaslonu, če se želite pomikati."</li>\n<li>"Povlecite dva ali več prstov skupaj, če želite prilagoditi povečavo."</li></ul>\n\n<b>"Če želite začasno povečati"</b>", se hitro trikrat dotaknite zaslona in pri tretjem dotiku zadržite prst na zaslonu.\n"<ul><li>"Povlecite, če se želite premikati po zaslonu."</li>\n<li>"Dvignite prst, če želite zmanjšati povečavo."</li></ul>\n\n"Povečava ni mogoča na tipkovnici in v vrstici za krmarjenje."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Ko je povečava vklopljena, za hitro povečevanje uporabite gumb »Dostopnost« na dnu zaslona.\n\n"<b>"Če želite povečati"</b>", se dotaknite gumba »Dostopnost«, nato pa se dotaknite poljubnega mesta na zaslonu.\n"<ul><li>"Povlecite z dvema ali več prsti po zaslonu, če se želite pomikati."</li>\n<li>"Povlecite dva ali več prstov skupaj, če želite prilagoditi povečavo."</li></ul>\n\n<b>"Če želite začasno povečati"</b>", se dotaknite gumba »Dostopnost«, nato pa se dotaknite poljubnega mesta na zaslonu in ga pridržite.\n"<ul><li>"Povlecite, če se želite premikati po zaslonu."</li>\n<li>"Dvignite prst, če želite zmanjšati povečavo."</li></ul>\n\n"Povečava ni mogoča na tipkovnici ali v vrstici za krmarjenje."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Gumb »Dostopnost« je nastavljen na <xliff:g id="SERVICE">%1$s</xliff:g>. Če želite uporabiti povečavo, se dotaknite gumba »Dostopnost« in ga pridržite, nato pa izberite povečavo."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Bližnj. za ljudi s pos. potrebami"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Bližnjica na tipki za glasnost"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Storitev z bližnjico"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Dovoli na zaklenjenem zaslonu"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Ko je bližnjica vklopljena, lahko funkcijo za ljudi s posebnimi potrebami zaženete tako, da pritisnete gumba za glasnost in ju pridržite tri sekunde."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Ko je bližnjica vklopljena, lahko funkcijo za ljudi s posebnimi potrebami zaženete tako, da pritisnete obe tipki za glasnost in ju pridržite tri sekunde."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Visokokontrastno besedilo"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Samodejno posodobi povečavo zaslona"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Posodabljanje povečave zaslona pri prehodih aplik."</string>
@@ -1876,7 +1880,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Lahko vpliva na učinkovitost delovanja"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klik, ko se kazalec ustavi"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Zakasnitev pred klikom"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"VKLOPLJENO"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"IZKLOPLJENO"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Prikaži v »Hitrih nastavitvah«"</string>
@@ -2402,6 +2405,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"izbrano: <xliff:g id="NUMBER">%1$d</xliff:g> od <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> od skupaj <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Izberi vse"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Upravljanje paketov"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Podatkovni promet"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Prenos podatk. aplikacije"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operaterjeve meritve porabe podatkov so morda drugačne kot v napravi."</string>
@@ -2487,6 +2491,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilna omrežja"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Wi‑Fi z omejeno količ. prenosa"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Če želite izbrati omrežje z omej. kol. prenosa, vklopite Wi-Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Samodejno"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Z omejenim prenosom podatkov"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Z neomejenim prenosom podatkov"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Operaterjeve meritve porabe podatkov so morda drugačne kot v napravi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Klic v sili"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Nazaj na klic"</string>
@@ -2712,7 +2719,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Upravitelj klicev"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Oddaje v sili"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Nujna opozorila"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Omrežni operaterji"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Imena dostopnih točk (APN)"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Izboljšan način 4G LTE"</string>
@@ -2781,6 +2788,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Prednostna kartica SIM za:"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Vedno vprašaj"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Zahtevana je izbira"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Izbira kartice SIM"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Nastavitve"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="one">Pokaži %d skrit element</item>
@@ -2936,18 +2944,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Obvestila aplikacij"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategorija obvestil"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Pomembnost"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Dovoli, da se aplikacija sama odloči"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Omogoči zvok"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nikoli ne pokaži obvestil"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Brez zvočne ali vizualne prekinitve"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Brez zvoka"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Predvajaj zvok"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Predvajaj zvok in prikaži na zaslonu"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Prikaži na zaslonu"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Nizka pomembnost"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Srednja pomembnost"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Visoka pomembnost"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Nujno"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Omogoči zvok"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Na trenutnem zaslonu ne predvajaj zvoka, vibriraj ali na hitro prikazuj teh obvestil."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Dovoli prekinitve"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Dovoli aplikaciji, da predvaja zvok, vibrira in/ali prikaže obvestila na zaslonu"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Nizka pomembnost"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Srednja pomembnost"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Visoka pomembnost"</string>
@@ -2980,7 +2989,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip slika v sliki"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Slika v sliki"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Dovoli sliko v sliki"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Dovoli tej aplikaciji, da ustvari okno s sliko v sliki, medtem ko je aplikacija odprta ali potem ko jo zapustite (na primer, da nadaljujete z ogledom videoposnetka). To okno prekrije druge aplikacije, ki jih uporabljate."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Dovoli tej aplikaciji, da ustvari okno s sliko v sliki, medtem ko je aplikacija odprta ali potem ko jo zapustite (na primer, da nadaljujete z ogledom videoposnetka). To okno prekrije druge aplikacije, ki jih uporabljate."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Dostop do načina »ne moti«"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nobena nameščena aplikacija ni zahtevala dostopa do načina »ne moti«"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Nalaganje aplikacij ..."</string>
@@ -3303,6 +3312,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Prenašanje datotek"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Prenašanje fotografij (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Uporaba naprave kot vmesnika MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Zrcaljenje sporočil SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Preverjanje ozadja"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Poln dostop do ozadja"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Uporaba besedila na zaslonu"</string>
@@ -3449,6 +3459,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="night_display_suggestion_title" msgid="6602129097059325291">"Nastavi razpored za nočno svetlobo"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Jantarno obarvanje zaslona, da lažje zaspite"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Nočna svetloba je vklopljena"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Zaslon ima jantarni odtenek. To vam lahko pomaga prej zaspati."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Predlogi"</string>
@@ -3471,6 +3483,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Uporaba hladnejših barv zaslona"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Če želite uveljaviti spremembo barv, izklopite zaslon"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Če želite uveljaviti spremembo nadziranja telefonije, znova zaženite napravo"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HDR+ za HAL kamere"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Če želite uveljaviti spremembo nastavitve HDR+ za HAL kamere, znova zaženite napravo"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Lasersko tipalo fotoaparata"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Samodejne sistemske posodobitve"</string>
     <string name="usage" msgid="2977875522080448986">"Poraba"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Poraba mobilnih podatkov"</string>
@@ -3498,7 +3513,7 @@
     <string name="data_warning" msgid="209133958008062117">"Opozorilo za prenos podatkov"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Nastavi omej. prenosa pod."</string>
     <string name="data_limit" msgid="1885406964934590552">"Omejitev prenosa podatkov"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"Porabljeno: <xliff:g id="ID_1">%1$s</xliff:g> v obdobju <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> uporabljeno v obdobju <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfiguriranje"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Druge aplikacije, vključene v prikaz porabe"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3571,7 +3586,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Izbriši in preklopi"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Ponastavitev omejevanja hitrosti za ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Omejevanje hitrosti za ShortcutManager je ponastavljeno"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Nadzor obvestil na zaklenjenem zaslonu"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Upravljanje podatkov 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="8483187649355540109">"Podpora in nasveti"</string>
@@ -3579,7 +3594,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Nobena nameščena aplikacija ni zahtevala dostopa za plačljiva sporočila SMS."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Plačljiva sporočila SMS vam lahko povzročijo stroške in povečajo račun za mobilno telefonijo. Če za aplikacijo omogočite dovoljenje, boste lahko s tisto aplikacijo pošiljali plačljiva sporočila SMS."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Dostop za plačljiva sporočila SMS"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Ni vidno drugim napravam"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Izklopljeno"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Povezan z napravo <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Povezan z več napravami"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Predstavitveni način uporabniškega vmesnika sistema"</string>
@@ -3687,7 +3702,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Nenamestljive aplikacije"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Odpri povezave v aplikacijah, tudi če niso nameščene"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Nenamestljive aplikacije"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Račun za nenamestljive aplikacije"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Nastavitve nenamestljivih aplikacij"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Nameščene aplikacije"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Shrambo zdaj upravlja upravitelj shrambe"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Računi uporabnika <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3738,7 +3753,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Stalno vklopljen VPN je vklopljen v vašem osebnem profilu"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Stalno vklopljen VPN je vklopljen v vašem delovnem profilu"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globalni strežnik proxy za HTTP je nastavljen"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Preverjene poverilnice"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Zaupanja vredne poverilnice"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Zaupanja vredne poverilnice v vašem osebnem profilu"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Zaupanja vredne poverilnice v vašem delovnem profilu"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">Najmanj <xliff:g id="COUNT_1">%d</xliff:g> potrdilo overitelja potrdil</item>
       <item quantity="two">Najmanj <xliff:g id="COUNT_1">%d</xliff:g> potrdili overitelja potrdil</item>
@@ -3811,7 +3828,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Podatki o omogočanju uporabe operaterja"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Sproži omogočanje uporabe operaterja"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Odkrijte zanimive novosti"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Spoznajte pet najuporabnejših funkcij"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Oglejte si predstavitev novega telefona"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Oglejte si predstavitev novega tabličnega računalnika"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Oglejte si predstavitev nove naprave"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ta funkcija ni na voljo v tej napravi."</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Stanje registracije IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrirana"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Ni registrirana"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index c52d929..de00250 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s kërkon të ketë qasje te mesazhet e tua. Të lejohet qasja për %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Kërkesa për qasje në kartën SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Pajisja <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> dëshiron të ketë qasje në kartën tënde SIM. Dhënia e të drejtës për qasje në kartën SIM do të çaktivizojë lidhjen e të dhënave në pajisjen tënde gjatë kohëzgjatjes së lidhjes. Jepi qasje pajisjes <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"E dukshme si \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" për pajisjet e tjera"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"E dukshme si \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" për pajisjet e tjera"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Pajisjet e tua"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Çifto pajisjen e re"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data dhe ora"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Përpara"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Të kapërcehet gjurma e gishtit?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Konfigurimi i gjurmëve të gishtave zgjat vetëm një ose dy minuta. Nëse e kapërcen këtë, mund të shtosh gjurmën tënde të gishtit më vonë te cilësimet."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Të kapërcehet kyçja e ekranit?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Funksionet e mbrojtjes së pajisjes nuk do të aktivizohen. Ti nuk do mund të parandalosh që të tjerët të mos e përdorin këtë tablet nëse ai humb, vidhet ose rivendoset."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Funksionet e mbrojtjes së pajisjes nuk do të aktivizohen. Ti nuk do mund të parandalosh që të tjerët të mos e përdorin këtë pajisje nëse ajo humb, vidhet ose rivendoset."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Funksionet e mbrojtjes së pajisjes nuk do të aktivizohen. Ti nuk do mund të parandalosh që të tjerët të mos e përdorin këtë telefon nëse ai humb, vidhet ose rivendoset."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Ke shtuar numrin maksimal të gjurmëve të gishtave"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Nuk mund të shtohen gjurmë të tjera të gishtave"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Të hiqen të gjitha gjurmët e gishtave?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Hiq \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\""</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Dëshiron ta fshish këtë gjurmë gishti?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Nuk do të jesh në gjendje të përdorësh gjurmët e gishtave për të shkyçur telefonin, për të autorizuar blerjet ose për t\'u identifikuar në aplikacione me to"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Nuk do të jesh në gjendje të përdorësh gjurmët e gishtave për të shkyçur profilin tënd të punës, për të autorizuar blerjet ose për t\'u identifikuar në aplikacionet e punës"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Po, hiqe"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Mbroje tabletin tënd"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Mbroje pajisjen tënde"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Mbroje telefonin tënd"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Për më shumë siguri, konfiguro një kyçje rezervë për ekranin."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Për më shumë siguri, konfiguro një kyçje rezervë për ekranin."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Parandalo që të tjerët ta përdorin këtë tablet pa lejen tënde duke aktivizuar funksionet e mbrojtjes së pajisjes. Zgjidh kyçjen e ekranit që dëshiron të përdorësh."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Parandalo që të tjerët ta përdorin këtë pajisje pa lejen tënde duke aktivizuar funksionet e mbrojtjes së pajisjes. Zgjidh kyçjen e ekranit që dëshiron të përdorësh."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Parandalo që të tjerët ta përdorin këtë telefon pa lejen tënde duke aktivizuar funksionet e mbrojtjes së pajisjes. Zgjidh kyçjen e ekranit që dëshiron të përdorësh."</string>
@@ -497,37 +502,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Të hiqet mbrojtja e pajisjes?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Të hiqet mbrojtja e profilit?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Funksionet e mbrojtjes së pajisjes nuk do të funksionojnë pa motivin tënd."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Funksionet e mbrojtjes së pajisjes nuk do të funksionojnë pa motivin tënd.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Funksionet e mbrojtjes së pajisjes nuk do të funksionojnë pa motivin tënd.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Edhe gjurmët e gishtave të ruajtura do të hiqen nga kjo pajisje dhe nuk do të jesh në gjendje të shkyçësh telefonin, të autorizosh blerjet apo të identifikohesh në aplikacione me to.\""</string>
+</xliff:g>Gjurmët e gishtave të ruajtura do të hiqen nga kjo pajisje dhe nuk do të jesh në gjendje të shkyçësh telefonin, të autorizosh blerjet apo të identifikohesh në aplikacione me to."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Funksionet e mbrojtjes së pajisjes nuk do të funksionojnë pa kodin tënd PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Funksionet e mbrojtjes së pajisjes nuk do të funksionojnë pa kodin tënd PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Funksionet e mbrojtjes së pajisjes nuk do të funksionojnë pa kodin tënd PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Edhe gjurmët e gishtave të ruajtura do të hiqen nga kjo pajisje dhe nuk do të jesh në gjendje të shkyçësh telefonin, të autorizosh blerjet apo të identifikohesh në aplikacione me to.\""</string>
+</xliff:g>Gjurmët e gishtave të ruajtura do të hiqen nga kjo pajisje dhe nuk do të jesh në gjendje të shkyçësh telefonin, të autorizosh blerjet apo të identifikohesh në aplikacione me to."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Funksionet e mbrojtjes së pajisjes nuk do të funksionojnë pa fjalëkalimin tënd."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Funksionet e mbrojtjes së pajisjes nuk do të funksionojnë pa fjalëkalimin tënd.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Funksionet e mbrojtjes së pajisjes nuk do të funksionojnë pa fjalëkalimin tënd.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Edhe gjurmët e gishtave të ruajtura do të hiqen nga kjo pajisje dhe nuk do të jesh në gjendje të shkyçësh telefonin, të autorizosh blerjet apo të identifikohesh në aplikacione me to.\""</string>
+</xliff:g>Gjurmët e gishtave të ruajtura do të hiqen nga kjo pajisje dhe nuk do të jesh në gjendje të shkyçësh telefonin, të autorizosh blerjet apo të identifikohesh në aplikacione me to."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Funksionet e mbrojtjes së pajisjes nuk do të funksionojnë pa kyçjen tënde të ekranit."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Funksionet e mbrojtjes së pajisjes nuk do të funksionojnë pa kyçjen tënde të ekranit.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Funksionet e mbrojtjes së pajisjes nuk do të funksionojnë pa kyçjen tënde të ekranit.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Edhe gjurmët e gishtave të ruajtura do të hiqen nga kjo pajisje dhe nuk do të jesh në gjendje të shkyçësh telefonin, të autorizosh blerjet apo të identifikohesh në aplikacione me to.\""</string>
+</xliff:g>Gjurmët e gishtave të ruajtura do të hiqen nga kjo pajisje dhe nuk do të jesh në gjendje të shkyçësh telefonin, të autorizosh blerjet apo të identifikohesh në aplikacione me to."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Funksionet e mbrojtjes së profilit nuk do të funksionojnë pa motivin tënd."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Funksionet e mbrojtjes së profilit nuk do të funksionojnë pa motivin tënd.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Funksionet e mbrojtjes së pajisjes nuk do të funksionojnë pa motivin tënd.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Edhe gjurmët e gishtave të ruajtura do të hiqen nga ky profil dhe nuk do të jesh në gjendje të shkyçësh profilin, të autorizosh blerjet apo të identifikohesh në aplikacione me to.\""</string>
+</xliff:g>Gjurmët e gishtave të ruajtura do të hiqen nga ky profil dhe nuk do të jesh në gjendje të shkyçësh telefonin, të autorizosh blerjet apo të identifikohesh në aplikacione me to."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Funksionet e mbrojtjes së profilit nuk do të funksionojnë pa kodin tënd PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Funksionet e mbrojtjes së profilit nuk do të funksionojnë pa kodin tënd PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Funksionet e mbrojtjes së profilit nuk do të funksionojnë pa kodin tënd PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Edhe gjurmët e gishtave të ruajtura do të hiqen nga ky profil dhe nuk do të jesh në gjendje të shkyçësh profilin, të autorizosh blerjet apo të identifikohesh në aplikacione me to.\""</string>
+</xliff:g>Gjurmët e gishtave të ruajtura do të hiqen nga ky profil dhe nuk do të jesh në gjendje të shkyçësh telefonin, të autorizosh blerjet apo të identifikohesh në aplikacione me to."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Funksionet e mbrojtjes së profilit nuk do të funksionojnë pa fjalëkalimin tënd."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Funksionet e mbrojtjes së profilit nuk do të funksionojnë pa fjalëkalimin tënd.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Funksionet e mbrojtjes së profilit nuk do të funksionojnë pa fjalëkalimin tënd.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Edhe gjurmët e gishtave të ruajtura do të hiqen nga ky profil dhe nuk do të jesh në gjendje të shkyçësh profilin, të autorizosh blerjet apo të identifikohesh në aplikacione me to.\""</string>
+</xliff:g>Gjurmët e gishtave të ruajtura do të hiqen nga ky profil dhe nuk do të jesh në gjendje të shkyçësh telefonin, të autorizosh blerjet apo të identifikohesh në aplikacione me to."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Funksionet e mbrojtjes së profilit nuk do të funksionojnë pa kyçjen tënde të ekranit."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Funksionet e mbrojtjes së profilit nuk do të funksionojnë pa kyçjen tënde të ekranit.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Funksionet e mbrojtjes së profilit nuk do të funksionojnë pa ekranin tënd të kyçjes.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Edhe gjurmët e gishtave të ruajtura do të hiqen nga ky profil dhe nuk do të jesh në gjendje të shkyçësh profilin, të autorizosh blerjet apo të identifikohesh në aplikacione me to.\""</string>
+</xliff:g>Gjurmët e gishtave të ruajtura do të hiqen nga ky profil dhe nuk do të jesh në gjendje të shkyçësh telefonin, të autorizosh blerjet apo të identifikohesh në aplikacione me to."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Po, hiqe"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Ndrysho motivin e shkyçjes"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Ndrysho kodin PIN"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Nuk lejohet një sekuencë shifrash në rritje, në zbritje ose me përsëritje"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Në rregull"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Anulo"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Pastro"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Anulo"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Përpara"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Konfigurimi përfundoi."</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Ofrohet WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Ofrohet WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Fut fjalëkalimin e rrjetit"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Rrjeti Wi-Fi i operatorit celular"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"E lidhur përmes <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Për të përmirësuar saktësinë e vendndodhjes dhe për qëllime të tjera, <xliff:g id="APP_NAME">%1$s</xliff:g> dëshiron të aktivizojë skanimin e rrjetit, edhe kur Wi-Fi është joaktiv.\n\nTë lejohet kjo për të gjitha aplikacionet që dëshirojnë të skanojnë?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Për ta çaktivizuar këtë, shko te \"Të përparuara\" në menynë e tejkalimit."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Lejo"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Lidh"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Lidhja me rrjetin dështoi"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Harro"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Modifiko"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Dështoi në harrimin e rrjetit"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Ruaj"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Dështoi në ruajtjen e rrjetit"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Cilësimet e Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adresa MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Adresa e IP-së"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Informacioni i rrjetit"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska e nënrrjetit"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Adresat IPv6"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Të anulohet ftesa?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Dëshiron të anulosh ftesën për t\'u lidhur me <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Të harrohet ky grup?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Zona e lirë qasjeje Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Zonë e lirë qasjeje për Wi-Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Nuk po ndan internetin ose përmbajtje me pajisjet e tjera"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Po ndan lidhjen e internetit të këtij tableti nëpërmjet zonës së qasjes së internetit"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Po ndan lidhjen e internetit të këtij telefoni nëpërmjet zonës së qasjes së internetit"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplikacioni po ndan përmbajtje. Për të ndarë lidhjen e internetit, çaktivizo zonën e qasjes së internetit dhe më pas aktivizoje përsëri."</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Emri i Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Emri i zonës së qasjes për internet"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> po aktivizohet..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Pajisjet e tjera mund të lidhen me <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Fjalëkalimi i Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Fjalëkalimi i zonës së qasjes për internet"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Brezi AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Përdor zonën e qasjes së internetit për të krijuar një rrjet Wi‑Fi për pajisjet e tua të tjera. Zona e qasjes e internetit ofron internet duke përdorur lidhjen e të dhënave celulare. Mund të zbatohen tarifa shtesë për të dhënat celulare."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikacionet mund të krijojnë një zonë qasjeje të internetit për të ndarë përmbajtje me pajisjet në afërsi."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Adresa përdoret nga shërbimet e urgjencës si vendndodhja jote nëse kryen një telefonatë urgjence me WiFi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Paraqitja"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Tingulli"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumet"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Kërko"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Menaxho cilësimet dhe historikun e kërkimit"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nuk ka rezultate"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Pastro historikun"</string>
     <string name="display_settings" msgid="7965901687241669598">"Ekrani"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Ekran me rrotullim automatik"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Ngjyra të gjalla"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Po restauron cilësimet e APN-së me parazgjedhje."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Rivendos të parazgjedhurën"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Rivendosja e cilësimeve të APN-së me parazgjedhje përfundoi."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Rivendos"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Rivendosja e rrjetit"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Opsionet e rivendosjes"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Rrjeti, aplikacionet ose pajisja mund të rivendosen"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Rivendos Wi-Fi, lidhjen celulare dhe Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Kjo do të rivendosë të gjitha cilësimet e rrjetit, duke përfshirë:\n\n"<li>"Wi‑Fi"</li>\n<li>"Të dhënat celulare"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Rivendos cilësimet"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Të rivendosen të gjitha cilësimet e rrjetit? Ky veprim nuk mund të zhbëhet!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Të rivendosen?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Rivendosja e rrjetit nuk është e disponueshme për këtë përdorues"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Cilësimet e rrjetit janë rivendosur"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Konfig. i fabrikës"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> llogari do të rivendosen</item>
-      <item quantity="one">1 llogari do të rivendoset</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Hapësira ruajtëse e brendshme dhe të gjitha të dhënat do të rivendosen"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Spastro të gjitha të dhënat (rivendosja e fabrikës)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Kjo do t\'i fshijë të gjitha të dhënat nga "<b>"hapësira e brendshme për ruajtje"</b>" e tabletit, përfshirë:\n\n"<li>"Llogarinë e Google"</li>\n<li>"Të dhënat e sistemit dhe aplikacioneve si dhe cilësimet"</li>\n<li>"Aplikacionet e shkarkuara"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Kjo do t\'i fshijë të gjitha të dhënat nga "<b>"hapësira e brendshme për ruajtje"</b>" e telefonit, përfshirë:\n\n"<li>"Llogarinë e Google"</li>\n<li>"Të dhënat e sistemit dhe aplikacioneve si dhe cilësimet"</li>\n<li>"Aplikacionet e shkarkuara"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Je i identifikuar aktualisht në llogaritë e mëposhtme:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informacioni i sigurisë"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nuk ke një lidhje të dhënash. Për të parë këtë informacion tani, shko te %s nga një kompjuter i lidhur me internetin."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Po ngarkon..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Zgjidh fjalëkalimin"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Cakto një kyçje të ekranit"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Për siguri, cakto një fjalëkalim"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Për të përdorur gjurmën e gishtit, vendos fjalëkalimin"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Zgjidh motivin"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Për të përdorur gjurmën e gishtit, vendos motivin"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Zgjidh kodin PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Për siguri, cakto një kod PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Për të përdorur gjurmën e gishtit, vendos kodin PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Konfirmo fjalëkalimin"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Fut përsëri fjalëkalimin"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Konfirmo motivin"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Konfirmo kodin tënd PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Fut përsëri kodin PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Fjalëkalimet nuk përputhen"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Kodet PIN nuk përputhen"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Përzgjedhja e shkyçjes"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Përdor motivin tënd të punës për të vazhduar"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Fut kodin tënd PIN të punës për të vazhduar"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Fut fjalëkalimin tënd të punës për të vazhduar"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Përdor motivin e pajisjes për të vazhduar. Kërkohet pas rinisjes së pajisjes."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Fut kodin PIN të pajisjes për të vazhduar. Kërkohet pas rinisjes së pajisjes."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Fut fjalëkalimin e pajisjes për të vazhduar. Kërkohet pas rinisjes së pajisjes."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Përdor motivin tënd të punës për të vazhduar. Kërkohet pas rinisjes së pajisjes."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Fut kodin tënd PIN të punës për të vazhduar. Kërkohet pas rinisjes së pajisjes."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Fut fjalëkalimin tënd të punës për të vazhduar. Kërkohet pas rinisjes së pajisjes."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Për më shumë siguri, përdor motivin e pajisjes"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Për më shumë siguri, fut kodin PIN të pajisjes"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Për më shumë siguri, fut fjalëkalimin e pajisjes"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Për më shumë siguri, përdor motivin e punës"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Për më shumë siguri, fut kodin PIN të punës"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Për më shumë siguri, fut fjalëkalimin e punës"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Telefoni u vendos në cilësimet e fabrikës. Për ta përdorur këtë telefon, fut motivin e mëparshëm."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Telefoni u vendos në cilësimet e fabrikës. Për ta përdorur këtë telefon, fut kodin PIN të mëparshëm."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Telefoni u vendos në cilësimet e fabrikës. Për ta përdorur këtë telefon, fut fjalëkalimin e mëparshëm."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Verifiko motivin"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Verifiko kodin PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Verifiko fjalëkalimin"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Kod PIN i gabuar"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Fjalëkalim i gabuar"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Motiv i gabuar"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Të krijohet miniaplikacion dhe të lejohet qasja në të?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Pasi të krijosh miniaplikacionin, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> mund të qaset te të gjitha të dhënat që shfaq ai."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Lejo gjithmonë që <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> të krijojë miniaplikacione dhe të ketë qasje te të dhënat e tyre"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> ditë <xliff:g id="HOURS">%2$d</xliff:g> orë <xliff:g id="MINUTES">%3$d</xliff:g> min. <xliff:g id="SECONDS">%4$d</xliff:g> sek."</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> orë <xliff:g id="MINUTES">%2$d</xliff:g> min. <xliff:g id="SECONDS">%3$d</xliff:g> sek."</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> minuta <xliff:g id="SECONDS">%2$d</xliff:g> sekonda"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> sek."</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> ditë <xliff:g id="HOURS">%2$d</xliff:g> orë <xliff:g id="MINUTES">%3$d</xliff:g> minuta"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> orë <xliff:g id="MINUTES">%2$d</xliff:g> minuta"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min."</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Statistikat e përdorimit"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Statistikat e përdorimit"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Rendit sipas:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Lexues ekrani, ekran, kontrolle interaktive"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Cilësimet e shikimit"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Mund ta personalizosh këtë pajisje për t\'iu përshtatur nevojave të tua. Këto funksione të qasjes mund të ndryshohen më vonë te \"Cilësimet\"."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Rrit madhësinë e fontit"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Ndrysho madhësinë e shkrimit"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Lexuesit e ekranit"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audioja dhe teksti në ekran"</string>
     <string name="display_category_title" msgid="685461049938269166">"Ekrani"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Për të zmadhuar"</b>", trokit me shpejtësi tek ekrani 3 herë.\n"<ul><li>"Zvarrit 2 ose më shumë gishta për të lëvizur"</li>\n<li>"Afro 2 ose më shumë gishta për të rregulluar zmadhimin"</li></ul>\n\n<b>"Për të zmadhuar përkohësisht"</b>", trokit me shpejtësi 3 herë tek ekrani dhe mbaj të shtypur gishtin në trokitjen e tretë.\n"<ul><li>"Zvarrite për të zhvendosur ekranin"</li>\n<li>"Ngrije gishtin për ta zvogëluar"</li></ul>\n\n"Nuk mund të zmadhosh te tastiera dhe te shiriti i navigimit."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Kur zmadhimi është i aktivizuar, përdor butonin e \"Qasshmërisë\" në fund të ekranit për të zmadhuar me shpejtësi.\n\n"<b>"Për të zmadhuar"</b>", trokit te butoni i \"Qasshmërisë\" dhe më pas trokit kudo në ekran.\n"<ul><li>"Zvarrit 2 ose më shumë gishta për të lëvizur"</li>\n<li>"Afro 2 ose më shumë gishta për të rregulluar zmadhimin"</li></ul>\n\n<b>"Për të madhuar përkohësisht"</b>", trokit te butoni i \"Qasshmërisë\" dhe më pas prek dhe mbaj të shtypur kudo në ekran.\n"<ul><li>"Zvarrite për të zhvendosur ekranin"</li>\n<li>"Ngrije gishtin për ta zvogëluar"</li></ul>\n\n"Nuk mund të zmadhosh te tastiera ose te shiriti i navigimit."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Butoni i \"Qasshmërisë\" është caktuar te <xliff:g id="SERVICE">%1$s</xliff:g>. Për të përdorur zmadhimin, prek dhe mbaj butonin e \"Qasshmërisë\" dhe më pas zgjidh zmadhimin."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Shkurtore për qasshmërinë"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Shkurtorja e tastit të volumit"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Shërbimi i shkurtores"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Lejo nga ekrani i kyçjes"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Kur shkurtorja është aktive, mund të shtypësh të dy butonat e volumit për 3 sekonda për të hapur një funksion të qasshmërisë."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Kur shkurtorja është aktive, mund të shtypësh të dy tastet e volumit për 3 sekonda për të nisur një funksion të qasshmërisë."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Tekst me kontrast të lartë"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Përditëso auto. zmadhimin e ekranit"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Përditëso zmadhimin e ekranit në kalimet e apl."</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Mund të ndikojë te cilësia e funksionimit"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Kliko pasi kursori të ndalojë së lëvizuri"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Vonesa përpara klikimit"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"AKTIVE"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"JOAKTIVE"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Shfaq në Cilësimet e shpejta"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"u zgjodhën <xliff:g id="NUMBER">%1$d</xliff:g> nga <xliff:g id="TOTAL">%2$d</xliff:g> në total"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> nga <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Përzgjidhi të gjtiha"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Menaxho planet"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Përdorimi i të dhënave"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Përdorimi i të dhënave"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Llogaritja e të dhënave nga operatori mund të ndryshojë nga ajo e pajisjes tënde."</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Rrjetet celulare"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Rrjetet Wi‑Fi me konsum të kufizuar"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Për të zgjedhur rrjetet me konsum të kufizuar, aktivizo Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatike"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Me matje"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Pa matje"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Llogaritja e të dhënave nga operatori mund të ndryshojë nga ajo e pajisjes tënde."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Telefonata e urgjencës"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Kthehu te telefonata"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Menaxheri i telefonatave"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Transmetimet e emergjencës"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Sinjalizimet e urgjencës"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Operatorët e rrjetit"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Emrat e pikës së qasjes"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Modaliteti i përparuar 4G LTE"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Karta SIM e preferuar për"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Pyet çdo herë"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Kërkohet përzgjedhja"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Zgjedhja e kartës SIM"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Cilësimet"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">Shfaq %d artikuj të fshehur</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Njoftimet e apl."</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategoria e njoftimeve"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Rëndësia"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Lejoje aplikacionin të vendosë"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Lejo tingullin"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Mos i shfaq asnjëherë njoftimet"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Asnjë tingull apo ndërprerje vizuale"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Nuk ka tingull"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Bëj tingull"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Bëj një tingull dhe shfaq në ekran"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Shfaq në ekran"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"E ulët"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Mesatare"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"E lartë"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgjente"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Lejo tingullin"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Mos lësho tingull, dridhje apo t\'i shfaqësh me shpejtësi në pamje këto njoftime në ekranin aktual."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Lejo ndërprerjet"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Lejo që aplikacioni të lëshojë tingull, të dridhet dhe/ose të shfaqë njoftime në ekran"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Rëndësi e ulët"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Rëndësi mesatare"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Rëndësi e lartë"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"fbf figurë brenda"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Figurë brenda figurës"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Lejo figurë brenda figurës"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Lejoje këtë aplikacion të krijojë dritare \"figurë brenda figure\" ndërkohë që aplikacioni është i hapur ose pasi të dalësh prej tij (për shembull, për të vazhduar shikimin e një videoje). Kjo dritare shfaqet mbi aplikacionet e tjera që po përdor."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Lejoje këtë aplikacion të krijojë dritare \"figurë brenda figure\" ndërkohë që aplikacioni është i hapur ose pasi të dalësh prej tij (për shembull, për të vazhduar shikimin e një videoje). Kjo dritare shfaqet mbi aplikacionet e tjera që po përdor."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Qasja te \"Mos shqetëso\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Asnjë aplikacion i instaluar nuk ka kërkuar qasje te \"Mos shqetëso\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Po ngarkon aplikacionet..."</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transferimi i skedarëve"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transferimi i fotografive (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Përdorimi i pajisjes si MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Pasqyrimi i SMS-ve"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Kontrolli i sfondit"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Qasje e plotë në sfond"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Përdor tekstin nga ekrani"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Vendos planifikimin e \"Dritës së natës\""</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Cakto ekranin në nuancën e qelibarit për të të ndihmuar të flesh"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"\"Drita e natës\" është aktive"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Ekrani është me nuancë qelibari. Kjo mund të të ndihmojë të biesh në gjumë."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Sugjerime"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Përdor ngjyra të ftohta të ekranit"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Për të zbatuar ndryshimin e ngjyrës, çaktivizoje ekranin"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Për të zbatuar ndryshimin e monitorit të telefonisë, rindizni pajisjen"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HAL HDR+ i kamerës"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Për të zbatuar ndryshimin e HAL HDR+ të kamerës, rindiz pajisjen"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensori me laser i kamerës"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Përditësimet automatike të sistemit"</string>
     <string name="usage" msgid="2977875522080448986">"Përdorimi"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Përdorimi i të dhënave celulare"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Paralajmërimi i të dhënave"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Cakto kufirin e të dhënave"</string>
     <string name="data_limit" msgid="1885406964934590552">"Kufiri i të dhënave"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> të përdorura mes datave <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> të përdorura në <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfiguro"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Aplikacionet e tjera të përfshira në përdorim"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Pastro dhe konverto"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Rivendos kufizimin e normës së ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Është rivendosur kufizimi i normës së ShortcutManager"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrollo njoftimet e ekranit të kyçjes"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Informacioni i kontrollit në ekranin e 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="8483187649355540109">"Mbështetja dhe këshillat"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Asnjë aplikacion i instaluar nuk ka kërkuar qasje te mesazhet SMS premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Mesazhet SMS premium mund të kushtojnë dhe do të rritin faturat e operatorit tënd celular. Nëse e aktivizon lejen për një aplikacion, do të mund të dërgosh mesazhe SMS premium me atë aplikacion."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Qasja te mesazhet SMS premium"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Nuk është e dukshme për pajisjet e tjera"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Joaktiv"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Lidhur me <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Lidhur me shumë pajisje"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Modaliteti i demonstrimit i ndërfaqes së përdoruesit të sistemit"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Aplikacionet e çastit"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Hap lidhjet në aplikacione, edhe nëse nuk janë të instaluara"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Aplikacionet e çastit"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Llogaria e aplikacioneve të çastit"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Preferencat për \"Aplikacionet e çastit\""</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplikacionet e instaluara"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Hapësira jote ruajtëse tani po menaxhohet nga menaxheri i hapësirës ruajtëse"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Llogaritë për <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Rrjeti VPN gjithmonë aktiv i aktivizuar në profilin tënd personal"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Rrjeti VPN gjithmonë aktiv i aktivizuar në profilin tënd të punës"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Përfaqësuesi global HTTP i caktuar"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Kredencialet e besuara"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Kredencialet e besuara"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Kredencialet e besuara në profilin tënd personal"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Kredencialet e besuara në profilin tënd të punës"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Minimumi <xliff:g id="COUNT_1">%d</xliff:g> certifikata CA</item>
       <item quantity="one">Minimumi <xliff:g id="COUNT_0">%d</xliff:g> certifikatë CA</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informacionet e përgatitjes së operatorit celular"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktivizo përgatitjen e operatorit celular"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Çfarë ka të reja dhe emocionuese?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Shiko 5 funksionet kryesore"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Zhvillo një turne të telefonit tënd të ri"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Zhvillo një turne të tabletit tënd të ri"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Zhvillo një turne të pajisjes sate të re"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ky funksion nuk ofrohet në këtë pajisje"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Gjendja e regjistrimit të IMS-së"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Regjistruar"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Paregjistruar"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 26738a2..1b619f7 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -167,7 +167,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s жели да приступи порукама. Желите ли да одобрите приступ за %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Захтев за приступ SIM картици"</string>
     <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="bluetooth_device_name_summary" msgid="4757990010751789977">"Другим уређајима видљив као „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Другим уређајима видљив као „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Уређаји"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Упарите нови уређај"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Датум и време"</string>
@@ -375,6 +375,9 @@
     <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="1961957425135180242">"Даље"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Прескачете отиске прстију?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Подешавање отисака прстију траје свега минут-два. Ако прескочите ово, можете да додате отисак прста касније у подешавањима."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Прескачете закључавање екрана?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Функције заштите уређаја неће бити укључене. Нећете моћи да спречите друге људе да користе овај таблет ако буде изгубљен, украден или ресетован."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Функције заштите уређаја неће бити укључене. Нећете моћи да спречите друге људе да користе овај уређај ако буде изгубљен, украден или ресетован."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Функције заштите уређаја неће бити укључене. Нећете моћи да спречите друге људе да користе овај телефон ако буде изгубљен, украден или ресетован."</string>
@@ -414,6 +417,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Додали сте максималан број отисака прстију"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Не можете да додате још отисака прстију"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Уклонити све отиске прстију?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Уклоните „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Желите ли да избришете овај отисак прста?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Нећете моћи да откључавате телефон, одобравате куповине нити да се пријављујете у апликације помоћу отисака прстију"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Нећете моћи да откључавате профил за Work, одобравате куповине нити да се пријављујете у апликације за Work помоћу отисака прстију"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Да, уклони"</string>
@@ -458,7 +463,7 @@
     <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="5585650064305600578">"Ради веће безбедности подесите резервни метод за закључавање екрана."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Ради веће безбедности подесите резервни метод за закључавање екрана."</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>
@@ -500,37 +505,37 @@
     <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_fingerprint" msgid="8212242533942400457">"Функције за заштиту уређаја неће функционисати без шаблона.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Функције заштите уређаја неће радити без шаблона.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сачувани отисци прстију ће такође бити уклоњени са овог уређаја, а ви нећете моћи да откључате телефон, овластите куповине нити да се пријавите у апликације помоћу њих."</string>
+</xliff:g>Сачувани отисци прстију ће такође бити уклоњени са овог уређаја, а ви нећете моћи да откључавате телефон, да одобравате куповине нити да се пријављујете у апликације помоћу њих."</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">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Функције заштите уређаја неће радити без PIN-а.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сачувани отисци прстију ће такође бити уклоњени са овог уређаја, а ви нећете моћи да откључате телефон, овластите куповине нити да се пријавите у апликације помоћу њих."</string>
+</xliff:g>Сачувани отисци прстију ће такође бити уклоњени са овог уређаја, а ви нећете моћи да откључавате телефон, да одобравате куповине нити да се пријављујете у апликације помоћу њих."</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Функције заштите уређаја неће радити без лозинке.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сачувани отисци прстију ће такође бити уклоњени са овог уређаја, а ви нећете моћи да откључате телефон, овластите куповине нити да се пријавите у апликације помоћу њих."</string>
+</xliff:g>Сачувани отисци прстију ће такође бити уклоњени са овог уређаја, а ви нећете моћи да откључавате телефон, да одобравате куповине нити да се пријављујете у апликације помоћу њих."</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Функције заштите уређаја неће радити без закључавања екрана.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сачувани отисци прстију ће такође бити уклоњени са овог уређаја, а ви нећете моћи да откључате телефон, овластите куповине нити да се пријавите у апликације помоћу њих."</string>
+</xliff:g>Сачувани отисци прстију ће такође бити уклоњени са овог уређаја, а ви нећете моћи да откључавате телефон, да одобравате куповине нити да се пријављујете у апликације помоћу њих."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Функције заштите профила неће функционисати без шаблона."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Функције заштите профила неће функционисати без шаблона.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Функције заштите профила неће радити без шаблона.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сачувани отисци прстију ће такође бити уклоњени са овог профила и нећете моћи да откључавате профил, да одобравате куповине нити да се пријављујете у апликације помоћу њих."</string>
+</xliff:g>Сачувани отисци прстију ће такође бити уклоњени са овог профила, а ви нећете моћи да откључавате профил, да одобравате куповине нити да се пријављујете у апликације помоћу њих."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Функције заштите профила неће функционисати без PIN-а."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Функције заштите профила неће функционисати без PIN-а.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Функције заштите профила неће радити без PIN-а.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сачувани отисци прстију ће такође бити уклоњени са овог профила и нећете моћи да откључавате профил, да одобравате куповине нити да се пријављујете у апликације помоћу њих."</string>
+</xliff:g>Сачувани отисци прстију ће такође бити уклоњени са овог профила, а ви нећете моћи да откључавате профил, да одобравате куповине нити да се пријављујете у апликације помоћу њих."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Функције заштите профила неће функционисати без лозинке."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Функције заштите профила неће функционисати без лозинке.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Функције заштите профила неће радити без лозинке.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сачувани отисци прстију ће такође бити уклоњени са овог профила и нећете моћи да откључавате профил, да одобравате куповине нити да се пријављујете у апликације помоћу њих."</string>
+</xliff:g>Сачувани отисци прстију ће такође бити уклоњени са овог профила, а ви нећете моћи да откључавате профил, да одобравате куповине нити да се пријављујете у апликације помоћу њих."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Функције заштите профила неће функционисати без закључавања екрана."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Функције заштите профила неће функционисати без закључавања екрана.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Функције заштите профила неће радити без закључавања екрана.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сачувани отисци прстију ће такође бити уклоњени са овог профила и нећете моћи да откључавате профил, да одобравате куповине нити да се пријављујете у апликације помоћу њих."</string>
+</xliff:g>Сачувани отисци прстију ће такође бити уклоњени са овог профила, а ви нећете моћи да откључавате профил, да одобравате куповине нити да се пријављујете у апликације помоћу њих."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Да, уклони"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Промена шаблона за откључавање"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Промена PIN-а за откључавање"</string>
@@ -595,6 +600,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Растући, опадајући или поновљени низ цифара није дозвољен"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Потврди"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Откажи"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Обриши"</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>
@@ -827,6 +833,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS је доступан"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS је доступан)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Унесите лозинку за мрежу"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Wi‑Fi мрежа мобилног оператера"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Повежите се преко <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Због побољшања прецизности локације и у друге сврхе, <xliff:g id="APP_NAME">%1$s</xliff:g> жели да укључи скенирање мреже чак и када је Wi-Fi искључен.\n\nЖелите ли да дозволите ово за све апликације које желе да скенирају?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Да бисте ово искључили, идите на Напредно у преклопном менију."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Дозволи"</string>
@@ -844,6 +852,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Повежи"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Повезивање са мрежом није успело"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Заборави"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Измени"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Брисање мреже није успело"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Сачувај"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Чување мреже није успело"</string>
@@ -857,6 +866,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Напредна Wi-Fi подешавања"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC адреса"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP адреса"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Информације о мрежи"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Маска подмреже"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 адресе"</string>
@@ -889,16 +899,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Желите ли да откажете позивницу?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Желите ли да откажете позивницу за повезивање са уређајем <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Желите ли да заборавите ову групу?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Преносни Wi-Fi хотспот"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi хотспот"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Ни интернет ни садржај се не деле са другим уређајима"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Интернет веза овог таблета се дели преко хотспота"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Интернет веза овог телефона се дели преко хотспота"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Апликација дели садржај. Да бисте делили интернет везу, искључите, па укључите хотспот"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Назив Wi‑Fi хотспота"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Назив хотспота"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> се укључује..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Други уређаји могу да се повежу са хотспотом <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Лозинка за Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Лозинка хотспота"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Опсег приступне тачке"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Користите хотспот да бисте направили Wi‑Fi мрежу за друге уређаје. Хотспот пружа интернет помоћу мреже за мобилне податке. Можда ће важити додатне тарифе за мобилне податке."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Апликације могу да праве хотспотове за дељење садржаја са оближњим уређајима."</string>
@@ -950,7 +959,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Када је Позивање преко Wi-Fi-ја укључено, телефон може да преусмерава позиве преко Wi-Fi мрежа или мреже мобилног оператера у зависности од тога које сте подешавање изабрали и који сигнал је јачи. Пре него што укључите ову функцију, информишите се код мобилног оператера о накнадама и другим детаљима."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Ажурирајте адресу за хитне случајеве"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"Адреса коју користе хитне службе као вашу локацију ако позовете такву службу помоћу Wi-Fi мреже."</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"Адреса коју користе хитне службе као вашу локацију ако упутите хитни позив помоћу Wi-Fi-ја"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Приказ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Јачине звука"</string>
@@ -1004,6 +1013,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Претрага"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Управљање подешавањима претраге и историјом"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Нема резултата"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Обриши историју"</string>
     <string name="display_settings" msgid="7965901687241669598">"Екран"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Аутоматско ротирање екрана"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Живописне боје"</string>
@@ -1337,8 +1347,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Враћање подразумеваних подешавања назива приступне тачке."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Ресетуј подразумевано"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Поновно постављање подразумеваних подешавања назива приступне тачке је завршено"</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Ресетуј"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Ресетовање подешавања мреже"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Опције за ресетовање"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Мрежа, апликацијe или уређај могу да се ресетују"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Ресетуј Wi-Fi, мобилну мрежу и Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Овим ресетујете сва подешавања мреже, укључујући:\n\n"<li>"Wi‑Fi"</li>\n<li>"Мобилне податке"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Ресетуј подешавања"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Желите ли да ресетујете сва подешавања мреже? Ова радња не може да се опозове!"</string>
@@ -1346,13 +1357,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Желите да ресетујете?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Ресетовање мреже није доступно за овог корисника"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Подешавања мреже су ресетована"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Ресетовање на фабричка подешавања"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> налог ће бити ресетован</item>
-      <item quantity="few"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> налога ће бити ресетована</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> налога ће бити ресетовано</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Интерна меморија и сви подаци ће бити ресетовани"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Избриши све податке (ресетовање на фабричка подешавања)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Овим бришете све податке из "<b>"интерне меморије"</b>" таблета, укључујући:\n\n"<li>"Google налог"</li>\n<li>"Податке и подешавања система и апликација"</li>\n<li>"Преузете апликације"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Овим бришете све податке из "<b>"интерне меморије"</b>" телефона, укључујући:\n\n"<li>"Google налог"</li>\n<li>"Податке и подешавања система и апликација"</li>\n<li>"Преузете апликације"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Тренутно сте пријављени на следеће налоге:\n"</string>
@@ -1476,15 +1481,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Безбедносне информације"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Немате везу за пренос података. Да бисте одмах погледали ове информације, идите на %s са било ког рачунара који је повезан са интернетом."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Учитава се…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Одаберите лозинку"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Подесите закључавање екрана"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Подесите лозинку из безбедносних разлога"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Подесите лозинку да бисте користили отисак"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Изаберите шаблон"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Подесите шаблон да бисте користили отисак"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Одаберите PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Подесите PIN из безбедносних разлога"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Подесите PIN да бисте користили отисак"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Потврдите лозинку"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Поново унесите лозинку"</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_pin_header" msgid="7744513791910572550">"Поново унесите 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>
@@ -1497,12 +1503,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Употребите шаблон за профил за Work да бисте наставили"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Унесите PIN за профил за Work да бисте наставили"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Унесите лозинку за профил за Work да бисте наставили"</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">"Употребите шаблон за профил за Work да бисте наставили. Обавезан је када поново покренете уређај."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Унесите PIN за профил за Work да бисте наставили. Обавезан је када поново покренете уређај."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Унесите лозинку за профил за Work да бисте наставили. Обавезна је када поново покренете уређај."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Ради веће безбедности користите шаблон за уређај"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Ради веће безбедности унесите PIN за уређај"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Ради веће безбедности унесите лозинку за уређај"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Ради веће безбедности користите шаблон за Work"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Ради веће безбедности унесите PIN за Work"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Ради веће безбедности унесите лозинку за Work"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Телефон је ресетован на фабричка подешавања. Да бисте га користили, унесите претходни шаблон."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Телефон је ресетован на фабричка подешавања. Да бисте га користили, унесите претходни PIN."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Телефон је ресетован на фабричка подешавања. Да бисте га користили, унесите претходну лозинку."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Верификујте шаблон"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Верификујте PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Верификујте лозинку"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Погрешан PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Погрешна лозинка"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Погрешан шаблон"</string>
@@ -1806,13 +1818,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Желите ли да направите виџет и дозволите приступ?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Када направите виџет, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> може да приступа свим подацима које приказује."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Увек дозволи да <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> прави виџете и приступа њиховим подацима"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>д, <xliff:g id="HOURS">%2$d</xliff:g>с, <xliff:g id="MINUTES">%3$d</xliff:g>мин, <xliff:g id="SECONDS">%4$d</xliff:g>сек"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>с, <xliff:g id="MINUTES">%2$d</xliff:g>мин, <xliff:g id="SECONDS">%3$d</xliff:g>сек"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>мин, <xliff:g id="SECONDS">%2$d</xliff:g>сек"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> сек"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"Статистика коришћења"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Статистика коришћења"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Сортирај према:"</string>
@@ -1824,7 +1829,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Читачи екрана, екран, контроле интеракције"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Подешавања за вид"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Можете да прилагодите овај уређај према потребама. Те функције приступачности можете касније да промените у Подешавањима."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Повећајте величину фонта"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Промените величину фонта"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Читачи екрана"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Звук и текст на екрану"</string>
     <string name="display_category_title" msgid="685461049938269166">"Приказ"</string>
@@ -1845,10 +1850,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><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_screen_magnification_navbar_summary" msgid="1996584694050087161">"Када је увећање укључено, користите дугме за приступачност у дну екрана да бисте брзо увећали приказ.\n\n"<b>"Да бисте зумирали"</b>", додирните дугме за приступачност, па притисните било који део екрана.\n"<ul><li>"Превлачите помоћу 2 или више прстију да бисте померали приказ"</li>\n<li>"Скупите 2 или више прстију да бисте прилагодили зумирање"</li></ul>\n\n<b>"За привремено зумирање"</b>" додирните дугме за приступачност, па додирните и задржите било који део екрана.\n"<ul><li>"Превлачите да бисте се кретали по екрану"</li>\n<li>"Подигните прст да бисте умањили приказ"</li></ul>\n\n"Не можете да увећавате тастатуру или траку за навигацију."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Дугме за приступачност је подешено на <xliff:g id="SERVICE">%1$s</xliff:g>. Да бисте користили увећање, додирните и задржите дугме за приступачност, па изаберите увећање."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Пречица за приступачност"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Пречица за тастер за јачину звука"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Услуга пречице"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Омогући на закључаном екрану"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Када је пречица укључена, можете да притиснете оба дугмета за јачину звука и задржите их 3 секунде да бисте покренули функцију приступачности."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Када је пречица укључена, можете да притиснете оба тастера за јачину звука и задржите их 3 секунде да бисте покренули функцију приступачности."</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">"Аутоматски ажурирај увелич. екрана"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Ажурира увеличавање екрана при прелазу апликација"</string>
@@ -1861,7 +1866,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Може да утиче на квалитет рада"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Клик када показивач престане да се креће"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Одлагање пре клика"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"УКЉУЧЕНО"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ИСКЉУЧЕНО"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Прикажи у Брзим подешавањима"</string>
@@ -2380,6 +2384,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Управљај пакетима"</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>
@@ -2465,6 +2470,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мобилне мреже"</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_metered_auto" msgid="1262028400911918865">"Аутоматски"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Са ограничењем"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Без ограничења"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Обрачун података код мобилног оператера се можда разликује од вашег уређаја."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Хитан позив"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Назад на позив"</string>
@@ -2686,7 +2694,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Менаџер позива"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Хитни преноси"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Обавештења о хитним случајевима"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Мрежни оператери"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Називи приступних тачака"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Побољшани 4G LTE режим"</string>
@@ -2755,6 +2763,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Жељена SIM картица за"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Увек питај"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Потребно је да изаберете нешто"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Избор SIM картице"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Подешавања"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="one">Прикажи %d скривену ставку</item>
@@ -2908,18 +2917,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Обавештења апликација"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Категорија обавештења"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Важност"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Нека апликација одлучи"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Дозволи звук"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Никада не приказуј обавештења"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Без звучног сигнала или визуелног обавештења"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Без звука"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Емитује се звучни сигнал"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Емитује се звучни сигнал и приказује се на екрану"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Искачуће обавештење на екрану"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Низак"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Средњи"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Висок"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Хитан"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Дозволи звук"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Нема никаквог звука ни вибрације нити се ова обавештења накратко приказују на актуелном екрану."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Дозволи прекиде"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Дозволите апликацији да активира звук, вибрацију и/или да приказује искачућа обавештења на екрану"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Важност: ниска"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Важност: средња"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Важност: велика"</string>
@@ -2951,7 +2961,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"сус слика у"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Слика у слици"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Дозволи слику у слици"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Дозволите овој апликацији да прави прозор слике у слици док је отворена или када изађете из ње (на пример, да бисте наставили да гледате неки видео). Овај прозор се приказује преко других апликација које користите."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Дозволите овој апликацији да прави прозор слике у слици док је отворена или када изађете из ње (на пример, да бисте наставили да гледате неки видео). Овај прозор се приказује преко других апликација које користите."</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>
@@ -3264,6 +3274,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Пренос датотека"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Пренос слика (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Користи уређај као MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Пресликавање SMS-ова"</string>
     <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>
@@ -3408,6 +3419,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="night_display_suggestion_title" msgid="6602129097059325291">"Подесите распоред за ноћно светло"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Подесите жутонаранџаст екран да лакше заспите"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Ноћно светло је укључено"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Екран има жутонаранџасту нијансу. То може да вам помогне да заспите."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Предлози"</string>
@@ -3428,6 +3441,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Користи хладније боје екрана"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Да бисте применили промену боје, искључите екран"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Рестартујте уређај да бисте применили промену TelephonyMonitor-а"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Камера HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Да бисте применили промену на камеру HAL HDR+, рестартујте уређај"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Сензор ласера Камере"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Аутоматска ажурирања система"</string>
     <string name="usage" msgid="2977875522080448986">"Потрошња"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Потрошња мобил. података"</string>
@@ -3454,7 +3470,7 @@
     <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="data_usage_template" msgid="2923744765873163859">"Искористили сте <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">
@@ -3525,7 +3541,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Избриши и конвертуј"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Ресетуј ограничавање броја у ShortcutManager-у"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Ограничавање броја у ShortcutManager-у је ресетовано"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Контролишите обавештења на закљ. екрану"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Контролишите информације на закључаном екрану"</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="8483187649355540109">"Подршка и савети"</string>
@@ -3533,7 +3549,7 @@
     <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="2456198532288640046">"Није видљиво другим уређајима"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Искључено"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Повезан је са уређајем <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Повезан је са више уређаја"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Режим демонстрације за кориснички интерфејс система"</string>
@@ -3638,7 +3654,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Инстант апликације"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Отварајте линкове у апликацијама, чак и ако нису инсталиране"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Инстант апликације"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Налог за инстант апликације"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Подешавања инстант апликација"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Инсталиране апликације"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Меморијским простором сада управља Менаџер меморијског простора"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Налози за корисника <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3687,7 +3703,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Стално укључени VPN је укључен на личном профилу"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Стално укључени VPN је укључен на профилу за Work"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Глобални HTTP прокси је подешен"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Поуздани акредитиви"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Поуздани акредитиви"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Поуздани акредитиви на личном профилу"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Поуздани акредитиви на профилу за Work"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">Најмање <xliff:g id="COUNT_1">%d</xliff:g> CA сертификат</item>
       <item quantity="few">Најмање <xliff:g id="COUNT_1">%d</xliff:g> CA сертификата</item>
@@ -3755,7 +3773,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Информације о додели мобилног оператера"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Покретање доделе мобилног оператера"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Шта је ново и узбудљиво?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Погледајте 5 најпопуларнијих функција"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Упознајте нови телефон"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Упознајте нови таблет"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Упознајте нови уређај"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ова функција није доступна на овом уређају."</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Статус IMS регистрације"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Регистрован je"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Није регистрован"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 171820f..8429ea4 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s vill ha åtkomst till dina meddelanden. Vill du ge %2$s åtkomst?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Begäran om åtkomst till SIM-kort"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> vill ha åtkomst till ditt SIM-kort. Om du ger den åtkomst till SIM-kortet inaktiveras dataanslutningen på enheten under tiden som anslutningen är upprättad. Ge <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> åtkomst"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Synlig för andra enheter som <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Synlig för andra enheter som <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Dina enheter"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Parkoppla en ny enhet"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum och tid"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Nästa"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Ska fingeravtryck hoppas över?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Det tar bara ett par minuter att konfigurera fingeravtrycket. Hoppar du över det kan du lägga till fingeravtryck i inställningarna senare."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Vill du hoppa över skärmlås?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Enhetens skyddsfunktioner aktiveras inte. Du kan inte hindra andra från att använda surfplattan om den blir stulen, tappas bort eller återställs."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Enhetens skyddsfunktioner aktiveras inte. Du kan inte hindra andra från att använda enheten om den blir stulen, tappas bort eller återställs."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Enhetens skyddsfunktioner aktiveras inte. Du kan inte hindra andra från att använda mobilen om den blir stulen, tappas bort eller återställs."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Du har lagt till det högsta tillåtna antalet fingeravtryck"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Det går inte att lägga till fler fingeravtryck"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Vill du ta bort alla fingeravtryck?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Ta bort <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Vill du radera det här fingeravtrycket?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Du kan inte längre låsa upp mobilen, godkänna köp eller logga in i appar med hjälp av dina fingeravtryck"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Du kan inte låsa upp jobbprofilen, auktorisera köp eller logga in på jobbappar med hjälp av dina fingeravtryck"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Ja, ta bort"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Skydda surfplattan"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Skydda enheten"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Skydda mobilen"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Konfigurera ett skärmlås för ytterligare skydd."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Konfigurera ett skärmlås för ytterligare skydd."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Hindra andra från att använda surfplattan utan ditt medgivande genom att aktivera funktioner för enhetsskydd. Välj vilket skärmlås du vill använda."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Hindra andra från att använda enheten utan ditt medgivande genom att aktivera funktioner för enhetsskydd. Välj vilket skärmlås du vill använda."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Hindra andra från att använda mobilen utan ditt medgivande genom att aktivera funktioner för enhetsskydd. Välj vilket skärmlås du vill använda."</string>
@@ -497,37 +502,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Vill du ta bort enhetsskyddet?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Vill du ta bort profilens säkerhetsfunktioner?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Funktionerna för enhetsskydd fungerar inte utan det grafiska lösenordet."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Funktionerna för enhetsskydd fungerar inte utan det grafiska lösenordet.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Enhetens säkerhetsfunktioner fungerar inte utan ett grafiskt lösenord.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Sparade fingeravtryck tas också bort från enheten och kan inte användas för att låsa upp mobilen, godkänna köp eller logga in i appar."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Funktionerna för enhetsskydd fungerar inte utan pinkoden."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Funktionerna för enhetsskydd fungerar inte utan pinkoden.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Enhetens säkerhetsfunktioner fungerar inte utan en pinkod.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Sparade fingeravtryck tas också bort från enheten och kan inte användas för att låsa upp mobilen, godkänna köp eller logga in i appar."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Funktionerna för enhetsskydd fungerar inte utan lösenordet."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Funktionerna för enhetsskydd fungerar inte utan lösenordet.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Enhetens säkerhetsfunktioner fungerar inte utan ett lösenord.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Sparade fingeravtryck tas också bort från enheten och kan inte användas för att låsa upp mobilen, godkänna köp eller logga in i appar."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Funktionerna för enhetsskydd fungerar inte utan skärmlåset."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Funktionerna för enhetsskydd fungerar inte utan skärmlåset.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Enhetens säkerhetsfunktioner fungerar inte utan ett skärmlås.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Sparade fingeravtryck tas också bort från enheten och kan inte användas för att låsa upp mobilen, godkänna köp eller logga in i appar."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Profilens säkerhetsfunktioner kan inte användas utan ett grafiskt lösenord."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Profilens säkerhetsfunktioner kan inte användas utan ett grafiskt lösenord.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Profilens säkerhetsfunktioner fungerar inte utan ett grafiskt lösenord.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Dina sparade fingeravtryck tas dessutom bort från profilen och du kan inte längre använda dem för att låsa upp profilen, auktorisera köp eller logga in i appar."</string>
+</xliff:g>Sparade fingeravtryck tas också bort från enheten och kan inte användas för att låsa upp mobilen, godkänna köp eller logga in i appar."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Profilens säkerhetsfunktioner kan inte användas utan en pinkod."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Profilens säkerhetsfunktioner kan inte användas utan en pinkod.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Profilens säkerhetsfunktioner fungerar inte utan en pinkod.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Dina sparade fingeravtryck tas dessutom bort från profilen och du kan inte längre använda dem för att låsa upp profilen, godkänna köp eller logga in i appar."</string>
+</xliff:g>Sparade fingeravtryck tas också bort från enheten och kan inte användas för att låsa upp mobilen, godkänna köp eller logga in i appar."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Profilens säkerhetsfunktioner kan inte användas utan ett lösenord."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Profilens säkerhetsfunktioner kan inte användas utan ett lösenord.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Profilens säkerhetsfunktioner fungerar inte utan ett lösenord.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Dina sparade fingeravtryck tas dessutom bort från profilen och du kan inte längre använda dem för att låsa upp profilen, auktorisera köp eller logga in i appar."</string>
+</xliff:g>Sparade fingeravtryck tas också bort från enheten och kan inte användas för att låsa upp mobilen, godkänna köp eller logga in i appar."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Profilens säkerhetsfunktioner kan inte användas utan ett skärmlås."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Profilens säkerhetsfunktioner kan inte användas utan ett skärmlås.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Profilens säkerhetsfunktioner fungerar inte utan ett skärmlås.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Dina sparade fingeravtryck tas dessutom bort från profilen och du kan inte längre använda dem för att låsa upp profilen, auktorisera köp eller logga in i appar."</string>
+</xliff:g>Sparade fingeravtryck tas också bort från enheten och kan inte användas för att låsa upp mobilen, godkänna köp eller logga in i appar."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Ja, ta bort"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Byt grafiskt lösenord"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Ändra PIN-kod för upplåsning"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"En stigande, fallande eller upprepad siffersekvens är inte tillåten"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Avbryt"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Rensa"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Avbryt"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Nästa"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Installationen är klar."</string>
@@ -633,7 +639,7 @@
     <string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"Vill du koppla med den här enheten?"</string>
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"Vill du dela telefonboken?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> vill komma åt dina kontakter och din samtalshistorik."</string>
-    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> vill koppla med Bluetooth. När den är ansluten får den åtkomst till kontakter och samtalshistorik."</string>
+    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> vill parkoppla med Bluetooth. När den är ansluten får den åtkomst till kontakter och samtalshistorik."</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Parkopplade enheter"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Tillgängliga enheter"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"Det finns inga enheter tillgängliga"</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tillgängligt"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tillgängligt)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ange nätverkslösenordet"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Wi‑Fi-nätverk från operatör"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Anslut via <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> vill aktivera nätverkssökning även när Wi-Fi är avstängt för att kunna förbättra positionens exakthet och andra ändamål.\n\nVill du tillåta detta för alla appar som vill söka efter nätverk?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Välj Avancerat under fler menyalternativ om du vill inaktivera."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Tillåt"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Anslut"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Det gick inte att ansluta till nätverket."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Glöm"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Ändra"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Det gick inte att glömma nätverket"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Spara"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Det gick inte att spara närverket"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Avancerat för Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-adress"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-adress"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Nätverksinformation"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Nätmask"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-adresser"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Avvisa inbjudan?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vill du avvisa inbjudan att ansluta till <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Vill du glömma den här gruppen?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Mobil Wi-Fi-surfzon"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi-surfzon"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Varken internet eller innehåll delas med andra enheter"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Surfplattans internetanslutning delas via en surfzon"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Mobilens internetanslutning delas via en surfzon"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Appen delar innehåll. Om du vill dela internetanslutningen inaktiverar du surfzonen och aktiverar den igen"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi-Fi-namn"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Namn på surfzon"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Aktiverar <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> …"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Andra enheter kan ansluta till <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi-lösenord"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Lösenord för surfzon"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP-band"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Använd surfzoner för att skapa ett Wi-Fi-nätverk för andra enheter. Med hjälp av surfzonerna ansluts enheterna till internet via din mobils dataanslutning. Ytterligare dataavgifter kan tillkomma."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Surfzoner kan också skapas i appar för att dela innehåll med enheter i närheten."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Adress som används som din plats om du ringer ett nödsamtal via Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skärm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ljud"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volymer"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Sök"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Hantera sökinställningar och historik"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Inga resultat"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Rensa historik"</string>
     <string name="display_settings" msgid="7965901687241669598">"Skärm"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotera skärmen automatiskt"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Starka färger"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Återställer standardinställningar för APN."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Återställ standardinst."</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Återställning av standardinställningar för APN har slutförts."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Återställ"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Återställ nätverksinställningar"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Återställningsalternativ"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Nätverk, appar och enheter kan återställas"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Återställ inställningarna för Wi-Fi, mobildata och Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Alla nätverksinställningar återställs, till exempel \n\n"<li>"Wi‑Fi"</li>\n<li>"Mobildata"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Återställ inställningar"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Vill du återställa alla nätverksinställningar? Det går inte att ångra den här åtgärden."</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Vill du återställa?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Den här användaren kan inte återställa nätverket"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Nätverksinställningarna har återställts"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Återställ standardinst."</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> konton återställs</item>
-      <item quantity="one">1 konto återställs</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Det interna lagringsutrymmet och all data återställs"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Rensa all data (återställ standardinställningar)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Detta raderar all data från enhetens "<b>"interna lagringsutrymme"</b>", bland annat:\n\n"<li>"Ditt Google-konto"</li>\n<li>"System- och appdata och inställningar"</li>\n<li>"Hämtade appar"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Detta raderar all data från enhetens "<b>"interna lagringsutrymme"</b>", bland annat:\n\n"<li>"Ditt Google-konto"</li>\n<li>"System- och appdata och inställningar"</li>\n<li>"Hämtade appar"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du är inloggad på följande konton:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Säkerhetsinformation"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Du har inte någon dataanslutning. Besök %s på en dator som är ansluten till Internet om du vill visa informationen nu."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Läser in …"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Välj ett lösenord"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ange ett skärmlås"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Av säkerhetsskäl måste du ange ett lösenord"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Lösenord krävs för fingeravtryck"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Välj grafiskt lösenord"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Grafiskt lösenord krävs för fingeravtryck"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Välj en PIN-kod"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Av säkerhetsskäl måste du ange en pinkod"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Pinkod krävs för fingeravtryck"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Bekräfta ditt lösenord"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Ange ditt lösenord igen"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Bekräfta grafiskt lösenord"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Bekräfta din PIN-kod"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Ange din pinkod igen"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Lösenorden matchar inte"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-koderna matchar inte"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Upplåsningsalternativ"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Ange det grafiska lösenordet för jobbprofilen om du vill fortsätta"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Ange pinkoden för jobbprofilen om du vill fortsätta"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Ange lösenordet för jobbprofilen om du vill fortsätta"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Efter omstart måste du ange enhetens grafiska lösenord för att kunna fortsätta."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Efter omstart måste du ange enhetens pinkod för att kunna fortsätta."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Efter omstart måste du ange enhetens lösenord för att kunna fortsätta."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Efter omstart måste du ange jobbprofilens grafiska lösenord."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Efter omstart måste du ange jobbprofilens pinkod för att kunna fortsätta."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Efter omstart måste du ange lösenordet för jobbprofilen för att kunna fortsätta."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Använd det grafiska lösenordet för enheten för att öka säkerheten"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Ange enhetens pinkod för att öka säkerheten"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Ange enhetens lösenord för att öka säkerheten."</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Använd det grafiska lösenordet för jobbprofilen för att öka säkerheten"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Ange pinkoden för jobbprofilen för att öka säkerheten"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Ange lösenordet för jobbprofilen för att öka säkerheten"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Mobilen återställdes till standardinställningarna. Ange det tidigare grafiska lösenordet."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Mobilen återställdes till standardinställningarna. Ange den tidigare pinkoden."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Mobilen återställdes till standardinställningarna. Ange det tidigare lösenordet."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Bekräfta det grafiska lösenordet"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Bekräfta pinkoden"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Bekräfta lösenordet"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Fel pinkod"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Fel lösenord"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Fel grafiskt lösenord"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Skapa widget och tillåta åtkomst?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"När du har skapat widgeten kan <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> komma åt alla data som visas."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Tillåt alltid att <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> skapar widgetar och får åtkomst till deras data"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> m <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> m <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> m"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Användningsstatistik"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Användningsstatistik"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sortera efter"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Skärmläsningsprogram, visning och interaktionsinställningar"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Syninställningar"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Du kan anpassa enheten efter dina behov. Tillgänglighetsfunktionerna kan ändras senare under Inställningar."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Öka textstorlek"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Ändra teckenstorlek"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Skärmläsningsprogram"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Ljud och text på skärmen"</string>
     <string name="display_category_title" msgid="685461049938269166">"Skärm"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Zooma"</b>" genom att trycka snabbt tre gånger på skärmen.\n"<ul><li>"Tryck och dra med minst två fingrar om du vill rulla över skärmen"</li>\n<li>"Justera zoomen genom att nypa med minst två fingrar"</li></ul>\n\n<b>"Zooma tillfälligt"</b>" genom att trycka snabbt på skärmen tre gånger och trycka ned fingret på det tredje trycket.\n"<ul><li>"Tryck och dra om du vill flytta runt på skärmen"</li>\n<li>"Lyft fingret när du vill zooma ut"</li></ul>\n\n"Det går inte att zooma in på tangentbordet eller navigeringsfältet."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"När förstoring är aktiverat kan du förstora snabbt med hjälp av tillgänglighetsknappen.\n\n"<b>"Zooma"</b>" genom att trycka på tillgänglighetsknappen och sedan nypa någonstans på skärmen.\n"<ul><li>"Tryck och dra med minst två fingrar om du vill rulla över skärmen"</li>\n<li>"Nyp med minst två fingrar om du vill justera inzoomningen"</li></ul>\n\n<b>"Zooma tillfälligt"</b>" genom att trycka på tillgänglighetsknappen och sedan trycka länge någonstans på skärmen.\n"<ul><li>"Tryck och dra om du vill flytta runt på skärmen"</li>\n<li>"Lyft fingret när du vill zooma ut"</li></ul>\n\n"Det går inte att zooma in på tangentbordet eller navigeringsfältet."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"<xliff:g id="SERVICE">%1$s</xliff:g> har angetts för tillgänglighetsknappen. Om du vill använda förstoring trycker du länge på tillgänglighetsknappen och väljer förstoring."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Aktivera tillgänglighet snabbt"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Kortkommando för volymknapp"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Tjänst för kortkommando"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Tillåt på låsskärmen"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"När kortkommandot har aktiverats kan du starta en tillgänglighetsfunktion genom att trycka ned båda volymknapparna i tre sekunder."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"När kortkommandot har aktiverats kan du starta en tillgänglighetsfunktion genom att trycka ned båda volymknapparna i tre sekunder."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Text med hög kontrast"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Uppdatera skärmförstoring automatiskt"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Uppdatera skärmförstoring på appövergångar"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Kan påverka prestandan"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klicka när muspekaren slutat röra sig"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Fördröjning före klick"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"PÅ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"AV"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Visa i Snabbinställningar"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> av <xliff:g id="TOTAL">%2$d</xliff:g> har valts"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> av <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Markera alla"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Hantera abonnemang"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Dataanvändning"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Appens dataanvändning"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operatörens dataredovisning kan skilja sig från din enhets dataredovisning."</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobila nätverk"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Wi-Fi-nätverk med datapriser"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Slå på Wi-Fi om du vill välja nätverk med datapriser."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Automatisk"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Med datapriser"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Utan datapriser"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Operatörens dataredovisning kan skilja sig från din enhets dataredovisning."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Nödsamtal"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Tillbaka till samtal"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Samtalshanterare"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Nödsändningar"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Varningar vid nödsituationer"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Nätverksoperatörer"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Åtkomstpunktsnamn"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Förbättrat 4G LTE-läge"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Primärt SIM-kort för"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Fråga varje gång"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Du måste välja något"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Val av SIM"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Inställningar"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">Visa %d dolda objekt</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Appaviseringar"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Aviseringskategori"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Relevans"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Låt appen bestämma"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Tillåt ljud"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Visa aldrig aviseringar"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Spela inte upp ljud och visa inte"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Inget ljud."</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Spela upp ljud"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Spela upp ljud och visa på skärmen"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Visa på skärmen"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Låg"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Medelhög"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Hög"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Brådskande"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Tillåt ljud"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Inga ljud, ingen vibration och inga aviseringar som visas som snabbtitt på skärmen."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Tillåt avbrott"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Tillåt att appen spelar upp ljud, vibrerar och/eller visar popup-aviseringar på skärmen"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Oviktig avisering"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Mindre viktig avisering"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Viktig avisering"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"bib bild i"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Bild-i-bild"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Tillåt bild-i-bild"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Tillåt att ett bild-i-bild-fönster skapas av appen medan den är öppen eller när du har slutat att använda den (till exempel när du fortsätter att titta på en video). Detta fönster visas ovanpå andra appar du använder."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Tillåt att ett bild-i-bild-fönster skapas av appen medan den är öppen eller när du har slutat att använda den (till exempel när du fortsätter att titta på en video). Detta fönster visas ovanpå andra appar du använder."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Stör ej-åtkomst"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Inga installerade appar har begärt Stör ej-åtkomst"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Läser in appar ..."</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Filer överförs"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Foton överförs (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Enheten används som MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Sms-spegling"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Bakgrundskontroll"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Fullständig bakgrundsåtkomst"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Använda text från skärmen"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Ange schema för nattljus"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Gultona skärmen för att somna lättare"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Nattljus är aktiverat"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Skärmen har en gul ton, vilket kan göra det lättare för dig att somna."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Förslag"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Använd svalare färger på skärmen"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Stäng av skärmen om du vill tillämpa färgändringen"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Starta om enheten om du vill tillämpa ändringen för Telephony Monitor"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HAL HDR+ för kamera"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Starta om enheten om du vill tillämpa ändringen HAL HDR+ för kamera"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Lasersensor för kamera"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatiska systemuppdateringar"</string>
     <string name="usage" msgid="2977875522080448986">"Användning"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Användning av mobildata"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Datavarning"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Ange datagräns"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datagräns"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> har använts mellan <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> användes <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurera"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Andra appar som är inkluderade i användningen"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Rensa och konvertera"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Återställ anropsbegränsning för ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Anropsbegränsningen för ShortcutManager har återställts"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Hantera aviseringar på låsskärmen"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Kontrolluppgifter på låsskärm"</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="8483187649355540109">"Support och tips"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Inga installerade appar har begärt åtkomst till premium-sms"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Det kan hända att premium-sms kostar pengar och läggs till på dina fakturor från operatören. Om du ger en app åtkomst kan du skicka premium-sms med den appen."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Åtkomst till premium-sms"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Inte synlig för andra enheter"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Av"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Ansluten till <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Ansluten till flera enheter"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Demoläge för systemgränssnitt"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Snabbappar"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Öppna länkar i appar, även om de inte har installerats"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Snabbappar"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Konto för snabbappar"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Inställningar för Instant Apps"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installerade appar"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Ditt lagringsutrymme hanteras nu av lagringshanteraren"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Konton som tillhör <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Always-on för VPN har aktiverats i din personliga profil"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Always-on för VPN har aktiverats i jobbprofilen"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP-proxy har angetts"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Tillförlitlig autentisering"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Tillförlitlig autentisering"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Tillförlitlig autentisering i din personliga profil"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Tillförlitlig autentisering i din jobbprofil"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Minst <xliff:g id="COUNT_1">%d</xliff:g> CA-certifikat</item>
       <item quantity="one">Minst <xliff:g id="COUNT_0">%d</xliff:g> CA-certifikat</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Information om operatörsadministration"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktivera operatörsadministration"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Vad är nytt?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Kolla in de fem populäraste funktionerna"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Ta en rundtur på din nya mobil"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Ta en rundtur på din nya surfplatta"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Ta en rundtur på din nya enhet"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Den här funktionen är inte tillgänglig på den här enheten."</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS-registrering"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrerad"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Ej registrerad"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index a25a2aa..ab36209 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -129,7 +129,7 @@
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Hakuna vifaa vya Bluetooth vilivyopatikana karibu."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Ombi la kuoanisha Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Ombi la ulinganishaji"</string>
-    <string name="bluetooth_notif_message" msgid="5057417127600942904">"Gonga ili uoanishe na <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_notif_message" msgid="5057417127600942904">"Gusa ili uoanishe na <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Faili zilizopokelewa"</string>
     <string name="device_picker" msgid="4978696506172252813">"Chagua kifaa cha Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> inataka kuwasha Bluetooth"</string>
@@ -156,7 +156,7 @@
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Inazima Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Unganisha-kiotomatiki"</string>
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Muunganisho wa Bluetooth umeombwa"</string>
-    <string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Gonga ili uunganishe kwenye \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Gusa ili uunganishe kwenye \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Unataka kuunganishwa kwa\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Ombi la kufikia anwani kwenye simu"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="8930347091018455505">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> inataka kufikia anwani zako na rekodi ya simu zilizopigwa. Ungependa kuipa <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> idhini ya kufikia?"</string>
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s inataka kufikia ujumbe wako. Ruhusu ufikiaji kwa %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Ombi la idhini ya kufikia SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> inataka idhini ya kufikia kadi yako ya SIM. Ukiipa idhini ya kufikia kadi ya SIM, itazima muunganisho wa data kwenye kifaa chako katika kipindi ambacho imeunganishwa. Ipe <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> idhini ya ufikiaji"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Inaonekana kama \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' kwenye vifaa vingine"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Inaonekana kama \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' kwenye vifaa vingine"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vifaa vyako"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Oanisha kifaa kipya"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Tarehe na saa"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Endelea"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Ungependa kuruka hatua ya kuweka alama ya kidole?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Itachukua dakika moja au mbili kuweka mipangilio ya alama ya kidole. Kama utaruka hatua hii, unaweza kuongeza alama ya kidole baadaye katika mipangilio."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Ungependa kuruka hatua ya kufunga skrini?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Vipengele vya ulinzi wa kifaa havitawashwa. Hutaweza kuwazuia watu wengine kutumia kompyuta kibao hii ikiwa itapotea, itaibiwa au itawekewa mipangilio iliyotoka nayo kiwandani."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Vipengele vya ulinzi wa kifaa havitawashwa. Hutakuwa na uwezo wa kuzuia watu wengine kutumia kifaa hiki iwapo kitapotea, kitaibiwa au kitawekewa mipangilio kilichotoka nayo kiwandani."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Vipengele vya ulinzi wa kifaa havitawashwa. Hutaweza kuzuia watu wengine kutumia simu hii iwapo itapotea, itaibiwa au itawekewa mipangilio iliyotoka nayo kiwandani"</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Umeongeza idadi ya juu inayoruhusiwa ya alama za kidole"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Haiwezi kuongeza alama zaidi za kidole"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Ungetaka kuondoa alama zako zote za vidole?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Ondoa \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Ungependa kufuta alama hii ya kidole?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Hutaweza kutumia alama zako za vidole kufungua simu yako, kuidhinisha ununuzi, au kuingia katika akaunti ya programu"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Hutaweza kutumia alama za vidole kufungua wasifu wako wa kazini, kuidhinisha ununuzi au kuingia katika akaunti za programu za kazini"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Ndiyo, ondoa"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Linda kompyuta yako kibao"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Linda kifaa chako"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Linda simu yako"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Weka mbinu mbadala ya kufunga skrini ili uimarishe usalama."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Weka mbinu mbadala ya kufunga skrini ili uimarishe usalama."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Wazuie watu wengine kutumia kompyuta kibao hii bila ruhusa yako kwa kuwasha vipengele vya ulinzi wa kifaa. Chagua skrini iliyofungwa unayotaka kutumia."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Wazuie watu wengine kutumia kifaa hiki bila ruhusa yako kwa kuwasha vipengele vya ulinzi wa kifaa. Chagua skrini iliyofungwa unayotaka kutumia."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Wazuie watu wengine kutumia simu hii bila ruhusa yako kwa kuwasha vipengele vya ulinzi wa kifaa. Chagua skrini iliyofungwa unayotaka kutumia."</string>
@@ -497,37 +502,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Je, ungependa kuondoa ulinzi wa kifaa?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Ungependa kuondoa ulinzi wasifu?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Vipengele vya kulinda kifaa havitafanya kazi bila mchoro wako."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Vipengele vya ulinzi wa kifaa havitafanya kazi bila mchoro wako. <xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Vipengele vya ulinzi wa kifaa havitafanya kazi bila mchoro wako.<xliff:g id="EMPTY_LINE">
 
-</xliff:g> Vitambulisho vyako ulivyohifadhi pia vitaondolewa kwenye kifaa hiki na hutaweza kufungua simu yako, kuidhinisha ununuzi, au kuingia karika akaunti ya programu bila vitambulisho hivi.\""</string>
+</xliff:g>Alama zako za vidole zilizohifadhiwa pia zitaondolewa kwenye kifaa hiki na hutaweza kufungua simu yako, kuidhinisha ununuzi au kuingia katika akaunti ya programu bila kuzitumia."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Vipengele vya ulinzi wa kifaa havitafanya kazi bila PIN yako."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Vipengele vya ulinzi wa kifaa havitafanya kazi bila PIN yako. <xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Vipengele vya ulinzi wa kifaa havitafanya kazi bila PIN yako.<xliff:g id="EMPTY_LINE">
 
-</xliff:g> Vitambulisho vyako ulivyohifadhi pia vitaondolewa kwenye kifaa hiki na hutaweza kufungua simu yako, kuidhinisha ununuzi, au kuingia karika akaunti ya programu bila vitambulisho hivi.\""</string>
+</xliff:g>Alama zako za vidole zilizohifadhiwa pia zitaondolewa kwenye kifaa hiki na hutaweza kufungua simu yako, kuidhinisha ununuzi au kuingia katika akaunti ya programu bila kuzitumia."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Vipengele vya ulinzi wa kifaa havitafanya kazi bila nenosiri lako."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Vipengele vya ulinzi wa kifaa havitafanya kazi bila nenosiri lako. <xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Vipengele vya ulinzi wa kifaa havitafanya kazi bila nenosiri lako.<xliff:g id="EMPTY_LINE">
 
-</xliff:g> Vitambulisho vyako ulivyohifadhi pia vitaondolewa kwenye kifaa hiki na hutaweza kufungua simu yako, kuidhinisha ununuzi, au kuingia karika akaunti ya programu bila vitambulisho hivi.\""</string>
+</xliff:g>Alama zako za vidole zilizohifadhiwa pia zitaondolewa kwenye kifaa hiki na hutaweza kufungua simu yako, kuidhinisha ununuzi au kuingia katika akaunti ya programu bila kuzitumia."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Vipengele vya ulinzi wa kifaa havitafanya kazi bila kipengele chako cha kufunga skrini."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Vipengele vya ulinzi wa kifaa havitafanya kazi bila kipengele chako cha kufunga skrini. <xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Vipengele vya ulinzi wa kifaa havitafanya kazi bila mbinu yako ya kufunga skrini.<xliff:g id="EMPTY_LINE">
 
-</xliff:g> Vitambulisho vyako ulivyohifadhi pia vitaondolewa kwenye kifaa hiki na hutaweza kufungua simu yako, kuidhinisha ununuzi, au kuingia karika akaunti ya programu bila vitambulisho hivi.\""</string>
+</xliff:g>Alama zako za vidole zilizohifadhiwa pia zitaondolewa kwenye kifaa hiki na hutaweza kufungua simu yako, kuidhinisha ununuzi au kuingia katika akaunti ya programu bila kuzitumia."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Vipengele vya kulinda wasifu havitafanya kazi bila mchoro wako."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Vipengele vya kulinda wasifu havitafanya kazi bila mchoro wako.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Vipengele vya ulinzi wa wasifu havitafanya kazi bila mchoro wako.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Alama zako zote za vidole zilizohifadhiwa zitaondolewa pia kutoka wasifu huu na hutaweza kuzitumia kufungua wasifu wako, kuidhinisha ununuzi wala kuingia katika akaunti za programu.\""</string>
+</xliff:g>Alama zako za vidole zilizohifadhiwa pia zitaondolewa kwenye kifaa hiki na hutaweza kufungua wasifu wako, kuidhinisha ununuzi au kuingia katika akaunti ya programu bila kuzitumia."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Vipengele vya kulinda wasifu havitafanya kazi bila PIN yako."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Vipengele vya kulinda wasifu havitafanya kazi bila PIN yako.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Vipengele vya ulinzi wa wasifu havitafanya kazi bila PIN yako.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Alama zako zote za vidole zilizohifadhiwa zitaondolewa pia kutoka wasifu huu na hutaweza kuzitumia kufungua wasifu wako, kuidhinisha ununuzi wala kuingia katika akaunti za programu.\""</string>
+</xliff:g>Alama zako za vidole zilizohifadhiwa pia zitaondolewa kwenye kifaa hiki na hutaweza kufungua wasifu wako, kuidhinisha ununuzi au kuingia katika akaunti ya programu bila kuzitumia."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Vipengele vya kulinda wasifu havitafanya kazi bila nenosiri lako."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Vipengele vya kulinda wasifu havitafanya kazi bila nenosiri lako.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Vipengele vya ulinzi wa wasifu havitafanya kazi bila nenosiri lako.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Alama zako zote za vidole zilizohifadhiwa zitaondolewa pia kutoka wasifu huu na hutaweza kuzitumia kufungua wasifu wako, kuidhinisha ununuzi wala kuingia katika akaunti za programu. \""</string>
+</xliff:g>Alama zako za vidole zilizohifadhiwa pia zitaondolewa kwenye kifaa hiki na hutaweza kufungua wasifu wako, kuidhinisha ununuzi au kuingia katika akaunti ya programu bila kuzitumia."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Vipengele vya kulinda wasifu havitafanya kazi bila kipengele chako cha kufunga skrini."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Vipengele vya kulinda wasifu havitafanya kazi bila kipengele chako cha kufunga skrini.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Vipengele vya ulinzi wa wasifu havitafanya kazi bila mbinu yako ya kufunga skrini.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Alama zako zote za vidole zilizohifadhiwa zitaondolewa pia kutoka wasifu huu na hutaweza kuzitumia kufungua wasifu wako, kuidhinisha ununuzi wala kuingia katika akaunti za programu.\""</string>
+</xliff:g>Alama zako za vidole zilizohifadhiwa pia zitaondolewa kwenye kifaa hiki na hutaweza kufungua wasifu wako, kuidhinisha ununuzi au kuingia katika akaunti ya programu bila kuzitumia."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Ndiyo, ondoa"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Badilisha umbo la kufungua"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Badilisha PIN ya kufungua"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Haturuhusi mpangilio wa kupanda, kushuka au kujirudia kwa tarakimu"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Sawa"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Ghairi"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Futa"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Ghairi"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Ifuatayo"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Usanidi umekamilika."</string>
@@ -702,7 +708,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Imezimwa"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Haipatikani kwa sababu NFC imezimwa"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Unapowasha kipengele hiki, unaweza kutuma maudhui ya programu kwenye kifaa kingine kinachoweza kutumia NFC kwa kuviweka vifaa pamoja. Kwa mfano, unaweza kutuma kurasa za wavuti, video za YouTube, anwani na mengineyo.\n\nWeka tu vifaa pamoja (kwa kuvigusisha sehemu za nyuma) na ugonge skrini yako. Programu itabaini kile kitatumwa."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Unapowasha kipengele hiki, unaweza kutuma maudhui ya programu kwenye kifaa kingine kinachoweza kutumia NFC kwa kuviweka vifaa pamoja. Kwa mfano, unaweza kutuma kurasa za wavuti, video za YouTube, anwani na mengineyo.\n\nWeka tu vifaa pamoja (kwa kuvigusisha sehemu za nyuma) na uguse skrini yako. Programu itabaini kile kitatumwa."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Washa Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
@@ -765,8 +771,8 @@
     <string name="wifi_more" msgid="3195296805089107950">"Zaidi"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Usanidi kiotomatiki (WPS)"</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Chaguo za kina"</string>
-    <string name="wifi_advanced_toggle_description_expanded" msgid="2380600578544493084">"Orodha ya menyu kunjuzi ya Chaguo za Kina. Gonga mara mbili ili ukunje."</string>
-    <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"Orodha ya menyu kunjuzi ya Chaguo za Kina. Gonga mara mbili ili upanue."</string>
+    <string name="wifi_advanced_toggle_description_expanded" msgid="2380600578544493084">"Orodha ya menyu kunjuzi ya Chaguo za Kina. Gusa mara mbili ili ukunje."</string>
+    <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"Orodha ya menyu kunjuzi ya Chaguo za Kina. Gusa mara mbili ili upanue."</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Usanidi Uliolindwa na Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Inaanzisha WPS ..."</string>
     <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"Bonyeza kitufe cha Wi‑Fi Protected Setup kwenye ruta yako. Inaweza kuitwa \'\'WPS\'\' au kuwekwa alama hii:"</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS inapatikana"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" WPS inapatikana"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Weka nenosiri la mtandao wako"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Mtandao wa mtoa huduma wa Wi‑Fi"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Unganisha kupitia <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Ili kuboresha usahihi wa mahali na kwa madhumuni mengine, <xliff:g id="APP_NAME">%1$s</xliff:g> inataka kuwasha ukaguaji mitandao, hata wakati Wi-Fi imezimwa.\n\nJe, ungependa kuruhusu programu zote ambazo zingependa kukagua ziweza kufanya hivyo?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Ili uzime hii, nenda kwenye Mahiri katika menyu ya vipengee vya ziada."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Ruhusu"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Unganisha"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Imeshindwa kuunganisha kwa mtandao"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Sahau"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Rekebisha"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Imeshindwa kusahau mtandao"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Hifadhi"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Imeshindwa kuhifadhi mtandao"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi mahiri"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Anwani ya MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Anwani ya IP"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Maelezo ya mtandao"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Mfano wa kijimtandao"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Anwani za IPv6"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Ghairi mwaliko?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Je, unataka kughairi mwaliko wa kuungana na <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Sahau kikundi hiki?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Sambaza intaneti ya Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Mtandao-hewa wa Wi-Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Haishiriki Intaneti au maudhui na vifaa vingine"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Inashiriki muunganisho wa Intaneti wa kompyuta hii kibao kupitia mtandao-hewa"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Inashiriki muunganisho wa Intaneti wa simu hii kupitia mtandao-hewa"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Programu inashiriki maudhui. Ili kushiriki muunganisho wa Intaneti, zima mtandao-hewa, kisha uuwashe"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Jina la WiFi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Jina la mtandao-hewa"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Inawasha <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Vifaa vingine vinaweza kuunganisha kwenye <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Nenosiri la Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Nenosiri la mtandao-hewa"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Bendi ya AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Tumia kipengele cha mtandao-hewa kuunda mtandao wa Wi-Fi kwa vifaa vyako vingine. Mtandao-hewa hutoa huduma ya Intaneti ikitumia muunganisho wako wa  mtandao wa simu za mkononi. Unaweza kutozwa ada za ziada za kutumia data ya mtandao wa simu."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Programu zinaweza kuunda mtandao-hewa ili kushiriki maudhui na vifaa vilivyo karibu."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Anwani inayotumiwa na huduma za dharura kama eneo lako ikiwa utapiga simu ukitumia Wi‑Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skrini"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sauti"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Sauti"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Tafuta"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Simamia mipangilio ya utafutaji na historia"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Hakuna matokeo yoyote yaliyopatikana"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Futa historia"</string>
     <string name="display_settings" msgid="7965901687241669598">"Kwenye Skrini"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Skrini ijizungushe kiotomatiki"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Rangi dhahiri"</string>
@@ -1247,7 +1257,7 @@
     <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="8907101974576694793">"Faili nyingine zilizopo ni kama vile faili zilizohifadhiwa na programu, faili zilizopakuliwa kutoka kwenye Intaneti au Bluetooth, faili za Android, na kadhalika.\n\nIli kuona maudhui ya <xliff:g id="NAME">^1</xliff:g> yanayoweza kuonekana, gonga Gundua."</string>
+    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Faili nyingine zilizopo ni kama vile faili zilizohifadhiwa na programu, faili zilizopakuliwa kutoka kwenye Intaneti au Bluetooth, faili za Android, na kadhalika.\n\nIli kuona maudhui ya <xliff:g id="NAME">^1</xliff:g> yanayoweza kuonekana, gusa Gundua."</string>
     <string name="storage_detail_dialog_system" msgid="862835644848361569">"Mfumo unajumuisha faili zinazotumika katika toleo la Android la <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"Huenda <xliff:g id="USER_0">^1</xliff:g> amehifadhi picha, muziki, programu au data, kwa kutumia <xliff:g id="SIZE">^2</xliff:g> ya hifadhi. \n\nIli kuona maelezo, tumia <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>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Inarejesha mipangilio mbadala ya APN"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Rudisha kwenye chaguo-msingi"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Kuweka upya kwa mipangilio mbadala ya APN kumekamilika"</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Weka upya"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Badilisha mipangilio ya mtandao"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Chaguo za kubadilisha mipangilio"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Unaweza kubadilisha mipangilio ya mtandao, programu au kifaa"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Badilisha mipangilio ya Wi-Fi, data ya simu na Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Hatua itabadilisha mipangilio yote ya mtandao ikiwa ni pamoja:\n\n"<li>"Wi‑Fi"</li>\n<li>"Data ya simu"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Badilisha mipangilio"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Ungependa kuweka upya mipangilio yote ya mtandao? Huwezi kutendua kitendo hiki."</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Iwekwe upya?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Kuweka upya mtandao hakupatikani kwa mtumiaji huyu"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Mipangilio ya mtandao imewekwa upya"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Kurejesha mipangilio ya kiwandani"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other">Akaunti <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> zitarejeshwa kwenye mipangilio zilizotoka nazo kiwandani</item>
-      <item quantity="one">Akaunti 1 itarejeshwa kwenye mipangilio iliyotoka nayo kiwandani</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Itabadilisha mipangilio ya hifadhi ya ndani na data yote"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Futa data yote (rejesha mipangilio ambayo kifaa kilitoka nayo kiwandani)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Hii itafuta data yote kutoka hifadhi yako iliyo "<b>"ndani ya kompyuta kibao"</b>", pamoja na:\n \n"<li>"Akaunti yako ya Google"</li>\n<li>"Data na mipangilio ya mfumo na programu"</li>\n<li>"Programu zilizopakuliwa"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Hii itafuta data yote kutoka hifadhi yako iliyo "<b>"ndani ya simu"</b>", pamoja na:\n \n"<li>"Akaunti yako ya Google"</li>\n<li>"Data na mipangilio ya mfumo na programu"</li>\n<li>"Programu zilizopakuliwa"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kwa sasa umeingia kwenye akaunti zifuatazo:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Maelezo ya usalama"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Hauna muunganisho wa data. Ili kutazama taarifa hii sasa, nenda kwa %s kutoka kwa kompyuta yoyote iliyounganishwa kwa mtandao."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Inapakia…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Chagua nenosiri lako"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Weka mbinu ya kufunga skrini"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Kwa sababu za usalama, weka nenosiri"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Weka nenosiri ili utumie alama ya kidole"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Chagua mchoro wako"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Weka mchoro ili utumie alama ya kidole"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Chagua PIN yako"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Kwa sababu za usalama, weka PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Weka PIN ili utumie alama ya kidole"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Thibitisha nenosiri lako"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Weka nenosiri lako tena"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Thibitisha mchoro wako"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Thibitisha PIN yako"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Weka PIN yako tena"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Nenosiri halilingani"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN hailingani"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Chaguo zilizomo"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Tumia mchoro wa kazini ili uendelee"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Weka PIN ya kazini ili uendelee"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Weka nenosiri lako ili uendelee"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Tumia mchoro wa kifaa chako ili uendelee. Unahitajika baada ya kukiwasha upya."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Weka PIN ya kifaa chako ili uendelee. Inahitajika baada ya kukiwasha upya."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Andika nenosiri la kifaa chako ili uendelee. Linahitajika baada ya kukiwasha upya."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Tumia mchoro wako wa kazini ili uendelee. Unahitajika baada ya kuwasha kifaa upya."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Andika PIN yako ya kazini ili uendelee. Inahitajika baada ya kuwasha kifaa upya."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Andika nenosiri lako la kazini ili uendelee. Linahitajika baada ya kuwasha kifaa upya."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Ili kuimarisha usalama, tumia mchoro wa kufungua kifaa chako"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Ili kuimarisha usalama, weka PIN ya kifaa chako"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Ili kuimarisha usalama, weka nenosiri la kifaa chako"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Ili kuimarisha usalama, weka mchoro wa wasifu wako wa kazini"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Ili kuimarisha usalama, weka PIN ya wasifu wako wa kazini"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Ili kuimarisha usalama, weka nenosiri la wasifu wako wa kazini"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Tumerejesha mipangilio ya kiwandani ya simu yako. Ili kutumia simu hii, weka mchoro wako wa awali."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Tumerejesha mipangilio ya kiwandani ya simu yako. Ili kutumia simu hii, weka PIN yako ya awali."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Tumerejesha mipangilio ya kiwandani ya simu yako. Ili kutumia simu hii, weka nenosiri lako la awali."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Thibitisha mchoro"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Thibitisha PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Thibitisha nenosiri"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Nambari ya PIN si sahihi"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Nenosiri si sahihi"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Mchoro huo si sahihi"</string>
@@ -1700,7 +1713,7 @@
     <string name="service_stop_description" msgid="9146619928198961643">"Huduma hii ilianzishwa na programu yake. Kuisitisha kunaweza kuifanya programu iache kufanya kazi."</string>
     <string name="heavy_weight_stop_description" msgid="6050413065144035971">"Programu hii haiwezi kusitishwa kwa usalama. Ukiisitisha, unaweza kupoteza baadhi ya kazi yako ya sasa."</string>
     <string name="background_process_stop_description" msgid="3834163804031287685">"Hii ni utaratibu wa zamani ya programu ambayo bado inaendeshwa iwapo itahitajika tena. Huwa hakuna sababu ya kuisitisha."</string>
-    <string name="service_manage_description" msgid="479683614471552426">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: inatumika kwa sasa. Gonga Mipangilio ili uidhibiti."</string>
+    <string name="service_manage_description" msgid="479683614471552426">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: inatumika kwa sasa. Gusa Mipangilio ili uidhibiti."</string>
     <string name="main_running_process_description" msgid="1130702347066340890">"Utaratibu kuu ambao unatumika."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Huduma inatumika <xliff:g id="COMP_NAME">%1$s</xliff:g>"</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Mtoaji huduma <xliff:g id="COMP_NAME">%1$s</xliff:g> anatumika"</string>
@@ -1765,7 +1778,7 @@
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Hariri Neno"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Hariri"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Futa"</string>
-    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"Huna maneno yoyote katika kamusi ya mtumiaji. Gonga kitufe cha Ongeza (+) ili uongeze neno."</string>
+    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"Huna maneno yoyote katika kamusi ya mtumiaji. Gusa kitufe cha Ongeza (+) ili uongeze neno."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Ya lugha zote"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Lugha zaidi..."</string>
     <string name="testing" msgid="6584352735303604146">"Majaribio"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Unda wijeti na uruhusu ufikiaji?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Baada ya kuunda wijeti, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> inaweza kufikia data yote inayoonyeshwa."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Daima ruhusu <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> kuunda wijeti na kufikia data yao"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"s<xliff:g id="DAYS">%1$d</xliff:g> s<xliff:g id="HOURS">%2$d</xliff:g> d<xliff:g id="MINUTES">%3$d</xliff:g> s<xliff:g id="SECONDS">%4$d</xliff:g>"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"s<xliff:g id="HOURS">%1$d</xliff:g> d<xliff:g id="MINUTES">%2$d</xliff:g> s<xliff:g id="SECONDS">%3$d</xliff:g>"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"d <xliff:g id="MINUTES">%1$d</xliff:g> s <xliff:g id="SECONDS">%2$d</xliff:g>"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"s<xliff:g id="SECONDS">%1$d</xliff:g>"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"Siku<xliff:g id="DAYS">%1$d</xliff:g> saa <xliff:g id="HOURS">%2$d</xliff:g> dakika <xliff:g id="MINUTES">%3$d</xliff:g>"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"Saa <xliff:g id="HOURS">%1$d</xliff:g> dakika <xliff:g id="MINUTES">%2$d</xliff:g>"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"dakika <xliff:g id="MINUTES">%1$d</xliff:g>"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Takwimu za utumiaji"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Takwimu za utumiaji"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Panga kwa:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Vidhibiti vya mawasiliano, maonyesho na visoma skrini"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Mipangilio ya Kuona"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Unaweza kubadilisha mipangilio ya kifaa hiki kulingana na mahitaji yako. Vipengele hivi vya zana za walio na matatizo ya kuona au kusikia vinaweza kubadilishwa baadaye kwenye Mipangilio."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Ongeza ukubwa wa fonti"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Badilisha ukubwa wa fonti"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Visoma skrini"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Maandishi kwenye skrini na sauti"</string>
     <string name="display_category_title" msgid="685461049938269166">"Onyesho"</string>
@@ -1825,15 +1831,15 @@
     <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Kuza ukitumia kitufe"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Kuza ukitumia kitufe na kugonga mara tatu"</string>
     <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Vuta karibu kwenye skrini"</string>
-    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Gonga mara 3 ili ukuze"</string>
-    <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Gonga kitufe ili ukuze"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Ili kukuza"</b>", gonga skrini mara 3 haraka.\n"<ul><li>"Buruta vidole 2 au zaidi ili usogeze"</li>\n<li>"Bana vidole 2 au zaidi ili ubadilishe ukuzaji"</li></ul>\n\n<b>"Ili kukuza kwa muda mfupi"</b>", gonga skrini mara 3 kwa haraka na ukifika mara ya tatu, usiondoe kidole.\n"<ul><li>"Buruta ili usogeze kwenye skrini"</li>\n<li>"Inua kidole ili uvute mbali"</li></ul>\n\n"Huwezi kukuza ukitumia kibodi au sehemu ya viungo muhimu."</string>
-    <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Ukiwasha kipengele cha ukuzaji, tumia Kitufe cha zana za walio na matatizo ya kuona au kusikia hapo chini ya skrini ili ukuze haraka.\n\n"<b>"Ili kukuza"</b>", gusa Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha ugonge mahali popote kwenye skrini.\n"<ul><li>"Buruta kwa kutumia vidole 2 au zaidi ili usogeze"</li>\n<li>"Bana vidole 2 au zaidi ili ubadilishe ukuzaji"</li></ul>\n\n<b>"Ili kukuza kwa muda mfupi"</b>", gusa Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha uguse na ushikilie mahali popote kwenye skrini.\n"<ul><li>"Buruta ili usogeze kwenye skrini"</li>\n<li>"Inua kidole ili usogeze mbali"</li></ul>\n\n"Huwezi kuvuta karibu kwenye kibodi au sehemu ya viungo muhimu."</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Gusa mara 3 ili ukuze"</string>
+    <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Gusa kitufe ili ukuze"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Ili kukuza"</b>", gusa skrini mara 3 haraka.\n"<ul><li>"Buruta vidole 2 au zaidi ili usogeze"</li>\n<li>"Bana vidole 2 au zaidi ili ubadilishe ukuzaji"</li></ul>\n\n<b>"Ili kukuza kwa muda mfupi"</b>", gusa skrini mara 3 kwa haraka na ukifika mara ya tatu, usiondoe kidole.\n"<ul><li>"Buruta ili usogeze kwenye skrini"</li>\n<li>"Inua kidole ili uvute mbali"</li></ul>\n\n"Huwezi kukuza ukitumia kibodi au sehemu ya viungo muhimu."</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Ukiwasha kipengele cha ukuzaji, tumia Kitufe cha zana za walio na matatizo ya kuona au kusikia hapo chini ya skrini ili ukuze haraka.\n\n"<b>"Ili kukuza"</b>", gusa Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha uguse mahali popote kwenye skrini.\n"<ul><li>"Buruta kwa kutumia vidole 2 au zaidi ili usogeze"</li>\n<li>"Bana vidole 2 au zaidi ili ubadilishe ukuzaji"</li></ul>\n\n<b>"Ili kukuza kwa muda mfupi"</b>", gusa Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha uguse na ushikilie mahali popote kwenye skrini.\n"<ul><li>"Buruta ili usogeze kwenye skrini"</li>\n<li>"Inua kidole ili usogeze mbali"</li></ul>\n\n"Huwezi kuvuta karibu kwenye kibodi au sehemu ya viungo muhimu."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Kitufe cha zana za walio na matatizo ya kuona au kusikia kimewekwa kuwa <xliff:g id="SERVICE">%1$s</xliff:g>. Gusa na ushikilie Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha uchague ukuzaji ili utumie kipengele cha ukuzaji."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Njia mkato ya ufikiaji"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Njia ya mkato ya kitufe cha sauti"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Huduma ya njia ya mkato"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Ruhusu kwenye skrini iliyofungwa"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Ukiwasha njia ya mkato, unaweza kubonyeza vitufe vyote viwili vya sauti kwa sekunde 3 ili uanze kutumia kipengele cha zana za walio na matatizo ya kuona au kusikia."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Ukiwasha njia ya mkato, unaweza kubonyeza vitufe vyote viwili vya sauti kwa sekunde 3 ili uanze kutumia kipengele cha zana za walio na matatizo ya kuona au kusikia."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Maandishi yenye utofautishaji bora"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Sasisha otomatiki ukuzaji wa skrini"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Sasisha ukuzaji wa skrini kwenye mipito ya  programu"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Huenda ikaathiri utendaji"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Bofya kiashiria kikiacha kusonga"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Muda wa kusubiri kabla ya kubofya"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"IMEWASHWA"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"IMEZIMWA"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Onyesha katika Mipangilio ya Haraka"</string>
@@ -2283,7 +2288,7 @@
     <string name="wifi_setup_save" msgid="3659235094218508211">"Hifadhi"</string>
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"Ghairi"</string>
     <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"Inatambaza mitandao..."</string>
-    <string name="wifi_setup_status_select_network" msgid="3960480613544747397">"Gonga mtandao ili uunganishe"</string>
+    <string name="wifi_setup_status_select_network" msgid="3960480613544747397">"Gusa mtandao ili uunganishe"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Unganisha kwa mtandao uliopo"</string>
     <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Unganisha kwenye mtandao usio salama"</string>
     <string name="wifi_setup_status_edit_network" msgid="4765340816724760717">"Andika usanidi wa mtandao"</string>
@@ -2293,7 +2298,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="6796317704783144190">"EAP haiauniwi."</string>
     <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"Huwezi kusanidi muunganisho wa EAP Wi-Fi wakati wa usanidi. Baada ya kusanidi, unaweza kufanya hivyo katika Mipangilio &gt; mitandao isiyotumia waya."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Kuunganisha kunaweza kuchukua dakika chache..."</string>
-    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"Gonga "<b>"Inayofuata"</b>" ili uendelee kuweka mipangilio.\n\nGonga "<b>"Nyuma"</b>" ili uunganishe kwenye mtandao tofauti wa Wi-Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"Gusa "<b>"Inayofuata"</b>" ili uendelee kuweka mipangilio.\n\nGusa "<b>"Nyuma"</b>" ili uunganishe kwenye mtandao tofauti wa Wi-Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Kusawazisha kumelemazwa"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Kusawazisha kumelemazwa"</string>
     <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Inasawazisha sasa"</string>
@@ -2321,7 +2326,7 @@
     <string name="settings_backup_summary" msgid="7916877705938054035">"Hifadhi nakala za mipangilio yangu"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sawazisha sasa"</string>
     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Ghairi usawazishaji"</string>
-    <string name="sync_one_time_sync" msgid="3733796114909082260">"Gonga ili usawazishe<xliff:g id="LAST_SYNC_TIME">
+    <string name="sync_one_time_sync" msgid="3733796114909082260">"Gusa ili usawazishe<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g> sasa"</string>
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalenda"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Imechaguliwa <xliff:g id="NUMBER">%1$d</xliff:g> juu ya <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> juu ya <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Chagua zote"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Dhibiti mipango"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Matumizi ya data"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Matumizi data ya programu"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Hesabu ya data ya mtoa huduma huenda ikatofautiana na inayofanyika katika kifaa chako."</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mitandao ya simu"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Mitandao ya Wi-Fi inayopima data"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Ili uchague mitandao inayopima matumizi ya data, washa Wi-Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Otomatiki"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Mtandao unapima data"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Mtandao haupimi data"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Hesabu ya data ya mtoa huduma huenda ikatofautiana na ya kifaa chako."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Simu ya dharura"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Rudi kwa kupiga simu"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Kidhibiti cha Simu"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Matangazo ya dharura"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Arifa za dharura"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Kampuni zinazotoa huduma za mitandao"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Majina ya milango ya Mtandao"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Hali Iliyoimarishwa ya 4G LTE"</string>
@@ -2695,9 +2704,9 @@
     <string name="sim_settings_title" msgid="6822745211458959756">"SIM kadi"</string>
     <string name="sim_settings_summary" msgid="4050372057097516088">"<xliff:g id="SIM_NAME">%1$s</xliff:g> - <xliff:g id="SIM_NUMBER">%2$s</xliff:g>"</string>
     <string name="sim_cards_changed_message" msgid="7900721153345139783">"SIM kadi zimebadilika"</string>
-    <string name="sim_cards_changed_message_summary" msgid="8258058274989383204">"Gonga ili uweke mipangilio ya shughuli"</string>
+    <string name="sim_cards_changed_message_summary" msgid="8258058274989383204">"Gusa ili uweke mipangilio ya shughuli"</string>
     <string name="sim_cellular_data_unavailable" msgid="9109302537004566098">"Data ya mtandao wa simu haipatikani"</string>
-    <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"Gonga ili uchague SIM ya data"</string>
+    <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"Gusa ili uchague SIM ya data"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Tumia hii kwa simu wakati wote"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Chagua SIM ya data"</string>
     <string name="data_switch_started" msgid="2040761479817166311">"Inabadili SIM ya data, hii inaweza kuchukua hadi dakika moja..."</string>
@@ -2725,10 +2734,11 @@
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Zima Utangazaji wa Jina la Mtandao itazuia uunganishaji otomatiki kwenye mitandao iliyofichika."</string>
     <string name="sim_signal_strength" msgid="9144010043784767984">"dBm <xliff:g id="DBM">%1$d</xliff:g> asu <xliff:g id="ASU">%2$d</xliff:g>"</string>
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM kadi zimebadilishwa."</string>
-    <string name="sim_notification_summary" msgid="8858043655706669772">"Gonga ili uweke mipangilio"</string>
+    <string name="sim_notification_summary" msgid="8858043655706669772">"Gusa ili uweke mipangilio"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"SIM inayopendelewa kwa"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Uliza kila wakati"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Uteuzi unahitajika"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Uteuzi wa SIM"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Mipangilio"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">Onyesha vipengee %d vilivyofichwa</item>
@@ -2791,12 +2801,12 @@
     <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="3526905012224714078">"ishara"</string>
-    <string name="keywords_payment_settings" msgid="5220104934130446416">"lipa, gonga, malipo"</string>
+    <string name="keywords_payment_settings" msgid="5220104934130446416">"lipa, gusa, malipo"</string>
     <string name="keywords_backup" msgid="470070289135403022">"hifadhi rudufu, hifadhi nakala"</string>
     <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"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>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Gusa tagi ya NFC ili uandike..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Nenosiri si sahihi, jaribu tena."</string>
     <string name="status_write_success" msgid="5228419086308251169">"Imefanikiwa!"</string>
     <string name="status_failed_to_write" msgid="8072752734686294718">"Haiwezi kuandika data kwenye tagi ya NFC. Kama tatizo litaendelea, jaribu tagi tofauti"</string>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Arifa za programu"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Aina ya arifa"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Umuhimu"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Ruhusu programu iamue"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Ruhusu sauti"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Usawahi kuonyesha arifa"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Hakuna kukatizwa kwa sauti au maonyesho"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Hakuna sauti"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Toa sauti"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Toa sauti na ibukizi kwenye skrini"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Ichomoze kwenye skrini"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Chini"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Wastani"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Juu"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Dharura"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Ruhusu sauti"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Usiruhusu sauti, mtetemo au onyesho la kuchungulia kwenye skrini ya sasa."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Ruhusu kukatizwa"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Ruhusu programu itoe sauti, iteteme au ionyeshe arifa kwenye skrini"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Umuhimu wa kiwango cha chini"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Umuhimu wa wastani"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Umuhimu wa kiwango cha juu"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip picha ndani"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Picha ndani ya picha"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Ruhusu picha ndani ya picha"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Ruhusu programu hii iunde kidirisha cha picha ndani ya picha wakati programu imefunguka au baada ya kuiacha (kwa mfano, ukiendelea kutazama video). Kidirisha hiki kitaonekana  juu ya programu zingine unazotumia."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Ruhusu programu hii iunde kidirisha cha picha ndani ya picha wakati programu imefunguka au baada ya kuifunga (kwa mfano, ili uendelee kutazama video). Kidirisha hiki kitaonekana juu ya programu zingine unazotumia."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Kufikia kipengele cha Usinisumbue"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Hakuna programu zilizosakinishwa ambazo zimeomba kufikia kipengele cha Usinisumbue"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Inapakia programu ..."</string>
@@ -3046,7 +3057,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Imewashwa"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Imezimwa"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Kudumisha programu moja"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"Wakati mipangilio hii imewashwa, unaweza kutumia kipengele cha kudumisha programu moja ili uweze kutumia skrini ya sasa hadi utakapokiondoa.\n\nIli kudumisha programu moja:\n\n1. Hakikisha kuwa umewasha kipengele cha kudumisha programu moja.\n\n2. Fungua skrini unayotaka kutumia.\n\n3. Gonga Muhtasari.\n\n4. Telezesha kidole juu kisha ugonge aikoni ya kubandika."</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"Wakati mipangilio hii imewashwa, unaweza kutumia kipengele cha kudumisha programu moja ili uweze kutumia skrini ya sasa hadi utakapokiondoa.\n\nIli kudumisha programu moja:\n\n1. Hakikisha kuwa umewasha kipengele cha kudumisha programu moja.\n\n2. Fungua skrini unayotaka kutumia.\n\n3. Gusa Muhtasari.\n\n4. Telezesha kidole juu kisha uguse aikoni ya kubandika."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Omba mchoro wa kufungua kabla hujabandua"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Itisha PIN kabla hujabandua"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Omba nenosiri kabla hujabandua"</string>
@@ -3129,8 +3140,8 @@
     <string name="unknown_app" msgid="5275921288718717656">"Programu isiyojulikana"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Ruhusa za programu"</string>
     <string name="app_permissions_summary" msgid="5163974162150406324">"Programu zinazotumia <xliff:g id="APPS">%1$s</xliff:g>"</string>
-    <string name="tap_to_wake" msgid="7211944147196888807">"Gonga ili uanze kutumia"</string>
-    <string name="tap_to_wake_summary" msgid="4341387904987585616">"Gonga mara mbili mahali popote kwenye skrini ili uanze kutumia kifaa"</string>
+    <string name="tap_to_wake" msgid="7211944147196888807">"Gusa ili uanze kutumia"</string>
+    <string name="tap_to_wake_summary" msgid="4341387904987585616">"Gusa mara mbili mahali popote kwenye skrini ili uanze kutumia kifaa"</string>
     <string name="domain_urls_title" msgid="3132983644568821250">"Viungo vya kufungua"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"Usifungue viungo vinavyoweza kutumika"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"Fungua <xliff:g id="DOMAIN">%s</xliff:g>"</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Kuhamisha faili"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Kuhamisha picha (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Kutumia kifaa kama MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Uakisi wa SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Ukaguzi wa chini chini"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Idhini ya kufikia chini chini"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Tumia maandishi kutoka skrini"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Weka ratiba ya Mwanga wa Usiku"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Badilisha rangi ya skrini kuwa manjano ili uweze kulala"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Mwanga wa Usiku umewashwa"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Skrini imewekewa rangi ya manjano. Hii inaweza kukusaidia kulala kwa urahisi."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Mapendekezo"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Tumia rangi yenye halijoto ya baridi zaidi kwenye onyesho"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Zima skrini ili uweze kutekeleza ubadilishaji wa rangi"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Ili kuweka mabadiliko ya kichunguzi cha shughuli za simu, washa kifaa tena"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HAL HDR+ ya Kamera"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Ili kutekeleza mabadiliko ya HAL HDR+ ya Kamera, washa kifaa tena"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kitambuzi cha Leza ya Kamera"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Masasisho ya mfumo kiotomatiki"</string>
     <string name="usage" msgid="2977875522080448986">"Matumizi"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Matumizi ya data ya mtandao wa simu"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Onyo kuhusu data"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Weka kikomo cha data"</string>
     <string name="data_limit" msgid="1885406964934590552">"Kikomo cha data"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> zilitumiwa kati ya <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> zimetumika kuanzia <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Weka mipangilio"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Programu zingine zilizojumuishwa katika matumizi"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Futa na ugeuze"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Weka upya mipangilio ya udhibiti wa ukadiriaji katika Kidhibiti cha Njia za Mkato"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Imeweka upya mipangilio 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_title" msgid="387052719462473500">"Dhibiti maelezo kwenye skrini iliyofungwa"</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="8483187649355540109">"Usaidizi na vidokezo"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Hakuna programu zilizosakinishwa ambazo zimeomba kufikia huduma ya SMS zinazolipiwa"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Gharama ya huduma ya SMS zinazolipiwa itajumuishwa kwenye bili yako ya mtoa huduma. Ikiwa utatoa ruhusa ya programu fulani, utaweza kutuma SMS zinazolipiwa ukitumia programu hiyo."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Kufikia huduma ya SMS zinazolipiwa"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Vifaa vingine haviioni"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Imezimwa"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Imeunganishwa kwenye <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Imeunganishwa kwenye vifaa vingi"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Hali ya onyesho la kiolesura cha mfumo"</string>
@@ -3561,9 +3578,9 @@
     <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Geuza simu mara mbili ili uweke picha ya kujipiga mwenyewe"</string>
     <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Geuza kompyuta kibao mara mbili ili uweke picha ya kujipiga mwenyewe"</string>
     <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Geuza kifaa mara mbili ili uweke picha ya kujipiga mwenyewe"</string>
-    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Gonga mara mbili ili uangalie simu"</string>
-    <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Gonga mara mbili ili uangalie kompyuta kibao"</string>
-    <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Gonga mara mbili ili uangalie kifaa"</string>
+    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Gusa mara mbili ili uangalie simu"</string>
+    <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Gusa mara mbili ili uangalie kompyuta kibao"</string>
+    <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Gusa mara mbili ili uangalie kifaa"</string>
     <string name="ambient_display_summary" msgid="525662960806416373">"Ili uangalie saa, aikoni za arifa na maelezo mengine, gusa skrini yako mara mbili."</string>
     <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Angalia arifa wakati skrini imezimwa"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Inua ili uangalie simu"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Programu zinazofunguka papo hapo"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Fungua viungo katika programu, hata kama programu hazijasakinishwa"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Programu zinazofunguka papo hapo"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Akaunti ya programu zinazofunguka papo hapo"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Mapendeleo ya Programu Zinazofunguka Papo Hapo"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Programu zilizosakinishwa"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Hifadhi yako sasa inasimamiwa na kidhibiti cha hifadhi"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Akaunti za <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Kila mara VPN iwe imewashwa kwenye wasifu wako wa binafsi"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Kila mara VPN iwe imewashwa kwenye wasifu wako wa kazini"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Seva mbadala ya HTTP ya jumla iwekekwa"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Stakabadhi zinazoaminika"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Stakabadhi zinazoaminika"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Kitambulisho cha kuaminika katika wasifu wako wa binafsi"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Kitambulisho cha kuaminika katika wasifu wako wa kazini"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Angalau vyeti <xliff:g id="COUNT_1">%d</xliff:g> vya CA</item>
       <item quantity="one">Angalau cheti <xliff:g id="COUNT_0">%d</xliff:g> cha CA</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Maelezo ya Utaratibu wa Mtoa Huduma"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Anzisha Utaratibu wa Mtoa Huduma"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Nini kipya na cha kusisimua?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Angalia vipengele 5 vikuu"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Kagua simu yako mpya"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Kagua kompyuta yako kibao mpya"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Kagua kifaa chako kipya"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Kipengele hiki hakipatikani kwenye kifaa hiki"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Hali ya usajili wa IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Imesajiliwa"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Haijasajiliwa"</string>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 0411914..4d30969 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -59,13 +59,6 @@
     <dimen name="switchbar_subsettings_margin_start">80dp</dimen>
     <dimen name="switchbar_subsettings_margin_end">24dp</dimen>
 
-    <!-- Search title (recent / results) padding start -->
-    <dimen name="search_title_padding_start">24dp</dimen>
-
-    <!-- Result item image margin start / end -->
-    <dimen name="search_result_item_image_margin_start">24dp</dimen>
-    <dimen name="search_result_item_image_margin_end">32dp</dimen>
-
     <dimen name="search_bar_height">64dp</dimen>
 
     <!-- Dimensions for Wifi Assistant Card -->
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 7a0d60f..6cabdb7 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"உங்கள் செய்திகளை %1$s அணுக விரும்புகிறது. %2$s க்கு அணுகலை வழங்கவா?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM அணுகல் கோரிக்கை"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> உங்கள் சிம் கார்டை அணுக விரும்புகிறது. சிம் கார்டிற்கு அணுகல் வழங்குவது இணைப்பின் போது, உங்கள் சாதனத்தின் தரவு இணைப்பை முடக்கும். <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>க்கு அணுகல் வழங்கவும்"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"பிற சாதனங்களில் \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' எனத் தெரியும்"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"பிற சாதனங்களில் “<xliff:g id="DEVICE_NAME">^1</xliff:g>” எனத் தெரியும்"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"உங்கள் சாதனங்கள்"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"புதிய சாதனத்தை இணை"</string>
     <string name="date_and_time" msgid="9062980487860757694">"தேதி &amp; நேரம்"</string>
@@ -298,8 +298,8 @@
     <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>
-    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"நீங்கள் தரவு ரோமிங்கை அனுமதிக்கும்போது, குறிப்பிட்ட ரோமிங் கட்டணங்கள் உங்களுக்கு விதிக்கப்படலாம்!\n\nஅமைப்பானது, டேப்லெட்டில் உள்ள அனைவரையும் பாதிக்கும்."</string>
-    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"நீங்கள் தரவு ரோமிங்கை அனுமதிக்கும்போது, குறிப்பிட்ட ரோமிங் கட்டணங்கள் உங்களுக்கு விதிக்கப்படலாம்!\n\nஅமைப்பானது, தொலைபேசியில் உள்ள அனைவரையும் பாதிக்கும்."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"நீங்கள் தரவு ரோமிங்கை அனுமதிக்கும்போது, குறிப்பிட்ட ரோமிங் பேமெண்ட்கள் உங்களுக்கு விதிக்கப்படலாம்!\n\nஅமைப்பானது, டேப்லெட்டில் உள்ள அனைவரையும் பாதிக்கும்."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"நீங்கள் தரவு ரோமிங்கை அனுமதிக்கும்போது, குறிப்பிட்ட ரோமிங் பேமெண்ட்கள் உங்களுக்கு விதிக்கப்படலாம்!\n\nஅமைப்பானது, தொலைபேசியில் உள்ள அனைவரையும் பாதிக்கும்."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"டேட்டா ரோமிங்கை அனுமதிக்கவா?"</string>
     <string name="networks" msgid="6333316876545927039">"ஆபரேட்டர் தேர்வு"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"நெட்வொர்க் ஆபரேட்டரைத் தேர்வுசெய்யவும்"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"அடுத்து"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"கைரேகையை அமைக்க வேண்டாமா?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"கைரேகையை அமைப்பதற்கு ஒன்று அல்லது இரண்டு நிமிடங்கள் மட்டுமே ஆகும். தவிர்த்தால், பிறகு அமைப்புகளுக்குச் சென்று கைரேகையைச் சேர்க்கலாம்."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"திரைப் பூட்டைத் தவிர்க்கவா?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"சாதனப் பாதுகாப்பு அம்சங்களை இயக்க முடியாது. இந்த டேப்லெட்டைத் தொலைத்தாலோ, திருடப்பட்டாலோ அல்லது மீட்டமைத்தாலோ, பிறர் இதைப் பயன்படுத்துவதைத் தடுக்க முடியாது."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"சாதனப் பாதுகாப்பு அம்சங்களை இயக்க முடியாது. இந்தச் சாதனத்தைத் தொலைத்தாலோ, திருடப்பட்டாலோ அல்லது மீட்டமைத்தாலோ, பிறர் இதைப் பயன்படுத்துவதைத் தடுக்க முடியாது."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"சாதனப் பாதுகாப்பு அம்சங்களை இயக்க முடியாது. இந்த மொபைலைத் தொலைத்தாலோ, திருடப்பட்டாலோ அல்லது மீட்டமைத்தாலோ, பிறர் இதைப் பயன்படுத்துவதைத் தடுக்க முடியாது."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"அனுமதிக்கப்படும் அதிகபட்சக் கைரேகைகளைச் சேர்த்துவிட்டீர்கள்"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"மேலும் கைரேகைகளைச் சேர்க்க முடியவில்லை"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"எல்லா கைரேகைகளையும் அகற்றவா?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'ஐ அகற்று"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"இந்தக் கைரேகையை அழிக்க விரும்புகிறீர்களா?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"கைரேகைகளை நீக்கிவிட்டால், அவற்றைப் பயன்படுத்தி மொபைலைத் திறக்கவோ, வாங்குவதை அங்கீகரிக்கவோ அல்லது பயன்பாடுகளில் உள்நுழையவோ முடியாது"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"கைரேகைகளை நீக்கிவிட்டால், அவற்றைப் பயன்படுத்தி பணி விவரத்தைத் திறக்கவோ, வாங்குவதை அங்கீகரிக்கவோ அல்லது பணிப் பயன்பாடுகளில் உள்நுழையவோ முடியாது"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"ஆம், அகற்று"</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"கூடுதல் பாதுகாப்பிற்கு, மாற்றுத் திரைப் பூட்டை அமைக்கவும்."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"கூடுதல் பாதுகாப்பிற்கு, மாற்றுத் திரைப் பூட்டை அமைக்கவும்."</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>
@@ -497,37 +502,37 @@
     <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_fingerprint" msgid="8212242533942400457">"வடிவம் இல்லாமல் சாதனப் பாதுகாப்பு அம்சங்கள் செயல்படாது.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"பேட்டர்ன் இல்லாமல் சாதனப் பாதுகாப்பு அம்சங்கள் செயல்படாது.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ஏற்கனவே சேமித்த கைரேகைகளும் இந்தச் சாதனத்திலிருந்து அகற்றப்படும். எனவே அவற்றின் மூலம் உங்களால் மொபைலைத் திறக்க முடியாது, வாங்குதல்களை அங்கீகரிக்க முடியாது அல்லது பயன்பாடுகளில் உள்நுழைய முடியாது.\""</string>
+</xliff:g>சேமிக்கப்பட்டிருக்கும் கைரேகைகளும் இந்தச் சாதனத்திலிருந்து அகற்றப்படும். எனவே அவற்றின் மூலம் உங்களால் மொபைலைத் திறக்கவோ, வாங்குவதை அங்கீகரிக்கவோ அல்லது பயன்பாடுகளில் உள்நுழையவோ முடியாது."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"பின் இல்லாமல் சாதனப் பாதுகாப்பு அம்சங்கள் செயல்படாது."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"பின் இல்லாமல் சாதனப் பாதுகாப்பு அம்சங்கள் செயல்படாது.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"பின் இல்லாமல் சாதனப் பாதுகாப்பு அம்சங்கள் செயல்படாது.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ஏற்கனவே சேமித்த கைரேகைகளும் இந்தச் சாதனத்திலிருந்து அகற்றப்படும். எனவே அவற்றின் மூலம் உங்களால் மொபைலைத் திறக்க முடியாது, வாங்குதல்களை அங்கீகரிக்க முடியாது அல்லது பயன்பாடுகளில் உள்நுழைய முடியாது.\""</string>
+</xliff:g>சேமிக்கப்பட்டிருக்கும் கைரேகைகளும் இந்தச் சாதனத்திலிருந்து அகற்றப்படும். எனவே அவற்றின் மூலம் உங்களால் மொபைலைத் திறக்கவோ, வாங்குவதை அங்கீகரிக்கவோ அல்லது பயன்பாடுகளில் உள்நுழையவோ முடியாது."</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"கடவுச்சொல் இல்லாமல் சாதனப் பாதுகாப்பு அம்சங்கள் செயல்படாது.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ஏற்கனவே சேமித்த கைரேகைகளும் இந்தச் சாதனத்திலிருந்து அகற்றப்படும். எனவே அவற்றின் மூலம் உங்களால் மொபைலைத் திறக்க முடியாது, வாங்குதல்களை அங்கீகரிக்க முடியாது அல்லது பயன்பாடுகளில் உள்நுழைய முடியாது.\""</string>
+</xliff:g>சேமிக்கப்பட்டிருக்கும் கைரேகைகளும் இந்தச் சாதனத்திலிருந்து அகற்றப்படும். எனவே அவற்றின் மூலம் உங்களால் மொபைலைத் திறக்கவோ, வாங்குவதை அங்கீகரிக்கவோ அல்லது பயன்பாடுகளில் உள்நுழையவோ முடியாது."</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"திரைப் பூட்டு இல்லாமல் சாதனப் பாதுகாப்பு அம்சங்கள் செயல்படாது.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ஏற்கனவே சேமித்த கைரேகைகளும் இந்தச் சாதனத்திலிருந்து அகற்றப்படும். எனவே அவற்றின் மூலம் உங்களால் மொபைலைத் திறக்க முடியாது, வாங்குதல்களை அங்கீகரிக்க முடியாது அல்லது பயன்பாடுகளில் உள்நுழைய முடியாது.\""</string>
+</xliff:g>சேமிக்கப்பட்டிருக்கும் கைரேகைகளும் இந்தச் சாதனத்திலிருந்து அகற்றப்படும். எனவே அவற்றின் மூலம் உங்களால் மொபைலைத் திறக்கவோ, வாங்குவதை அங்கீகரிக்கவோ அல்லது பயன்பாடுகளில் உள்நுழையவோ முடியாது."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"வடிவம் இல்லாமல் சுயவிவரப் பாதுகாப்பு அம்சங்கள் செயல்படாது."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"வடிவம் இல்லாமல் சுயவிவரப் பாதுகாப்பு அம்சங்கள் செயல்படாது.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"பேட்டர்ன் இல்லாமல் சுயவிவரப் பாதுகாப்பு அம்சங்கள் செயல்படாது.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ஏற்கனவே சேமித்த கைரேகைகளும் இந்தச் சுயவிவரத்திலிருந்து அகற்றப்படும். எனவே அவற்றின் மூலம் உங்களால் சுயவிவரத்தைத் திறக்கவோ, வாங்குவதை அங்கீகரிக்கவோ அல்லது பயன்பாடுகளில் உள்நுழையவோ முடியாது.\""</string>
+</xliff:g>சேமிக்கப்பட்டிருக்கும் கைரேகைகளும் இந்தச் சுயவிவரத்திலிருந்து அகற்றப்படும். எனவே அவற்றின் மூலம் உங்களால் சுயவிவரத்தைத் திறக்கவோ, வாங்குவதை அங்கீகரிக்கவோ அல்லது பயன்பாடுகளில் உள்நுழையவோ முடியாது."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"பின் இல்லாமல் சுயவிவரப் பாதுகாப்பு அம்சங்கள் செயல்படாது."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"பின் இல்லாமல் சுயவிவரப் பாதுகாப்பு அம்சங்கள் செயல்படாது.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"பின் இல்லாமல் சுயவிவரப் பாதுகாப்பு அம்சங்கள் செயல்படாது.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ஏற்கனவே சேமித்த கைரேகைகளும் இந்தச் சுயவிவரத்திலிருந்து அகற்றப்படும். எனவே அவற்றின் மூலம் உங்களால் சுயவிவரத்தைத் திறக்கவோ, வாங்குவதை அங்கீகரிக்கவோ அல்லது பயன்பாடுகளில் உள்நுழையவோ முடியாது.\""</string>
+</xliff:g>சேமிக்கப்பட்டிருக்கும் கைரேகைகளும் இந்தச் சுயவிவரத்திலிருந்து அகற்றப்படும். எனவே அவற்றின் மூலம் உங்களால் சுயவிவரத்தைத் திறக்கவோ, வாங்குவதை அங்கீகரிக்கவோ அல்லது பயன்பாடுகளில் உள்நுழையவோ முடியாது."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"கடவுச்சொல் இல்லாமல் சுயவிவரப் பாதுகாப்பு அம்சங்கள் செயல்படாது."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"கடவுச்சொல் இல்லாமல் சுயவிவரப் பாதுகாப்பு அம்சங்கள் செயல்படாது.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"கடவுச்சொல் இல்லாமல் சுயவிவரப் பாதுகாப்பு அம்சங்கள் செயல்படாது.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ஏற்கனவே சேமித்த கைரேகைகளும் இந்தச் சுயவிவரத்திலிருந்து அகற்றப்படும். எனவே அவற்றின் மூலம் உங்களால் சுயவிவரத்தைத் திறக்கவோ, வாங்குவதை அங்கீகரிக்கவோ அல்லது பயன்பாடுகளில் உள்நுழையவோ முடியாது.\""</string>
+</xliff:g>சேமிக்கப்பட்டிருக்கும் கைரேகைகளும் இந்தச் சுயவிவரத்திலிருந்து அகற்றப்படும். எனவே அவற்றின் மூலம் உங்களால் சுயவிவரத்தைத் திறக்கவோ, வாங்குவதை அங்கீகரிக்கவோ அல்லது பயன்பாடுகளில் உள்நுழையவோ முடியாது."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"திரைப் பூட்டு இல்லாமல் சுயவிவரப் பாதுகாப்பு அம்சங்கள் செயல்படாது."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"திரைப் பூட்டு இல்லாமல் சுயவிவரப் பாதுகாப்பு அம்சங்கள் செயல்படாது.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"திரைப் பூட்டு இல்லாமல் சுயவிவரப் பாதுகாப்பு அம்சங்கள் செயல்படாது.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ஏற்கனவே சேமித்த கைரேகைகளும் இந்தச் சுயவிவரத்திலிருந்து அகற்றப்படும். எனவே அவற்றின் மூலம் உங்களால் சுயவிவரத்தைத் திறக்கவோ, வாங்குவதை அங்கீகரிக்கவோ அல்லது பயன்பாடுகளில் உள்நுழையவோ முடியாது.\""</string>
+</xliff:g>சேமிக்கப்பட்டிருக்கும் கைரேகைகளும் இந்தச் சுயவிவரத்திலிருந்து அகற்றப்படும். எனவே அவற்றின் மூலம் உங்களால் சுயவிவரத்தைத் திறக்கவோ, வாங்குவதை அங்கீகரிக்கவோ அல்லது பயன்பாடுகளில் உள்நுழையவோ முடியாது."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"ஆம், அகற்று"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"திறப்பதற்கான வடிவத்தை மாற்று"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"திறக்கும் பின்னை மாற்று"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"இலக்கங்கள் ஏறுவரிசையில், இறங்குவரிசையில் அல்லது ஒரே இலக்கத்தைப் பயன்படுத்துவது அனுமதிக்கப்படவில்லை"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"சரி"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"ரத்துசெய்"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"அழி"</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>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS கிடைக்கிறது"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS கிடைக்கிறது)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"நெட்வொர்க் கடவுச்சொல்லை உள்ளிடவும்"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"தொலைத்தொடர்பு நிறுவன வைஃபை நெட்வொர்க்"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> மூலம் இணை"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"இருப்பிடத்தைத் துல்லியமாக அறிவதற்கு மேம்படுத்த மற்றும் பிற காரணங்களுக்காக, வைஃபை முடக்கத்தில் இருக்கும்போதும் நெட்வொர்க்கை ஸ்கேன் செய்வதை இயக்கத்தில் வைக்க <xliff:g id="APP_NAME">%1$s</xliff:g> விரும்புகிறது.\n\nஸ்கேன் செய்ய விரும்பும் எல்லா பயன்பாடுகளுக்கும் இதை அனுமதிக்கவா?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"இதனை முடக்க, கூடுதல் உருப்படி மெனுவில் மேம்பட்டவை என்பதற்குச் செல்லவும்."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"அனுமதி"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"இணை"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"நெட்வொர்க்குடன் இணைக்க முடியவில்லை"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"மறந்துவிடு"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"மாற்று"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"நெட்வொர்க்கை நீக்குவதில் தோல்வி"</string>
     <string name="wifi_save" msgid="3331121567988522826">"சேமி"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"நெட்வொர்க்கைச் சேமிப்பதில் தோல்வி"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"மேம்பட்ட வைஃபை"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC முகவரி"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP முகவரி"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"நெட்வொர்க் தகவல்"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"சப்நெட் மாஸ்க்"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 முகவரிகள்"</string>
@@ -877,18 +887,17 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"அழைப்பை ரத்துசெய்யவா?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g> உடன் இணைப்பதற்கான அழைப்பை ரத்துசெய்ய விரும்புகிறீர்களா?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"இந்தக் குழுவை மறக்கவா?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"போர்ட்டபில் வைஃபை ஹாட்ஸ்பாட்"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"வைஃபை ஹாட்ஸ்பாட்"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"பிற சாதனங்களுடன் இன்டர்நெட் அல்லது உள்ளடக்கத்தைப் பகிரவில்லை"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"ஹாட்ஸ்பாட் மூலம் டேப்லெட்டின் இணைய இணைப்பைப் பகிர்கிறது"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"ஹாட்ஸ்பாட் மூலம் மொபைலின் இணைய இணைப்பைப் பகிர்கிறது"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"பயன்பாடானது உள்ளடக்கத்தைப் பகிர்கிறது. இணைய இணைப்பைப் பகிர, ஹாட்ஸ்பாட்டை முடக்கி, பின்னர் இயக்கவும்"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"வைஃபையின் பெயர்"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"ஹாட்ஸ்பாட் பெயர்"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>ஐ இயக்குகிறது..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> உடன் பிற சாதனங்களை இணைக்கலாம்"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"வைஃபை கடவுச்சொல்"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"ஹாட்ஸ்பாட் கடவுச்சொல்"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP அலைவரிசை"</string>
-    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"உங்கள் பிற சாதனங்களுக்கு வைஃபை நெட்வொர்க்கை உருவாக்க, ஹாட்ஸ்பாட்டைப் பயன்படுத்தவும். ஹாட்ஸ்பாட்டானது உங்கள் மொபைல் டேட்டா இணைப்பைப் பயன்படுத்தி இணையத்தை வழங்கும். கூடுதல் மொபைல் டேட்டா கட்டணங்கள் விதிக்கப்படலாம்."</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"உங்கள் பிற சாதனங்களுக்கு வைஃபை நெட்வொர்க்கை உருவாக்க, ஹாட்ஸ்பாட்டைப் பயன்படுத்தவும். ஹாட்ஸ்பாட்டானது உங்கள் மொபைல் டேட்டா இணைப்பைப் பயன்படுத்தி இணையத்தை வழங்கும். கூடுதல் மொபைல் டேட்டா பேமெண்ட்கள் விதிக்கப்படலாம்."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"அருகிலுள்ள சாதனங்களுடன் உள்ளடக்கத்தைப் பகிர, பயன்பாடுகள் ஹாட்ஸ்பாட்டையும் உருவாக்கலாம்."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"ஹாட்ஸ்பாட்டை இயக்குகிறது…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"ஹாட்ஸ்பாட்டை முடக்குகிறது…"</string>
@@ -935,10 +944,10 @@
     <item msgid="2339246858001475047">"2"</item>
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
-    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"வைஃபை அழைப்பு இயக்கத்தில் இருக்கும் போது, முன்னுரிமை மற்றும் வலிமையாக இருக்கிற சிக்னலைப் பொறுத்து வைஃபை நெட்வொர்க்குகள் அல்லது மொபைல் நிறுவன நெட்வொர்க்குக்கு அழைப்புகளை உங்கள் ஃபோன் திசைதிருப்பும். இந்த அம்சத்தை இயக்குவதற்கு முன், கட்டணங்கள் மற்றும் பிற விவரங்கள் குறித்து உங்கள் மொபைல் நிறுவனத்திடமிருந்து தெரிந்துகொள்ளவும்."</string>
+    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"வைஃபை அழைப்பு இயக்கத்தில் இருக்கும் போது, முன்னுரிமை மற்றும் வலிமையாக இருக்கிற சிக்னலைப் பொறுத்து வைஃபை நெட்வொர்க்குகள் அல்லது மொபைல் நிறுவன நெட்வொர்க்குக்கு அழைப்புகளை உங்கள் ஃபோன் திசைதிருப்பும். இந்த அம்சத்தை இயக்குவதற்கு முன், பேமெண்ட்கள் மற்றும் பிற விவரங்கள் குறித்து உங்கள் மொபைல் நிறுவனத்திடமிருந்து தெரிந்துகொள்ளவும்."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"எமர்ஜென்சி முகவரியை மாற்று"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"வைஃபையைப் பயன்படுத்தி 911 என்ற எண்ணிற்கு அழைத்தால், அவசர சேவைகள் உங்கள் இருப்பிடத்தை முகவரியாகப் பயன்படுத்தும்"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"வைஃபையைப் பயன்படுத்தி அவசர அழைப்பைச் செய்தால், அவசரச் சேவைகள் இந்த முகவரியைப் பயன்படுத்தும்"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"திரை அமைப்பு"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ஒலி"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ஒலியளவுகள்"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"தேடு"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"தேடல் அமைப்பு மற்றும் வரலாற்றை நிர்வகிக்கவும்"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"முடிவுகள் இல்லை"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"வரலாற்றை அழி"</string>
     <string name="display_settings" msgid="7965901687241669598">"திரை அமைப்பு"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"திரையைத் தானாகச் சுழற்று"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"ஒளிமிக்க நிறங்கள்"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"இயல்புநிலை APN அமைப்புகளை மீட்டமைக்கிறது."</string>
     <string name="menu_restore" msgid="8260067415075573273">"இயல்புநிலைக்கு மீட்டமை"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"இயல்புநிலை APN அமைப்புகளை மீட்டமைப்பது முடிந்தது."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"மீட்டமை"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"நெட்வொர்க் அமைப்புகள் மீட்டமைப்பு"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"மீட்டமைவு விருப்பங்கள்"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"நெட்வொர்க், ஆப்ஸ் அல்லது சாதனத்தை மீட்டமைக்கலாம்"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"வைஃபை, மொபைல் &amp; புளூடூத்தை மீட்டமை"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"பின்வருபவை உட்பட, எல்லா நெட்வொர்க் அமைப்புகளையும் இது மீட்டமைக்கும்:\n\n"<li>"வைஃபை"</li>\n<li>"மொபைல் தரவு"</li>\n<li>"புளூடூத்"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"அமைப்புகளை மீட்டமை"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"எல்லா நெட்வொர்க் அமைப்புகளையும் மீட்டமைக்கவா? இதைச் செயல்தவிர்க்க முடியாது!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"மீட்டமைக்கவா?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"நெட்வொர்க் அமைப்புகளை மீட்டமைக்க, இந்தப் பயனருக்கு அனுமதியில்லை"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"நெட்வொர்க் அமைப்புகள் மீட்டமைக்கப்பட்டன"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"தரவின் ஆரம்பநிலை மீட்டமைப்பு"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> கணக்குகள் மீட்டமைக்கப்படும்</item>
-      <item quantity="one">1 கணக்கு மீட்டமைக்கப்படும்</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"சாதனச் சேமிப்பகமும் எல்லாத் தரவும் மீட்டமைக்கப்படும்"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"எல்லாத் டேட்டாவையும் அழி (ஆரம்பநிலை மீட்டமைவு)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"இது, உங்கள் டேப்லெடின் "<b>"அகச் சேமிப்பிடத்தில்"</b>" உள்ள எல்லா டேட்டாவையும் அழித்துவிடும், இவற்றில் உள்ளடங்குவன:\n\n"<li>"உங்கள் Google கணக்கு"</li>\n<li>"சிஸ்டம் மற்றும் ஆப்ஸ் டேட்டா, மற்றும் அமைப்புகள்"</li>\n<li>"பதிவிறக்கப்பட்ட பயன்பாடுகள்"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"இது, உங்கள் மொபைலின் "<b>"அகச் சேமிப்பிடத்தில்"</b>" உள்ள பின்வரும் எல்லா டேட்டாவையும் அழித்துவிடும்:\n\n"<li>"உங்கள் Google கணக்கு"</li>\n<li>"சிஸ்டம், ஆப்ஸ் டேட்டா மற்றும் அமைப்புகள்"</li>\n<li>"பதிவிறக்கிய பயன்பாடுகள்"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"தற்போது, பின்வரும் கணக்குகளில் உள்நுழைந்துள்ளீர்கள்:\n"</string>
@@ -1391,8 +1397,8 @@
     <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_text" msgid="1522783933230274787">"<xliff:g id="CURRENT_APP">%2$s</xliff:g> க்குப் பதிலாக <xliff:g id="NEW_APP">%1$s</xliff:g> ஐ உங்கள் SMS பயன்பாடாகப் பயன்படுத்தவா?"</string>
-    <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"<xliff:g id="NEW_APP">%s</xliff:g> ஐ உங்கள் SMS பயன்பாடாகப் பயன்படுத்தவா?"</string>
+    <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"<xliff:g id="CURRENT_APP">%2$s</xliff:g>க்குப் பதிலாக <xliff:g id="NEW_APP">%1$s</xliff:g>ஐ உங்கள் SMS பயன்பாடாகப் பயன்படுத்தவா?"</string>
+    <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"<xliff:g id="NEW_APP">%s</xliff:g>ஐ உங்கள் SMS பயன்பாடாகப் பயன்படுத்தவா?"</string>
     <string name="network_scorer_picker_title" msgid="6383879578279046456">"நெட்வொர்க் மதிப்பீட்டு வழங்குநர்"</string>
     <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"ஏதுமில்லை"</string>
     <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"வைஃபை அசிஸ்டண்டை மாற்றவா?"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"பாதுகாப்பு தகவல்"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"உங்களுக்குத் தரவு இணைப்பு இல்லை. இப்போது இந்தத் தகவலைப் பார்க்க இணையத்துடன் இணைக்கப்பட்ட எந்தக் கணினியிலிருந்தும் %s க்குச் செல்லவும்."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ஏற்றுகிறது..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"உங்கள் கடவுச்சொல்லைத் தேர்வுசெய்க"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"திரைப் பூட்டை அமைக்கவும்"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"பாதுகாப்பிற்கு, கடவுச்சொல்லை அமைக்கவும்"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"கடவுச்சொல்லை அமைக்கவும்"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"உங்கள் வடிவத்தைத் தேர்வுசெய்யவும்"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"வடிவத்தை அமைக்கவும்"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"உங்கள் பின் ஐத் தேர்வுசெய்யவும்"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"பாதுகாப்பிற்கு, பின்னை அமைக்கவும்"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"பின்னை அமைக்கவும்"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"உங்கள் கடவுச்சொல்லை உறுதிப்படுத்தவும்"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"கடவுச்சொல்லை மீண்டும் உள்ளிடவும்"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"உங்கள் வடிவத்தை உறுதிப்படுத்தவும்"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"உங்கள் பின்னை உறுதிசெய்யவும்"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"பின்னை மீண்டும் உள்ளிடவும்"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"கடவுச்சொற்கள் பொருந்தவில்லை"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"பின்கள் பொருந்தவில்லை"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"எப்படித் திறக்க வேண்டும்?"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"தொடர, பணிப் பேட்டர்னை வரையவும்"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"தொடர, பணிப் பின்னை உள்ளிடவும்"</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">"சாதனத்தை மீண்டும் தொடங்கியுள்ளதால், சாதனப் பின்னை உள்ளிட்டுத் தொடரவும்."</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">"சாதனத்தை மீண்டும் தொடங்கியுள்ளதால், பணிப் பின்னை உள்ளிட்டுத் தொடரவும்."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"சாதனத்தை மீண்டும் தொடங்கியுள்ளதால், பணிக் கடவுச்சொல்லை உள்ளிட்டுத் தொடரவும்."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"கூடுதல் பாதுகாப்பிற்கு, சாதனப் பேட்டர்னை வரையவும்"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"கூடுதல் பாதுகாப்பிற்கு, சாதனப் பின்னை உள்ளிடவும்"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"கூடுதல் பாதுகாப்பிற்கு, சாதனக் கடவுச்சொல்லை உள்ளிடவும்"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"கூடுதல் பாதுகாப்பிற்கு, பணிப் பேட்டர்னை வரையவும்"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"கூடுதல் பாதுகாப்பிற்கு, பணிப் பின்னை உள்ளிடவும்"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"கூடுதல் பாதுகாப்பிற்கு, பணிக் கடவுச்சொல்லை உள்ளிடவும்"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"ஆரம்பநிலை அமைப்புகளுக்கு மீட்டமைக்கப்பட்டது. மொபைலைப் பயன்படுத்த, முந்தைய பேட்டர்னை உள்ளிடவும்."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"ஆரம்பநிலை அமைப்புகளுக்கு மீட்டமைக்கப்பட்டது. மொபைலைப் பயன்படுத்த, முந்தைய பின்னை உள்ளிடவும்."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"ஆரம்பநிலை அமைப்புகளுக்கு மீட்டமைக்கப்பட்டது. மொபைலைப் பயன்படுத்த, முந்தைய கடவுச்சொல்லை உள்ளிடவும்."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"பேட்டர்னைச் சரிபார்க்கவும்"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"பின்னைச் சரிபார்க்கவும்"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"கடவுச்சொல்லைச் சரிபார்க்கவும்"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"தவறான பின்"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"தவறான கடவுச்சொல்"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"தவறான வடிவம்"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"விட்ஜெட்டை உருவாக்கி, அணுகலை அனுமதிக்கவா?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"விட்ஜெட்டை உருவாக்கியவுடன், இது காண்பிக்கும் எல்லா தரவையும் <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> அணுக முடியும்."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"விட்ஜெட்களை உருவாக்கவும், அவற்றின் தரவை அணுகவும் எப்போதும் <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ஐ அனுமதி"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>நா <xliff:g id="HOURS">%2$d</xliff:g>ம.நே. <xliff:g id="MINUTES">%3$d</xliff:g>நி <xliff:g id="SECONDS">%4$d</xliff:g>வி"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>ம.நே. <xliff:g id="MINUTES">%2$d</xliff:g>நி <xliff:g id="SECONDS">%3$d</xliff:g>வி"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>நி <xliff:g id="SECONDS">%2$d</xliff:g>வி"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> வினாடிகள்"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"பயன்பாட்டுப் புள்ளிவிவரங்கள்"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"பயன்பாட்டுப் புள்ளிவிவரங்கள்"</string>
     <string name="display_order_text" msgid="8592776965827565271">"இவ்வாறு வரிசைப்படுத்து:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"திரைப் படிப்பான்கள், திரை, ஊடாடல் கட்டுப்பாடுகள்"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"காட்சி அமைப்புகள்"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"உங்கள் தேவைகளுக்கேற்ப இந்தச் சாதனத்தைத் தனிப்பயனாக்கலாம். இந்த அணுகல்தன்மை அம்சங்களை அமைப்புகளுக்குச் சென்று மாற்றலாம்."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"எழுத்துரு அளவை அதிகரிக்கவும்"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"எழுத்தின் அளவை மாற்று"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"திரைப் படிப்பான்கள்"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ஆடியோ &amp; திரையில் காட்டப்படும் உரை"</string>
     <string name="display_category_title" msgid="685461049938269166">"திரை அமைப்பு"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"பெரிதாக்க"</b>", திரையில் 3 முறை வேகமாகத் தட்டவும்.\n"<ul><li>"ஸ்க்ரோல் செய்ய, இரண்டு அல்லது அதற்கு மேற்பட்ட விரல்களால் இழுக்கவும்"</li>\n<li>"அளவை மாற்ற, இரண்டு அல்லது அதற்கு மேற்பட்ட விரல்களால் பின்ச் செய்யவும்"</li></ul>\n\n<b>"தற்காலிகமாகப் பெரிதாக்க"</b>", திரையை 3 முறை வேகமாகத் தட்டி, மூன்றாவது முறை தட்டும் போது விரலால் திரையைப் பிடித்திருக்கவும்.\n"<ul><li>"திரையில் நகர்த்த, இழுக்கவும்"</li>\n<li>"சிறிதாக்க, விரலை எடுக்கவும்"</li></ul>\n\n"விசைப்பலகையிலும் வழிசெலுத்தல் பட்டியிலும் பெரிதாக்க முடியாது."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"பெரிதாக்குதலை இயக்கியிருக்கும் போது, உடனடியாகப் பெரிதாக்க, திரையின் கீழ்ப்பகுதியில் இருக்கும் அணுகல்தன்மைப் பொத்தானைப் பயன்படுத்தவும்.\n\n"<b>"பெரிதாக்க"</b>", அணுகல்தன்மைப் பொத்தானைத் தட்டி, திரையில் எங்கேயாவது தட்டவும்.\n"<ul><li>"ஸ்க்ரோல் செய்ய, இரண்டு அல்லது அதற்கு மேற்பட்ட விரல்களால் இழுக்கவும்"</li>\n<li>"அளவை மாற்ற, இரண்டு அல்லது அதற்கு மேற்பட்ட விரல்களால் பின்ச் செய்யவும்"</li></ul>\n\n<b>"தற்காலிகமாகப் பெரிதாக்க"</b>", அணுகல்தன்மைப் பொத்தானைத் தட்டி, திரையில் எங்கேயாவது தொட்டுப் பிடித்திருக்கவும்.\n"<ul><li>"திரையில் நகர்த்த, இழுக்கவும்"</li>\n<li>"சிறிதாக்க, விரலை எடுக்கவும்"</li></ul>\n\n"விசைப்பலகை அல்லது வழிசெலுத்தல் பட்டியில் பெரிதாக்க முடியாது."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"அணுகல்தன்மைப் பொத்தான், <xliff:g id="SERVICE">%1$s</xliff:g> என்பதற்கு அமைக்கப்பட்டுள்ளது. பெரிதாக்குதலைப் பயன்படுத்த, அணுகல்தன்மைப் பொத்தானைத் தொட்டுப் பிடித்து, பெரிதாக்குதலைத் தேர்ந்தெடுக்கவும்."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"அணுகல்தன்மைக் குறுக்குவழி"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"ஒலியளவு விசைக்கான குறுக்குவழி"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"குறுக்குவழிச் சேவை"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"பூட்டுத் திரையிலிருந்து அனுமதி"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"குறுக்குவழி இயக்கப்பட்டிருக்கும் போது, அணுகல்தன்மை அம்சத்தைத் தொடங்க, 3 வினாடிகளுக்கு ஒலியளவுப் பொத்தான்கள் இரண்டையும் அழுத்தவும்."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"குறுக்குவழி இயக்கப்பட்டிருக்கும் போது, அணுகல்தன்மை அம்சத்தைத் தொடங்க, 3 வினாடிகளுக்கு இரண்டு ஒலியளவு விசைகளையும் அழுத்தவும்."</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">"திரை உருப்பெருக்கத்தைத் தானாகப் புதுப்பி"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"பயன்பாட்டு மாற்றங்களில் திரை உருப்பெருக்கத்தைப் புதுப்பிக்கவும்"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"செயல்திறனைப் பாதிக்கலாம்"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"குறிப்பான் நகர்வதை நிறுத்தியதும் கிளிக் செய்"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"கிளிக்கிற்கு முந்தைய தாமதம்"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ஆன்"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"முடக்கப்பட்டுள்ளது"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"விரைவு அமைப்புகளில் காட்டு"</string>
@@ -2224,7 +2229,7 @@
     <string name="credentials_not_erased" msgid="7685932772284216097">"நற்சான்று சேமிப்பிடத்தை அழிக்க முடியாது."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"நற்சான்று சேமிப்பிடம் இயக்கப்பட்டது."</string>
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"நீங்கள் நற்சான்று சேமிப்பிடத்தைப் பயன்படுத்துவதற்கு முன் பூட்டு திரையின் பின் அல்லது கடவுச்சொல்லை அமைக்க வேண்டும்."</string>
-    <string name="usage_access_title" msgid="332333405495457839">"பயன்பாட்டு அணுகல் உள்ள ஆப்ஸ்"</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_title" msgid="2978878794187459190">"காப்புப் பிரதி"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g> இல் <xliff:g id="NUMBER">%1$d</xliff:g> தேர்ந்தெடுக்கப்பட்டது"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g> இல் <xliff:g id="NUMBER">%1$s</xliff:g> தேர்ந்தெடுக்கப்பட்டது"</string>
     <string name="select_all" msgid="1562774643280376715">"எல்லாவற்றையும் தேர்ந்தெடு"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"திட்டங்களை நிர்வகி"</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>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"மொபைல் நெட்வொர்க்குகள்"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"கட்டண வைஃபை நெட்வொர்க்குகள்"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"கட்டண நெட்வொர்க்குகளைத் தேர்வுசெய்ய, வைஃபையை இயக்கவும்."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"தானியங்கு"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"கட்டணம் அதிகமான நெட்வொர்க்"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"கட்டணம் குறைவான நெட்வொர்க்"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"மொபைல் நிறுவனம் கணக்கிடும் டேட்டா அளவும், சாதனம் கணக்கிடும் டேட்டா அளவும் மாறுபடலாம்."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"அவசர அழைப்பு"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"அழைப்பிற்குத் திரும்பு"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"அழைப்பு நிர்வாகி"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"அவசரகால அலைபரப்புகள்"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"அவசரகால எச்சரிக்கைகள்"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"நெட்வொர்க் ஆபரேட்டர்கள்"</string>
     <string name="access_point_names" msgid="1381602020438634481">"ஆக்சஸ் பாயிண்ட் நேம்கள்"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"மேம்பட்ட 4G LTE பயன்முறை"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"இதற்குப் பயன்படுத்த வேண்டிய SIM"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"ஒவ்வொரு முறையும் கேள்"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"தேர்வு தேவை"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"சிம் தேர்வு"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"அமைப்பு"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">மறைந்துள்ள %d உருப்படிகளைக் காட்டு</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"ஆப்ஸ் அறிவிப்புகள்"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"அறிவிப்பு வகை"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"முக்கியத்துவம்"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"பயன்பாடு முடிவு செய்யட்டும்"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"ஒலியை அனுமதிக்கவும்"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"அறிவிப்புகளை ஒருபோதும் காட்டாது"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ஒலியெழுப்பாது அல்லது காட்சிக் குறுக்கீடு செய்யாது"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"ஒலியெழுப்பாது"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"ஒலியெழுப்பும்"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"ஒலியெழுப்பி, திரையில் காட்டும்"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"திரையில் பாப் அப் செய்யும்"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"குறைவான முக்கியத்துவம்"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"நடுத்தர முக்கியத்துவம்"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"அதிக முக்கியத்துவம்"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"மிக அதிக முக்கியத்துவம்"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"ஒலியை அனுமதிக்கவும்"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"இந்த அறிவிப்புகளை நடப்புத் திரையில் காட்டும் போது ஒலி, அதிர்வை ஏற்படுத்தாது அல்லது திரையின் மேல் பகுதியில் காட்டாது."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"குறுக்கீடுகளை அனுமதி"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"திரையில் ஒலியுடன் அறிவிப்புகள் மற்றும்/அல்லது அதிர்வுடன் அறிவிப்புகளைக் காட்டும்"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"குறைவான முக்கியத்துவம்"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"நடுத்தர முக்கியத்துவம்"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"அதிக முக்கியத்துவம்"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip பிக்ச்சர் இன்"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"பிக்ச்சர்-இன்-பிக்ச்சர்"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"பிக்ச்சர்-இன்-பிக்ச்சரை அனுமதி"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"பயன்பாடு திறந்திருக்கும் போது அல்லது அதிலிருந்து வெளியேறும் போது (எடுத்துக்காட்டாக, வீடியோவைத் தொடர்ந்து பார்க்க), பிக்ச்சர்-இன்-பிக்ச்சர் சாளரத்தை உருவாக்க, இந்தப் பயன்பாட்டை அனுமதிக்கும். இந்தச் சாளரம் நீங்கள் பயன்படுத்தும் பிற பயன்பாடுகளின் மேல் காட்டப்படும்."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"பயன்பாடு திறந்திருக்கும் போது அல்லது அதிலிருந்து நீங்கள் வெளியேறும் போது (எடுத்துக்காட்டாக, வீடியோவைத் தொடர்ந்து பார்க்க), பிக்ச்சர்-இன்-பிக்ச்சர் சாளரத்தை உருவாக்க, இந்தப் பயன்பாட்டை அனுமதிக்கும். இந்தச் சாளரம் நீங்கள் பயன்படுத்தும் பிற பயன்பாடுகளின் மேல் காட்டப்படும்."</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>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"கோப்புகளை இடமாற்றுகிறது"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"படங்களை இடமாற்றுகிறது (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"சாதனத்தை MIDI ஆகப் பயன்படுத்துகிறது"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS மிரரிங்"</string>
     <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>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"இரவு ஒளி அட்டவணையை அமை"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"திரையின் பிரகாசத்தை குறைக்கும்"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"இரவு ஒளி இயக்கப்பட்டுள்ளது"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"மென்னிற மஞ்சளும் ஆரஞ்சும் கலந்த நிறத்தில் திரை இருப்பது நீங்கள் உறங்குவதற்கு உதவக்கூடும்."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"பரிந்துரைகள்"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"நீல வண்ணங்களைத் திரைக்குப் பயன்படுத்து"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"வண்ண மாற்றத்தைப் பயன்படுத்த, திரையை முடக்கவும்"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"டெலிஃபோனி மானிட்டரில் செய்த மாற்றத்தைப் பயன்படுத்த, சாதனத்தை மறுதொடக்கம் செய்யவும்"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"கேமரா HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"கேமரா HAL HDR+ இல் செய்த மாற்றத்தைப் பயன்படுத்த, சாதனத்தை மறுதொடக்கம் செய்யவும்"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"கேமராவின் லேசர் சென்சார்"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"தானியங்கு முறைமை புதுப்பிப்புகள்"</string>
     <string name="usage" msgid="2977875522080448986">"பயன்பாடு"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"மொபைல் டேட்டா பயன்பாடு"</string>
@@ -3410,7 +3427,7 @@
     <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="data_usage_template" msgid="2923744765873163859">"<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">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"அழித்து, மாற்று"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager இன் ரேட் லிமிட்டிங்கை மீட்டமை"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager இன் ரேட் லிமிட்டிங் மீட்டமைக்கப்பட்டது"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"பூட்டு திரை அறிவிப்புகளை கட்டுப்படுத்து"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"பூட்டுத் திரையில் தகவலைக் கட்டுப்படுத்தவும்"</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="8483187649355540109">"ஆதரவு &amp; டிப்ஸ்"</string>
@@ -3487,7 +3504,7 @@
     <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="2456198532288640046">"பிற சாதனங்களுக்குத் தெரியாது"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"முடக்கப்பட்டுள்ளது"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> உடன் இணைக்கப்பட்டுள்ளது"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"பல சாதனங்களுடன் இணைக்கப்பட்டுள்ளது"</string>
     <string name="demo_mode" msgid="2798762752209330277">"சிஸ்டம் பயனர் இடைமுக டெமோ பயன்முறை"</string>
@@ -3504,7 +3521,7 @@
     <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
     <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
     <string name="support_international_phone_title" msgid="1308334014138718455">"வெளிநாட்டிற்குப் பயணிக்கிறீர்களா?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"சர்வதேசக் கட்டணங்கள் விதிக்கப்படலாம்"</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>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"இன்ஸ்டண்ட் பயன்பாடுகள்"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"பயன்பாடுகளில் இணைப்புகளைத் திறக்கும் (அவை நிறுவப்படாமல் இருந்தாலும் கூட)"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"இன்ஸ்டண்ட் பயன்பாடுகள்"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"இன்ஸ்டண்ட் பயன்பாடுகளின் கணக்கு"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"இன்ஸ்டண்ட் ஆப்ஸ் விருப்பத்தேர்வுகள்"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"நிறுவிய பயன்பாடுகள்"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"உங்கள் சேமிப்பகம் இப்போது சேமிப்பக நிர்வாகியால் நிர்வகிக்கப்படுகிறது"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> இன் கணக்குகள்"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"\"VPNஐ எப்போதும் இயக்கத்தில் வை\" என்பது உங்கள் தனிப்பட்ட சுயவிவரத்தில் இயக்கப்பட்டுள்ளது"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"\"VPNஐ எப்போதும் இயக்கத்தில் வை\" என்பது உங்கள் பணி விவரத்தில் இயக்கப்பட்டுள்ளது"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"குளோபல் HTTP ப்ராக்ஸி அமைக்கப்பட்டுள்ளது"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"நம்பகமான அனுமதிச் சான்றுகள்"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"நம்பகமான அனுமதிச் சான்றுகள்"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"உங்கள் தனிப்பட்ட சுயவிவரத்தில் நம்பகமான அனுமதிச் சான்றுகள்"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"உங்கள் பணி விவரத்தில் நம்பகமான அனுமதிச் சான்றுகள்"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">குறைந்தபட்சம் <xliff:g id="COUNT_1">%d</xliff:g> CA சான்றிதழ்கள்</item>
       <item quantity="one">குறைந்தபட்சம் <xliff:g id="COUNT_0">%d</xliff:g> CA சான்றிதழ்</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Carrier Provisioning Info"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Carrier Provisioning"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"புதியதாகவும் உற்சாகமூட்டும் விதமாகவும் என்ன உள்ளது?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"சிறந்த 5 அம்சங்களைப் பார்க்கவும்"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"உங்கள் புதிய மொபைலைப் பற்றி அறிக"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"உங்கள் புதிய டேப்லெட்டைப் பற்றி அறிக"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"உங்கள் புதிய சாதனத்தைப் பற்றி அறிக"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"இந்தச் சாதனத்தில் இந்த அம்சம் இல்லை"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS பதிவின் நிலை"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"பதிவு செய்யப்பட்டது"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"பதிவு செய்யப்படவில்லை"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index d51730b..39d20e0 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s మీ సందేశాలను యాక్సెస్ చేయాలనుకుంటోంది. %2$sకు యాక్సెస్ అందించాలా?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM యాక్సెస్ అభ్యర్థన"</string>
     <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="bluetooth_device_name_summary" msgid="4757990010751789977">"ఇతర పరికరాలకు \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' వలె కనిపిస్తుంది"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"ఇతర పరికరాలకు “<xliff:g id="DEVICE_NAME">^1</xliff:g>” వలె కనిపిస్తుంది"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"మీ పరికరాలు"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"కొత్త పరికరాన్ని జత చేయండి"</string>
     <string name="date_and_time" msgid="9062980487860757694">"తేదీ &amp; సమయం"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"తర్వాత"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"వేలిముద్రను దాటవేయాలా?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"కేవలం నిమిషం లేదా రెండు నిమిషాల్లో వేలిముద్రను సెటప్ చేయవచ్చు. మీరు దీనిని దాటవేస్తే, మీరు తర్వాత సెట్టింగ్‌లలో మీ వేలిముద్రను జోడించవచ్చు."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"స్క్రీన్ లాక్‌ని దాటవేయాలా?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"పరికర రక్షణ ఫీచర్‌లు ఆన్ చేయబడవు. ఈ టాబ్లెట్ పోయినా, దొంగిలించబడినా లేదా రీసెట్ చేయబడినా, దీనిని ఉపయోగించకుండా మీరు ఇతరులను నివారించలేరు."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"పరికర రక్షణ ఫీచర్‌లు ఆన్ చేయబడవు. ఈ పరికరం పోయినా, దొంగిలించబడినా లేదా రీసెట్ చేయబడినా, దీనిని ఉపయోగించకుండా మీరు ఇతరులను నివారించలేరు."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"పరికర రక్షణ ఫీచర్‌లు ఆన్ చేయబడవు. ఈ ఫోన్ పోయినా, దొంగిలించబడినా లేదా రీసెట్ చేయబడినా, దీనిని ఉపయోగించకుండా మీరు ఇతరులను నివారించలేరు."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"మీరు గరిష్ట సంఖ్యలో వేలిముద్రలను జోడించారు"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"మరిన్ని వేలిముద్రలను జోడించడం సాధ్యపడదు"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"అన్ని వేలిముద్రలు తీసివేయాలా?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'ని తీసివేయండి"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"మీరు ఈ వేలిముద్రను తొలగించదలిచారా?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"మీరు మీ ఫోన్‌ని అన్‌లాక్ చేయడానికి, కొనుగోళ్లను ప్రమాణీకరించడానికి లేదా అనువర్తనాలకు సైన్ ఇన్ చేయడానికి మీ వేలిముద్రలను ఉపయోగించలేరు"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"మీరు మీ కార్యాలయ ప్రొఫైల్‌ని అన్‌లాక్ చేయడానికి, కొనుగోళ్లను ప్రమాణీకరించడానికి లేదా కార్యాలయ అనువర్తనాలకు సైన్ ఇన్ చేయడానికి మీ వేలిముద్రలను ఉపయోగించలేరు"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"అవును, తీసివేయి"</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"అదనపు భద్రత కోసం, ఒక బ్యాకప్ స్క్రీన్ లాక్‌ను సెటప్ చేసుకోండి."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"అదనపు భద్రత కోసం, ఒక బ్యాకప్ స్క్రీన్ లాక్‌ను సెటప్ చేసుకోండి."</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>
@@ -497,37 +502,37 @@
     <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_fingerprint" msgid="8212242533942400457">"డివైజ్ సంరక్షణ ఫీచర్‌లు మీ ఆకృతి లేకుండా పని చేయవు.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"డివైజ్ సంరక్షణ ఫీచర్‌లు మీ ఆకృతి లేకుండా పని చేయవు.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>అలాగే మీ సేవ్ చేయబడిన వేలిముద్రలు ఈ డివైజ్ నుండి తీసివేయబడతాయి, ఆపై మీరు వాటితో మీ ఫోన్‌ను అన్‌లాక్ చేయలేరు, కొనుగోళ్లను ప్రామాణీకరించలేరు లేదా యాప్‌లకు సైన్ ఇన్ చేయలేరు.\""</string>
+</xliff:g>అలాగే మీ సేవ్ చేయబడిన వేలిముద్రలు ఈ డివైజ్ నుండి తీసివేయబడతాయి, ఆపై మీరు వాటితో మీ ఫోన్‌ను అన్‌లాక్ చేయలేరు, కొనుగోళ్లను ప్రామాణీకరించలేరు లేదా యాప్‌లకు సైన్ ఇన్ చేయలేరు."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"డివైజ్ సంరక్షణ ఫీచర్‌లు మీ పిన్ లేకుండా పని చేయవు."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"డివైజ్ సంరక్షణ ఫీచర్‌లు మీ పిన్ లేకుండా పని చేయవు.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"డివైజ్ సంరక్షణ ఫీచర్‌లు మీ పిన్ లేకుండా పని చేయవు.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>అలాగే మీ సేవ్ చేయబడిన వేలిముద్రలు ఈ డివైజ్ నుండి తీసివేయబడతాయి, ఆపై మీరు వాటితో మీ ఫోన్‌ను అన్‌లాక్ చేయలేరు, కొనుగోళ్లను ప్రామాణీకరించలేరు లేదా యాప్‌లకు సైన్ ఇన్ చేయలేరు.\""</string>
+</xliff:g>అలాగే మీ సేవ్ చేయబడిన వేలిముద్రలు ఈ డివైజ్ నుండి తీసివేయబడతాయి, ఆపై మీరు వాటితో మీ ఫోన్‌ను అన్‌లాక్ చేయలేరు, కొనుగోళ్లను ప్రామాణీకరించలేరు లేదా యాప్‌లకు సైన్ ఇన్ చేయలేరు."</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"పరికర సంరక్షణ ఫీచర్‌లు మీ పాస్‌వర్డ్ లేకుండా పని చేయవు.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>అలాగే మీ సేవ్ చేయబడిన వేలిముద్రలు ఈ పరికరం నుండి తీసివేయబడతాయి, ఆపై మీరు వాటితో మీ ఫోన్‌ను అన్‌లాక్ చేయలేరు, కొనుగోళ్లను ప్రామాణీకరించలేరు లేదా అనువర్తనాలకు సైన్ ఇన్ చేయలేరు.\""</string>
+</xliff:g>అలాగే మీ సేవ్ చేయబడిన వేలిముద్రలు ఈ పరికరం నుండి తీసివేయబడతాయి, ఆపై మీరు వాటితో మీ ఫోన్‌ను అన్‌లాక్ చేయలేరు, కొనుగోళ్లను ప్రామాణీకరించలేరు లేదా యాప్‌లకు సైన్ ఇన్ చేయలేరు."</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"పరికర సంరక్షణ ఫీచర్‌లు మీ స్క్రీన్ లాక్ లేకుండా పని చేయవు.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>అలాగే మీ సేవ్ చేయబడిన వేలిముద్రలు ఈ పరికరం నుండి తీసివేయబడతాయి, ఆపై మీరు వాటితో మీ ఫోన్‌ను అన్‌లాక్ చేయలేరు, కొనుగోళ్లను ప్రామాణీకరించలేరు లేదా అనువర్తనాలకు సైన్ ఇన్ చేయలేరు.\""</string>
+</xliff:g>అలాగే మీ సేవ్ చేయబడిన వేలిముద్రలు ఈ పరికరం నుండి తీసివేయబడతాయి, ఆపై మీరు వాటితో మీ ఫోన్‌ను అన్‌లాక్ చేయలేరు, కొనుగోళ్లను ప్రామాణీకరించలేరు లేదా యాప్‌లకు సైన్ ఇన్ చేయలేరు."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"ప్రొఫైల్ సంరక్షణ ఫీచర్‌లు మీ ఆకృతి లేకుండా పని చేయవు."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"ప్రొఫైల్ సంరక్షణ ఫీచర్‌లు మీ ఆకృతి లేకుండా పని చేయవు.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"ప్రొఫైల్ సంరక్షణ ఫీచర్‌లు మీ ఆకృతి లేకుండా పని చేయవు.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>అలాగే మీ సేవ్ చేయబడిన వేలిముద్రలు ఈ ప్రొఫైల్ నుండి తీసివేయబడతాయి, ఆపై మీరు వాటితో మీ ప్రొఫైల్‌ను అన్‌లాక్ చేయలేరు, కొనుగోళ్లను ప్రామాణీకరించలేరు లేదా యాప్‌లకు సైన్ ఇన్ చేయలేరు.\""</string>
+</xliff:g>అలాగే మీ సేవ్ చేయబడిన వేలిముద్రలు ఈ ప్రొఫైల్ నుండి తీసివేయబడతాయి, ఆపై మీరు వాటితో మీ ప్రొఫైల్‌ను అన్‌లాక్ చేయలేరు, కొనుగోళ్లను ప్రామాణీకరించలేరు లేదా యాప్‌లకు సైన్ ఇన్ చేయలేరు."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"ప్రొఫైల్ సంరక్షణ ఫీచర్‌లు మీ పిన్ లేకుండా పని చేయవు."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"ప్రొఫైల్ సంరక్షణ ఫీచర్‌లు మీ పిన్ లేకుండా పని చేయవు.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"ప్రొఫైల్ సంరక్షణ ఫీచర్‌లు మీ పిన్ లేకుండా పని చేయవు.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>అలాగే మీ సేవ్ చేయబడిన వేలిముద్రలు ఈ ప్రొఫైల్ నుండి తీసివేయబడతాయి, ఆపై మీరు వాటితో మీ ప్రొఫైల్‌ను అన్‌లాక్ చేయలేరు, కొనుగోళ్లను ప్రామాణీకరించలేరు లేదా యాప్‌లకు సైన్ ఇన్ చేయలేరు.\""</string>
+</xliff:g>అలాగే మీ సేవ్ చేయబడిన వేలిముద్రలు ఈ ప్రొఫైల్ నుండి తీసివేయబడతాయి, ఆపై మీరు వాటితో మీ ప్రొఫైల్‌ను అన్‌లాక్ చేయలేరు, కొనుగోళ్లను ప్రామాణీకరించలేరు లేదా యాప్‌లకు సైన్ ఇన్ చేయలేరు."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"ప్రొఫైల్ సంరక్షణ లక్షణాలు మీ పాస్‌వర్డ్ లేకుండా పని చేయవు."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"ప్రొఫైల్ సంరక్షణ లక్షణాలు మీ పాస్‌వర్డ్ లేకుండా పని చేయవు.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"ప్రొఫైల్ సంరక్షణ ఫీచర్‌లు మీ పాస్‌వర్డ్ లేకుండా పని చేయవు.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>అలాగే మీ సేవ్ చేయబడిన వేలిముద్రలు ఈ ప్రొఫైల్ నుండి తీసివేయబడతాయి, ఆపై మీరు వాటితో మీ ప్రొఫైల్‌ను అన్‌లాక్ చేయలేరు, కొనుగోళ్లను ప్రామాణీకరించలేరు లేదా అనువర్తనాలకు సైన్ ఇన్ చేయలేరు.\""</string>
+</xliff:g>అలాగే మీ సేవ్ చేయబడిన వేలిముద్రలు ఈ ప్రొఫైల్ నుండి తీసివేయబడతాయి, ఆపై మీరు వాటితో మీ ప్రొఫైల్‌ను అన్‌లాక్ చేయలేరు, కొనుగోళ్లను ప్రామాణీకరించలేరు లేదా యాప్‌లకు సైన్ ఇన్ చేయలేరు."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"ప్రొఫైల్ సంరక్షణ లక్షణాలు మీ స్క్రీన్ లాక్ లేకుండా పని చేయవు."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"ప్రొఫైల్ సంరక్షణ లక్షణాలు మీ స్క్రీన్ లాక్ లేకుండా పని చేయవు.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"ప్రొఫైల్ సంరక్షణ ఫీచర్‌లు మీ స్క్రీన్ లాక్ లేకుండా పని చేయవు.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>అలాగే మీ సేవ్ చేయబడిన వేలిముద్రలు ఈ ప్రొఫైల్ నుండి తీసివేయబడతాయి, ఆపై మీరు వాటితో మీ ప్రొఫైల్‌ను అన్‌లాక్ చేయలేరు, కొనుగోళ్లను ప్రామాణీకరించలేరు లేదా అనువర్తనాలకు సైన్ ఇన్ చేయలేరు.\""</string>
+</xliff:g>అలాగే మీ సేవ్ చేయబడిన వేలిముద్రలు ఈ ప్రొఫైల్ నుండి తీసివేయబడతాయి, ఆపై మీరు వాటితో మీ ప్రొఫైల్‌ను అన్‌లాక్ చేయలేరు, కొనుగోళ్లను ప్రామాణీకరించలేరు లేదా యాప్‌లకు సైన్ ఇన్ చేయలేరు."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"అవును, తీసివేయి"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"అన్‌లాక్ నమూనాను మార్చు"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"అన్‌లాక్ పిన్‌ను మార్చండి"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"అంకెలను ఆరోహణ, అవరోహణ క్రమంలో లేదా ఒకే అంకెను వరుసగా పునరావృతంగా ఉపయోగించకూడదు"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"సరే"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"రద్దు చేయి"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"తీసివేయండి"</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>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS అందుబాటులో ఉంది"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS అందుబాటులో ఉంది)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"మీ నెట్‌వర్క్ పాస్‌వర్డ్‌ను నమోదు చేయండి"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"క్యారియర్ Wi‑Fi నెట్‌వర్క్"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> ద్వారా కనెక్ట్ చేయండి"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"స్థాన ఖచ్చితత్వాన్ని మెరుగుపరచడానికి మరియు ఇతర ప్రయోజనాల దృష్ట్యా, <xliff:g id="APP_NAME">%1$s</xliff:g> Wi-Fi ఆఫ్‌లో ఉన్నప్పటికీ, నెట్‌వర్క్‌ను స్కాన్ చేయడం ప్రారంభించాలనుకుంటుంది.\n\nస్కాన్ చేయాలనుకునే అన్ని అనువర్తనాల కోసం దీన్ని అనుమతించాలా?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"దీన్ని ఆఫ్ చేయడానికి, ఓవర్‌ఫ్లో మెనులో అధునాతనంకి వెళ్లండి."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"అనుమతించు"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"కనెక్ట్ చేయి"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"నెట్‌వర్క్‌కు కనెక్ట్ చేయడం విఫలమైంది"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"విస్మరించు"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"సవరించు"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"నెట్‌వర్క్‌ను ఉపేక్షించడంలో విఫలమైంది"</string>
     <string name="wifi_save" msgid="3331121567988522826">"సేవ్ చేయి"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"నెట్‌వర్క్‌ను సేవ్ చేయడం విఫలమైంది"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"అధునాతన Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC చిరునామా"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP చిరునామా"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"నెట్‌వర్క్ సమాచారం"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"సబ్‌నెట్ మాస్క్"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 చిరునామాలు"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ఆహ్వానాన్ని రద్దు చేయాలా?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"మీరు <xliff:g id="PEER_NAME">%1$s</xliff:g>తో కనెక్ట్ కావాల్సిందిగా వచ్చిన ఆహ్వానాన్ని రద్దు చేయాలనుకుంటున్నారా?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ఈ సమూహాన్ని ఉపేక్షించాలా?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"పోర్టబుల్ Wi‑Fi హాట్‌స్పాట్"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi హాట్‌స్పాట్"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"ఇంటర్నెట్ లేదా కంటెంట్‌ని ఇతర పరికరాలతో షేర్ చేయడం లేదు"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"హాట్‌స్పాట్ ద్వారా ఈ టాబ్లెట్ యొక్క ఇంటర్నెట్ కనెక్షన్ షేర్ చేయబడుతోంది"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"హాట్‌స్పాట్ ద్వారా ఈ ఫోన్ యొక్క ఇంటర్నెట్ కనెక్షన్ షేర్ చేయబడుతోంది"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"యాప్ కంటెంట్‌ని షేర్ చేస్తోంది. ఇంటర్నెట్ కనెక్షన్‌ని షేర్ చేయాలంటే, హాట్‌స్పాట్‌ని ఆఫ్ చేసి, ఆన్ చేయండి"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi పేరు"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"హాట్‌స్పాట్ పేరు"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>ని ఆన్ చేస్తోంది..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"ఇతర పరికరాలు <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>కు కనెక్ట్ కావచ్చు"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi పాస్‌వర్డ్"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"హాట్‌స్పాట్ పాస్‌వర్డ్‌"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP బ్యాండ్"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"మీ ఇతర పరికరాల కోసం Wi-Fi నెట్‌వర్క్‌ని సృష్టించడానికి హాట్‌స్పాట్‌ని ఉపయోగించండి. హాట్‌స్పాట్ అనేది మీ మొబైల్ డేటా కనెక్షన్‌ని ఉపయోగించి ఇంటర్నెట్‌ని అందిస్తుంది. అదనపు మొబైల్ డేటా ఛార్జీలు చెల్లించాల్సి రావచ్చు."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"యాప్‌లు సమీప పరికరాలతో కంటెంట్‌ని షేర్ చేయడం కోసం హాట్‌స్పాట్‌ని సృష్టించవచ్చు."</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi కాలింగ్ ఆన్‌లో ఉన్నప్పుడు, మీ ఫోన్ మీ ప్రాధాన్యత మరియు ఏ సిగ్నల్ సామర్థ్యం ఎక్కువగా ఉంది వంటి అంశాల ఆధారంగా Wi-Fi నెట్‌వర్క్‌లు లేదా మీ క్యారియర్ నెట్‌వర్క్ ద్వారా కాల్‌లు వెళ్లేలా చేస్తుంది. ఈ లక్షణాన్ని ఆన్ చేయడానికి ముందు, రుసుములు మరియు ఇతర వివరాల గురించి తెలుసుకోవడానికి మీ క్యారియర్‌ను సంప్రదించండి."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"అత్యవసర చిరునామాను నవీకరించండి"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"మీరు WiFiని ఉపయోగించి 911 కాల్ చేస్తే, అత్యవసర సేవలు మీ స్థానంగా వినియోగించే చిరునామా"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"మీరు WiFiని ఉపయోగించి అత్యవసర కాల్ చేస్తే, అత్యవసర సేవలు మీ స్థానంగా వినియోగించే చిరునామా"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ప్రదర్శన"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ధ్వని"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"వాల్యూమ్‌లు"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"వెతుకు"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"శోధన సెట్టింగ్‌లను మరియు చరిత్రను నిర్వహించు"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"ఫలితాలు లేవు"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"చరిత్రను తీసివేయి"</string>
     <string name="display_settings" msgid="7965901687241669598">"ప్రదర్శన"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"స్క్రీన్‌ను స్వయంచాలకంగా తిప్పు"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"ప్రకాశవంతమైన రంగులు"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"డిఫాల్ట్ APN సెట్టింగ్‌లను పునరుద్ధరిస్తోంది."</string>
     <string name="menu_restore" msgid="8260067415075573273">"డిఫాల్ట్‌కు రీసెట్ చేయి"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"డిఫాల్ట్ APN సెట్టింగ్‌లను రీసెట్ చేయడం పూర్తయింది."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"రీసెట్ చేయండి"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"నెట్‌వర్క్ సెట్టింగ్‌లను రీసెట్ చేయి"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"రీసెట్ ఎంపికలు"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"నెట్‌వర్క్, యాప్‌లు లేదా పరికరాన్ని రీసెట్ చేయవచ్చు"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi, మొబైల్ &amp; బ్లూటూత్‌ని రీసెట్ చేయండి"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"ఇది అన్ని నెట్‌వర్క్ సెట్టింగ్‌లను రీసెట్ చేస్తుంది, వీటితో సహా:\n\n"<li>"Wi‑Fi"</li>\n<li>"మొబైల్ డేటా"</li>\n<li>"బ్లూటూత్"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"సెట్టింగ్‌లను రీసెట్ చేయి"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"అన్ని నెట్‌వర్క్ సెట్టింగ్‌లను రీసెట్ చేయాలా? మీరు ఈ చర్యను తిరిగి రద్దు చేయలేరు!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"రీసెట్ చేయాలా?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"ఈ వినియోగదారు కోసం నెట్‌వర్క్ రీసెట్ అందుబాటులో లేదు"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"నెట్‌వర్క్ సెట్టింగ్‌లు రీసెట్ చేయబడ్డాయి"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"ఫ్యాక్టరీ డేటా రీసెట్ చేయి"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> ఖాతాలు రీసెట్ చేయబడతాయి</item>
-      <item quantity="one">1 ఖాతా రీసెట్ చేయబడుతుంది</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"అంతర్గత నిల్వను &amp; మొత్తం డేటాని రీసెట్ చేస్తుంది"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"మొత్తం డేటాను తొలగించండి (ఫ్యాక్టరీ రీసెట్)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ఇందువలన మీ టాబ్లెట్ యొక్క "<b>"అంతర్గత నిల్వ"</b>" నుండి వీటితో సహా, మొత్తం డేటా ఎరేజ్ చేయబడుతుంది:\n\n"<li>"మీ Google ఖాతా"</li>\n<li>"సిస్టమ్ మరియు అనువర్తన డేటా మరియు సెట్టింగ్‌లు"</li>\n<li>"డౌన్‌లోడ్ చేయబడిన అనువర్తనాలు"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ఇందువలన మీ ఫోన్ "<b>"అంతర్గత నిల్వ"</b>" నుండి వీటితో సహా మొత్తం డేటా ఎరేజ్ చేయబడుతుంది:\n\n"<li>"Google ఖాతా"</li>\n<li>"సిస్టమ్ మరియు యాప్ డేటా మరియు సెట్టింగ్‌లు"</li>\n<li>"డౌన్‌లోడ్ చేయబడిన యాప్‌లు"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"మీరు ప్రస్తుతం క్రింది ఖాతాలకు సైన్ ఇన్ చేసారు:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"భద్రతా సమాచారం"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"మీకు డేటా కనెక్షన్ లేదు. ఈ సమాచారాన్ని ఇప్పుడే వీక్షించడానికి, ఇంటర్నెట్ కనెక్షన్ సౌకర్యం ఉన్న ఏదైనా కంప్యూటర్ నుండి %sకి వెళ్లండి."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"లోడ్ చేస్తోంది…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"మీ పాస్‌వర్డ్‌ను ఎంచుకోండి"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"స్క్రీన్ లాక్‌ను సెట్ చేయండి"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"భద్రత కోసం, పాస్‌వర్డ్‌ను సెట్ చేయండి"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"వేలిముద్ర బ్యాకప్‌ను సెట్ చేయండి"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"మీ నమూనాను ఎంచుకోండి"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"వేలిముద్ర బ్యాకప్‌ను సెట్ చేయండి"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"మీ పిన్‌ను ఎంచుకోండి"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"భద్రత కోసం, పిన్‌ను సెట్ చేయండి"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"వేలిముద్ర బ్యాకప్‌ను సెట్ చేయండి"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"మీ పాస్‌వర్డ్‌ను నిర్ధారించండి"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"మీ పాస్‌వర్డ్‌ను మళ్ళీ నమోదు చేయండి"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"మీ నమూనాను నిర్ధారించండి"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"మీ పిన్‌ను నిర్ధారించండి"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"మీ పిన్‌ను మళ్లీ నమోదు చేయండి"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"పాస్‌‌వర్డ్‌లు సరిపోలలేదు"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"పిన్‌లు సరిపోలలేదు"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"అన్‌లాక్ ఎంపిక"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"కొనసాగడానికి మీ కార్యాలయ నమూనాను ఉపయోగించండి"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"కొనసాగడానికి మీ కార్యాలయ పిన్‌ను నమోదు చేయండి"</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">"కొనసాగడానికి మీ డివైజ్ పిన్‌ను నమోదు చేయండి. డివైజ్‌ను పునఃప్రారంభించాక దీన్ని నమోదు చేయడం అవసరం."</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">"కొనసాగడానికి మీ కార్యాలయ పిన్‌ను నమోదు చేయండి. డివైజ్‌ను పునఃప్రారంభించాక దీన్ని నమోదు చేయడం అవసరం."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"కొనసాగడానికి మీ కార్యాలయ పాస్‌వర్డ్ నమోదు చేయండి. పరికరం పునఃప్రారంభించాక దీన్ని నమోదు చేయడం అవసరం."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"అదనపు భద్రత కోసం, మీ పరికరం నమూనాను ఉపయోగించండి"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"అదనపు భద్రత కోసం, మీ డివైజ్ పిన్‌ను నమోదు చేయండి"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"అదనపు భద్రత కోసం, మీ పరికరం పాస్‌వర్డ్‌ను నమోదు చేయండి"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"అదనపు భద్రత కోసం, మీ కార్యాలయ నమూనాను ఉపయోగించండి"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"అదనపు భద్రత కోసం, మీ కార్యాలయ పిన్‌ను నమోదు చేయండి"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"అదనపు భద్రత కోసం, మీ కార్యాలయ పాస్‌వర్డ్‌ను నమోదు చేయండి"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"మీ ఫోన్ ఫ్యాక్టరీ సెట్టింగ్‌లకు రీసెట్ అయింది. ఈ ఫోన్‌ని ఉపయోగించాలంటే, మీ గత నమూనాను నమోదు చేయండి."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"మీ ఫోన్ ఫ్యాక్టరీ సెట్టింగ్‌లకు రీసెట్ అయింది. ఈ ఫోన్‌ని ఉపయోగించాలంటే, మీ గత పిన్‌ని నమోదు చేయండి."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"మీ ఫోన్ ఫ్యాక్టరీ సెట్టింగ్‌లకు రీసెట్ అయింది. ఈ ఫోన్‌ని ఉపయోగించాలంటే, మీ గత పాస్‌వర్డ్ నమోదు చేయండి."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"నమూనాను ధృవీకరించండి"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"పిన్‌ని ధృవీకరించండి"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"పాస్‌వర్డ్‌ని ధృవీకరించండి"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"పిన్ తప్పు"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"పాస్‌వర్డ్ తప్పు"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"ఆకృతి తప్పు"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"విడ్జెట్‌ను సృష్టించి ప్రాప్యతను అనుమతించాలా?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"మీరు విడ్జెట్‌ను సృష్టించిన తర్వాత, ఇది ప్రదర్శించే మొత్తం డేటాను <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> యాక్సెస్ చేయవచ్చు."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"విడ్జెట్‌లను సృష్టించి, వాటి డేటాను యాక్సెస్ చేయడానికి <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>ని ఎల్లప్పుడూ అనుమతించండి"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>రో <xliff:g id="HOURS">%2$d</xliff:g>గం <xliff:g id="MINUTES">%3$d</xliff:g>ని <xliff:g id="SECONDS">%4$d</xliff:g>సె"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>గం <xliff:g id="MINUTES">%2$d</xliff:g>ని <xliff:g id="SECONDS">%3$d</xliff:g>సె"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>ని <xliff:g id="SECONDS">%2$d</xliff:g>సె"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>సె"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"వినియోగ గణాంకాలు"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"వినియోగ గణాంకాలు"</string>
     <string name="display_order_text" msgid="8592776965827565271">"ఇలా క్రమబద్ధీకరించు:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"స్క్రీన్ రీడర్‌లు, ప్రదర్శన, పరస్పర చర్య నియంత్రణలు"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"దృశ్యత సెట్టింగ్‌లు"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"మీరు మీ అవసరాలకు అనుగుణంగా ఈ పరికరాన్ని అనుకూలీకరించవచ్చు. ఈ యాక్సెస్ పీచర్లను సెట్టింగ్‌ల్లో తర్వాత మార్చవచ్చు."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"ఫాంట్ పరిమాణాన్ని పెంచండి"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"ఫాంట్ ఆకృతిని మార్చండి"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"స్క్రీన్ రీడర్‌లు"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ఆడియో &amp; స్క్రీన్‌పై ఉన్న వచనం"</string>
     <string name="display_category_title" msgid="685461049938269166">"డిస్‌ప్లే"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><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_screen_magnification_navbar_summary" msgid="1996584694050087161">"మాగ్నిఫికేషన్ ఆన్ చేయబడినప్పుడు, స్క్రీన్ దిగువన ఉన్న యాక్సెస్ సామర్థ్య బటన్‌ని ఉపయోగించి త్వరగా మాగ్నిఫై చేయండి.\n\n"<b>"జూమ్ చేయాలంటే"</b>", యాక్సెస్ సామర్థ్య బటన్‌ని నొక్కిన తర్వాత స్క్రీన్‌లో ఎక్కడైనా నొక్కండి.\n"<ul><li>"స్క్రోల్ చేయాలంటే 2 లేదా అంతకంటే ఎక్కువ వేళ్లతో లాగండి"</li>\n<li>"జూమ్‌ని సర్దుబాటు చేయాలంటే 2 లేదా అంతకంటే ఎక్కువ వేళ్లను స్క్రీన్‌పై ఉంచి ఆ వేళ్లను దగ్గరకు లేదా దూరానికి లాగండి"</li></ul>\n\n<b>"తాత్కాలికంగా జూమ్ చేయాలంటే"</b>", యాక్సెస్ సామర్థ్య బటన్‌ని నొక్కిన తర్వాత స్క్రీన్‌పై ఎక్కడైనా తాకి, ఉంచండి.\n"<ul><li>"స్క్రీన్‌ని కదిలించడానికి దానిని ఎటువైపు కావాలంటే అటువైపు లాగండి"</li>\n<li>"దూరంగా జూమ్ చేయాలంటే వేలిని పైకి ఎత్తండి"</li></ul>\n\n"కీబోర్డ్ లేదా నావిగేషన్ పట్టీలో మీరు దగ్గరకు జూమ్ చేయలేరు."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"యాక్సెస్ సామర్థ్య బటన్ <xliff:g id="SERVICE">%1$s</xliff:g>కు సెట్ చేయబడింది. మాగ్నిఫికేషన్‌ని ఉపయోగించాలంటే, యాక్సెస్ సామర్ధ్య బటన్‌ని తాకి, ఉంచి, ఆపై మాగ్నిఫికేషన్‌ని ఎంచుకోండి."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"యాక్సెస్ సామర్థ్య షార్ట్‌కట్"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"వాల్యూమ్ కీ షార్ట్‌కట్"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"షార్ట్‌కట్ సేవ"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"లాక్ స్క్రీన్ నుండి అనుమతించండి"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"షార్ట్‌కట్ ప్రారంభించబడినప్పుడు, మీరు వాల్యూమ్ బటన్‌లు రెండింటినీ 3 సెకన్లు నొక్కి ఉంచడం ద్వారా యాక్సెస్‌ ఫీచర్‌ను ప్రారంభించవచ్చు."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"షార్ట్‌కట్ ఆన్ చేయబడినప్పుడు, మీరు వాల్యూమ్ కీలు రెండింటినీ 3 సెకన్లు నొక్కి ఉంచడం ద్వారా యాక్సెస్ సామర్థ్య ఫీచర్‌ను ప్రారంభించవచ్చు."</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">"స్క్రీన్ వర్ధనాన్ని స్వయంచాలకంగా నవీకరించండి"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"అనువర్తన పరివర్తనాల్లో స్క్రీన్ వర్ధనాన్ని నవీకరించండి"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"పనితీరుపై ప్రభావం చూపవచ్చు"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"పాయింటర్ కదలడం ఆగిపోయిన తర్వాత క్లిక్ చర్య అమలు చేస్తుంది"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"క్లిక్ చేయడానికి ముందు జాప్యం"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ఆన్"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ఆఫ్"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"శీఘ్ర సెట్టింగ్‌ల్లో చూపు"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g>లో <xliff:g id="NUMBER">%1$d</xliff:g> ఎంచుకోబడ్డాయి"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g>లో <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"అన్నీ ఎంచుకోండి"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"ప్లాన్‌లను నిర్వహించు"</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>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"మొబైల్ నెట్‌వర్క్‌లు"</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_metered_auto" msgid="1262028400911918865">"స్వయంచాలకం"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"గణించబడింది"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"గణించబడదు"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"క్యారియర్ డేటా లెక్కింపు మీ పరికరాన్ని బట్టి మారవచ్చు."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"అత్యవసర కాల్"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"కాల్‌కు తిరిగి వెళ్లు"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"కాల్ నిర్వాహికి"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"అత్యవసర ప్రసారాలు"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"అత్యవసర హెచ్చరికలు"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"నెట్‌వర్క్ ఆపరేటర్‌లు"</string>
     <string name="access_point_names" msgid="1381602020438634481">"యాక్సెస్ స్థానం పేర్లు"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"మెరుగుపరచబడిన 4G LTE మోడ్"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"దీని కోసం ప్రాధాన్య SIM"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"ప్రతిసారి అడుగు"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"ఎంపిక అవసరం"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"సిమ్ ఎంపిక"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"సెట్టింగ్‌లు"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">%d దాచబడిన అంశాలను చూపుతుంది</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"యాప్ నోటిఫికేషన్‌లు"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"నోటిఫికేషన్ వర్గం"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"ప్రాముఖ్యత"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"నిర్ణయం తీసుకోవడానికి అనువర్తనాన్ని అనుమతించు"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"ధ్వనిని అనుమతించండి"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"ఎన్నడూ నోటిఫికేషన్‌లను చూపవద్దు"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"శబ్ద లేదా దృశ్య అంతరాయం కలిగించవద్దు"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"ధ్వని చేయదు"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"శబ్దం చేయి"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"శబ్దం చేసి, స్క్రీన్‌పై చూపు"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"స్క్రీన్‌పై పాప్ అవుతుంది"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"తక్కువ"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"మధ్యస్థం"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"అధికం"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"అత్యవసరం"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"ధ్వనిని అనుమతించండి"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"శబ్దం చేయదు, వైబ్రేట్ చేయదు లేదా ప్రస్తుత స్క్రీన్‌పై కనిపించేలా ఈ నోటిఫికేషన్‌లను శీఘ్రంగా చూపదు."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"అంతరాయాలను అనుమతించండి"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"యాప్‌ను శబ్దం, వైబ్రేట్ చేయనివ్వండి మరియు/లేదా స్క్రీన్‌పై నోటిఫికేషన్‌లను చూపనివ్వండి"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"తక్కువ ప్రాముఖ్యత"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"మధ్యస్థ ప్రాముఖ్యత"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"అధిక ప్రాముఖ్యత"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip picture in"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"చిత్రంలో చిత్రం"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"చిత్రంలో చిత్రాన్ని అనుమతించు"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"యాప్ తెరవబడి ఉన్నప్పుడు లేదా మీరు దాని నుండి నిష్క్రమించినప్పుడు (ఉదాహరణకు, వీడియోని చూడటం కొనసాగించడానికి) చిత్రంలో చిత్రం విండోని సృష్టించడానికి ఈ యాప్‌ను అనుమతిస్తుంది. మీరు ఉపయోగించే ఇతర యాప్‌ల ఎగువన ఈ విండో ప్రదర్శితమవుతుంది."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"యాప్ తెరవబడి ఉన్నప్పుడు లేదా మీరు దాని నుండి నిష్క్రమించినప్పుడు (ఉదాహరణకు, వీడియోని చూడటం కొనసాగించడానికి) చిత్రంలో చిత్రం విండోని సృష్టించడానికి ఈ యాప్‌ని అనుమతించండి. మీరు ఉపయోగించే ఇతర యాప్‌‌ల ఎగువన ఈ విండో ప్రదర్శితమవుతుంది."</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>
@@ -3226,6 +3237,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"ఫైల్‌లను బదిలీ చేయడం"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"ఫోటోలను (PTP) బదిలీ చేయడం"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"పరికరాన్ని MIDI వలె ఉపయోగించడం"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS మిర్రరింగ్"</string>
     <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>
@@ -3368,6 +3380,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="night_display_suggestion_title" msgid="6602129097059325291">"రాత్రి కాంతి షెడ్యూల్‌ని సెట్ చేయండి"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"నిద్ర పట్టేలా స్క్రీన్ కాషాయ రంగు వర్ణబేధం మారుస్తుంది"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"రాత్రి కాంతి ఆన్‌లో ఉంది"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"స్క్రీన్ లేత కాషాయ రంగులో ఉంది. మీరు నిద్రలోకి జారుకోవడంలో ఇది సహాయకరంగా ఉండవచ్చు."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"సూచనలు"</string>
@@ -3386,6 +3400,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"ప్రశాంత భావనను కలిగించే ప్రదర్శన రంగులను ఉపయోగిస్తుంది"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"రంగు మార్పును వర్తింపజేయడానికి, స్క్రీన్‌ను ఆఫ్ చేయండి"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"టెలిఫోనీ మానిటర్ మార్పును వర్తింపజేయాలంటే, పరికరాన్ని రీబూట్ చేయండి"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"కెమెరా HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"కెమెరా HAL HDR+ మార్పును వర్తింపజేయడానికి, పరికరాన్ని రీబూట్ చేయండి"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"కెమెరా లేజర్ సెన్సార్"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"స్వయంచాలక సిస్టమ్ అప్‌డేట్‌లు"</string>
     <string name="usage" msgid="2977875522080448986">"వినియోగం"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"మొబైల్ డేటా వినియోగం"</string>
@@ -3411,7 +3428,7 @@
     <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_2">%2$s</xliff:g> వ్యవధిలో <xliff:g id="ID_1">%1$s</xliff:g> వినియోగించబడింది"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<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">
@@ -3480,7 +3497,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"తొలగించి, మార్చు"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"సత్వరమార్గ నిర్వాహికి రేట్-పరిమిత ప్రక్రియను రీసెట్ చేయండి"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"సత్వరమార్గ నిర్వాహికి రేట్-పరిమిత ప్రక్రియను రీసెట్ చేయబడింది"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"లాక్ స్క్రీన్ నోటిఫికేషన్‌లను నియంత్రించండి"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"లాక్ స్క్రీన్‌పై నియంత్రణ సమాచారం"</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="8483187649355540109">"మద్దతు &amp; చిట్కాలు"</string>
@@ -3488,7 +3505,7 @@
     <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="2456198532288640046">"ఇతర పరికరాలకు కనిపించదు"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"ఆఫ్"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g>కి కనెక్ట్ చేయబడింది"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"బహుళ పరికరాలకు కనెక్ట్ చేయబడింది"</string>
     <string name="demo_mode" msgid="2798762752209330277">"సిస్టమ్ UI డెమో మోడ్"</string>
@@ -3590,7 +3607,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"తక్షణ అనువర్తనాలు"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"లింక్‌లను అనువర్తనాలలో తెరవండి, వాటిని ఇన్‌స్టాల్ చేయకపోయినా ఫర్వాలేదు"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"తక్షణ అనువర్తనాలు"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"తక్షణ అనువర్తనాల ఖాతా"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"తక్షణ యాప్‌ల ప్రాధాన్యతలు"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ఇన్‌స్టాల్ చేయబడిన అనువర్తనాలు"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"మీ నిల్వ ఇప్పుడు నిల్వ నిర్వాహికి ద్వారా నిర్వహించబడుతోంది"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> యొక్క ఖాతాలు"</string>
@@ -3637,7 +3654,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"మీ వ్యక్తిగత ప్రొఫైల్‌లో VPNని ఎల్లప్పుడూ-ఆన్ చేయి ఎంపిక ఆన్ చేయబడింది"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"మీ కార్యాలయ ప్రొఫైల్‌లో VPNని ఎల్లప్పుడూ-ఆన్ చేయి ఎంపిక ఆన్ చేయబడింది"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"గ్లోబల్ HTTP ప్రాక్సీ సెట్ చేయబడింది"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"విశ్వసనీయ ఆధారాలు"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"విశ్వసనీయ ఆధారాలు"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"మీ వ్యక్తిగత ప్రొఫైల్‌‌లో విశ్వసనీయ ఆధారాలు"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"మీ కార్యాలయ ప్రొఫైల్‌‌లో విశ్వసనీయ ఆధారాలు"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">కనీసం <xliff:g id="COUNT_1">%d</xliff:g> CA ప్రమాణపత్రాలు</item>
       <item quantity="one">కనీసం <xliff:g id="COUNT_0">%d</xliff:g> CA ప్రమాణపత్రం</item>
@@ -3700,7 +3719,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"క్యారియర్ కేటాయింపు సమాచారం"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"క్యారియర్ కేటాయింపు సక్రియం చేయండి"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"కొత్తవి మరియు అద్భుతమైనవి ఏమిటి?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"అగ్ర 5 ఫీచర్‌‌లను పరిశీలించండి"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"మీ కొత్త ఫోన్ గురించి తెలుసుకోండి"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"మీ కొత్త టాబ్లెట్ గురించి తెలుసుకోండి"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"మీ కొత్త పరికరం గురించి తెలుసుకోండి"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"ఈ లక్షణం ఈ పరికరంలో అందుబాటులో లేదు"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS నమోదు స్థితి"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"నమోదు చేయబడింది"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"నమోదు కాలేదు"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index b6763d4..3814d2d 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ต้องการเข้าถึงข้อความของคุณ ให้สิทธิ์เข้าถึงแก่ %2$s ไหม"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"ส่งคำขอการเข้าถึงซิม"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ต้องการเข้าถึงซิมการ์ด การให้สิทธิ์เข้าถึงซิมการ์ดจะปิดการเชื่อมต่อข้อมูลบนอุปกรณ์ในระหว่างที่มีการเชื่อมต่อ โปรดให้สิทธิ์เข้าถึงแก่ <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"อุปกรณ์อื่นๆ จะเห็นเป็นชื่อ \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\""</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"อุปกรณ์อื่นๆ จะเห็นเป็นชื่อ “<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"อุปกรณ์ของคุณ"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"จับคู่อุปกรณ์ใหม่"</string>
     <string name="date_and_time" msgid="9062980487860757694">"วันที่และเวลา"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"ถัดไป"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"ข้ามการตั้งค่าลายนิ้วมือไหม"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"การตั้งค่าลายนิ้วมือใช้เวลาเพียง 1-2 นาทีเท่านั้น หากข้ามขั้นตอนนี้ คุณสามารถเพิ่มลายนิ้วมือภายหลังได้ใน \"การตั้งค่า\""</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"ข้ามการล็อกหน้าจอไหม"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"ระบบจะไม่เปิดฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้แท็บเล็ตนี้หากทำอุปกรณ์หาย ถูกขโมย หรือถูกรีเซ็ต"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"ระบบจะไม่เปิดฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้อุปกรณ์นี้หากทำอุปกรณ์หาย ถูกขโมย หรือถูกรีเซ็ต"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"ระบบจะไม่เปิดฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้โทรศัพท์นี้หากทำอุปกรณ์หาย ถูกขโมย หรือถูกรีเซ็ต"</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"คุณได้เพิ่มลายนิ้วมือถึงขีดจำกัดสูงสุดแล้ว"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"เพิ่มลายนิ้วมืออีกไม่ได้แล้ว"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"นำลายนิ้วมือทั้งหมดออกใช่ไหม"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"นำ \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" ออก"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"คุณต้องการลบลายนิ้วมือนี้ไหม"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"คุณจะไม่สามารถใช้ลายนิ้วมือเพื่อปลดล็อกโทรศัพท์ อนุญาตให้ซื้อ หรือลงชื่อเข้าใช้แอปต่างๆ ด้วยลายนิ้วมือได้"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"คุณจะไม่สามารถใช้ลายนิ้วมือเพื่อปลดล็อกโปรไฟล์งาน อนุญาตการซื้อสินค้า หรือลงชื่อเข้าใช้แอปงาน"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"ใช่ นำออกเลย"</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"หากต้องการเพิ่มความปลอดภัย ให้ตั้งค่าการล็อกหน้าจอสำรอง"</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"หากต้องการเพิ่มความปลอดภัย ให้ตั้งค่าการล็อกหน้าจอสำรอง"</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>
@@ -497,37 +502,37 @@
     <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_fingerprint" msgid="8212242533942400457">"ฟีเจอร์การปกป้องอุปกรณ์จะไม่ทำงานหากไม่ป้อนรูปแบบของคุณ<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"ฟีเจอร์การปกป้องอุปกรณ์จะไม่ทำงานหากไม่มีรูปแบบ<xliff:g id="EMPTY_LINE">
 
-</xliff:g>และระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากอุปกรณ์นี้และคุณจะไม่สามารถปลดล็อกโทรศัพท์ อนุญาตการซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือดังกล่าว\""</string>
+</xliff:g>ระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากอุปกรณ์นี้ด้วยและคุณจะไม่สามารถปลดล็อกโทรศัพท์ อนุญาตการซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือดังกล่าว"</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">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"ฟีเจอร์การปกป้องอุปกรณ์จะไม่ทำงานหากไม่มี PIN<xliff:g id="EMPTY_LINE">
 
-</xliff:g>และระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากอุปกรณ์นี้และคณจะไม่สามารถปลดล็อกโทรศัพท์ อนุญาตการซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือดังกล่าว\""</string>
+</xliff:g>ระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากอุปกรณ์นี้ด้วยและคุณจะไม่สามารถปลดล็อกโทรศัพท์ อนุญาตการซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือดังกล่าว"</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"ฟีเจอร์การปกป้องอุปกรณ์จะไม่ทำงานหากไม่มีรหัสผ่าน<xliff:g id="EMPTY_LINE">
 
-</xliff:g>และระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากอุปกรณ์นี้และคุณจะไม่สามารถปลดล็อกโทรศัพท์ อนุญาตการซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือดังกล่าว\""</string>
+</xliff:g>ระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากอุปกรณ์นี้ด้วยและคุณจะไม่สามารถปลดล็อกโทรศัพท์ อนุญาตการซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือดังกล่าว"</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"ฟีเจอร์การปกป้องอุปกรณ์จะไม่ทำงานหากไม่มีล็อกหน้าจอ<xliff:g id="EMPTY_LINE">
 
-</xliff:g>และระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากอุปกรณ์นี้และคุณจะไม่สามารถปลดล็อกโทรศัพท์ อนุญาตการซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือดังกล่าว\""</string>
+</xliff:g>ระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากอุปกรณ์นี้ด้วยและคุณจะไม่สามารถปลดล็อกโทรศัพท์ อนุญาตการซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือดังกล่าว"</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"ฟีเจอร์การปกป้องโปรไฟล์จะไม่ทำงานหากไม่มี PIN"</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"ฟีเจอร์การปกป้องโปรไฟล์จะไม่ทำงานหากไม่ป้อนรูปแบบของคุณ<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"ฟีเจอร์การปกป้องโปรไฟล์จะไม่ทำงานหากไม่มีรูปแบบ<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากโปรไฟล์นี้ด้วย ซึ่งทำให้คุณปลดล็อกโปรไฟล์ ให้สิทธิ์การซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือนั้นไม่ได้\""</string>
+</xliff:g>ระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากโปรไฟล์นี้ด้วยและคุณจะไม่สามารถปลดล็อกโปรไฟล์ อนุญาตการซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือดังกล่าว"</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"ฟีเจอร์การปกป้องโปรไฟล์จะไม่ทำงานหากไม่มี PIN"</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"ฟีเจอร์การปกป้องโปรไฟล์จะไม่ทำงานถ้าไม่มี PIN<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"ฟีเจอร์การปกป้องโปรไฟล์จะไม่ทำงานหากไม่มี PIN<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากโปรไฟล์นี้ด้วย ซึ่งทำให้คุณปลดล็อกโปรไฟล์ ให้สิทธิ์การซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือนั้นไม่ได้\""</string>
+</xliff:g>ระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากโปรไฟล์นี้ด้วยและคุณจะไม่สามารถปลดล็อกโปรไฟล์ อนุญาตการซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือดังกล่าว"</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"ฟีเจอร์การปกป้องโปรไฟล์จะไม่ทำงานหากไม่มีรหัสผ่าน"</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"ฟีเจอร์การปกป้องโปรไฟล์จะไม่ทำงานถ้าไม่มีรหัสผ่าน<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"ฟีเจอร์การปกป้องโปรไฟล์จะไม่ทำงานหากไม่มีรหัสผ่าน<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากโปรไฟล์นี้ด้วย ซึ่งทำให้คุณปลดล็อกโปรไฟล์ ให้สิทธิ์การซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือนั้นไม่ได้\""</string>
+</xliff:g>ระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากโปรไฟล์นี้ด้วยและคุณจะไม่สามารถปลดล็อกโปรไฟล์ อนุญาตการซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือดังกล่าว"</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"ฟีเจอร์การปกป้องโปรไฟล์จะไม่ทำงานหากไม่มีล็อกหน้าจอ"</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"ฟีเจอร์การปกป้องโปรไฟล์จะไม่ทำงานหากไม่มีล็อกหน้าจอ<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"ฟีเจอร์การปกป้องโปรไฟล์จะไม่ทำงานหากไม่มีล็อกหน้าจอ<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากโปรไฟล์ด้วย ซึ่งทำให้คุณปลดล็อกโปรไฟล์ ให้สิทธิ์การซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือนั้นไม่ได้\""</string>
+</xliff:g>ระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากโปรไฟล์นี้ด้วยและคุณจะไม่สามารถปลดล็อกโปรไฟล์ อนุญาตการซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือดังกล่าว"</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"ใช่ นำออกเลย"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"เปลี่ยนรูปแบบการปลดล็อก"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"เปลี่ยน PIN สำหรับปลดล็อก"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"ไม่อนุญาตให้เรียงจากน้อยไปมาก จากมากไปน้อย หรือเรียงลำดับตัวเลขที่ซ้ำกัน"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ตกลง"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"ยกเลิก"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"ล้าง"</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>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ใช้งานได้"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ใช้งานได้)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ป้อนรหัสผ่านเครือข่าย"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"เครือข่าย Wi‑Fi ของผู้ให้บริการ"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"เชื่อมต่อผ่านทาง <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"เพื่อปรับปรุงความแม่นยำของตำแหน่ง และเพื่อวัตถุประสงค์อื่น ๆ <xliff:g id="APP_NAME">%1$s</xliff:g> ต้องการเปิดการสแกนเครือข่าย แม้ในขณะที่ไม่มี WiFi \n \n อนุญาตให้ดำเนินการนี้สำหรับแอปทั้งหมดที่ต้องการสแกนหรือไม่"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"หากต้องการปิด ให้ไปที่ \"ขั้นสูง\" ในเมนูรายการเพิ่มเติม"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"อนุญาต"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"เชื่อมต่อ"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ไม่สามารถเชื่อมต่อกับเครือข่าย"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"ไม่จำ"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"แก้ไข"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"ไม่สามารถเลิกการจดจำเครือข่าย"</string>
     <string name="wifi_save" msgid="3331121567988522826">"บันทึก"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"ไม่สามารถบันทึกเครือข่าย"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"WiFi ขั้นสูง"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"ที่อยู่ Mac"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"ที่อยู่ IP"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"ข้อมูลเครือข่าย"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"ซับเน็ตมาสก์"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"ที่อยู่ IPv6"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ยกเลิกข้อความเชิญหรือไม่"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"คุณต้องการยกเลิกข้อความเชิญเพื่อเชื่อมต่อกับ <xliff:g id="PEER_NAME">%1$s</xliff:g> หรือไม่"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ไม่จำกลุ่มนี้ใช่หรือไม่"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"WiFi ฮอตสปอตแบบพกพา"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi ฮอตสปอต"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"ไม่ได้แชร์อินเทอร์เน็ตหรือเนื้อหากับอุปกรณ์อื่นๆ อยู่"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"กำลังแชร์การเชื่อมต่ออินเทอร์เน็ตของแท็บเล็ตนี้ผ่านฮอตสปอตอยู่"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"กำลังแชร์การเชื่อมต่ออินเทอร์เน็ตของโทรศัพท์นี้ผ่านฮอตสปอตอยู่"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"แอปไม่ได้แชร์เนื้อหาอยู่ หากต้องการแชร์การเชื่อมต่ออินเทอร์เน็ต ให้ปิดฮอตสปอตแล้วเปิดใหม่"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"ชื่อ Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"ชื่อฮอตสปอต"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"กำลังเปิด <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"อุปกรณ์อื่นๆ สามารถเชื่อมต่อกับ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"รหัสผ่าน Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"รหัสผ่านฮอตสปอต"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"ย่านความถี่ AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"ใช้ฮอตสปอตเพื่อสร้างเครือข่าย Wi‑Fi สำหรับอุปกรณ์อื่นๆ ของคุณ ฮอตสปอตสามารถให้บริการอินเทอร์เน็ตโดยใช้การเชื่อมต่ออินเทอร์เน็ตมือถือ อาจมีค่าบริการอินเทอร์เน็ตมือถือเพิ่มเติม"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"แอปสามารถสร้างฮอตสปอตเพื่อแชร์เนื้อหากับอุปกรณ์ที่อยู่ใกล้"</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"เมื่อเปิดการโทรผ่าน Wi-Fi โทรศัพท์จะสามารถวางเส้นทางสายเรียกผ่านเครือข่าย Wi-Fi หรือเครือข่ายของผู้ให้บริการของคุณได้ ทั้งนี้ขึ้นอยู่กับค่ากำหนดของคุณและสัญญาณฝั่งที่แรงกว่า โปรดสอบถามค่าธรรมเนียมและรายละเอียดอื่นๆ กับผู้ให้บริการก่อนที่จะเปิดฟีเจอร์นี้"</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"อัปเดตที่อยู่ฉุกเฉิน"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"ที่อยู่ที่บริการฉุกเฉินจะใช้เป็นตำแหน่งของคุณถ้าคุณโทรหมายเลข 911 ด้วย Wi-Fi"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"ที่อยู่ที่บริการฉุกเฉินจะใช้เป็นตำแหน่งของคุณถ้าคุณโทรหาหมายเลขฉุกเฉินด้วย Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"แสดง"</string>
     <string name="sound_settings" msgid="5534671337768745343">"เสียง"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ระดับเสียง"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"ค้นหา"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"จัดการการตั้งค่าและประวัติการค้นหา"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"ไม่พบผลลัพธ์"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"ล้างประวัติ"</string>
     <string name="display_settings" msgid="7965901687241669598">"การแสดงผล"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"หมุนหน้าจออัตโนมัติ"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"สีสันสดใส"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"กำลังเรียกคืนการตั้งค่า APN เริ่มต้น"</string>
     <string name="menu_restore" msgid="8260067415075573273">"รีเซ็ตเป็นค่าเริ่มต้น"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"รีเซ็ตการตั้งค่า APN กลับเป็นค่าเริ่มต้นเรียบร้อยแล้ว"</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"รีเซ็ต"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"รีเซ็ตการตั้งค่าเครือข่าย"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"ตัวเลือกการรีเซ็ต"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"สามารถรีเซ็ตเครือข่าย แอป หรืออุปกรณ์ได้"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"รีเซ็ต Wi-Fi เน็ตมือถือและบลูทูธ"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"การดำเนินการนี้จะรีเซ็ตการตั้งค่าเครือข่ายทั้งหมด รวมถึง:\n\n"<li>"Wi‑Fi"</li>\n<li>"อินเทอร์เน็ตมือถือ"</li>\n<li>"บลูทูธ"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"รีเซ็ตการตั้งค่า"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"หากรีเซ็ตการตั้งค่าเครือข่ายทั้งหมด คุณจะไม่สามารถยกเลิกการทำงานนี้ได้"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"รีเซ็ตไหม"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"การรีเซ็ตเครือข่ายไม่พร้อมใช้งานสำหรับผู้ใช้รายนี้"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"รีเซ็ตการตั้งค่าเครือข่ายแล้ว"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"รีเซ็ตข้อมูลเป็นค่าเริ่มต้น"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other">ระบบจะรีเซ็ต <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> บัญชี</item>
-      <item quantity="one">ระบบจะรีเซ็ต 1 บัญชี</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"ระบบจะรีเซ็ตพื้นที่เก็บข้อมูลภายในและข้อมูลทั้งหมด"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"ลบข้อมูลทั้งหมด (รีเซ็ตเป็นค่าเริ่มต้น)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"การดำเนินการนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"ที่จัดเก็บข้อมูลภายใน"</b>"ของแท็บเล็ตของคุณ ซึ่งประกอบด้วย\n\n"<li>"บัญชี Google ของคุณ"</li>\n<li>"ข้อมูลและการตั้งค่าของระบบและแอปพลิเคชัน"</li>\n<li>"แอปพลิเคชันที่ดาวน์โหลด"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"การดำเนินการนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"ที่จัดเก็บข้อมูลภายใน"</b>"ของโทรศัพท์ของคุณ ซึ่งประกอบด้วย\n\n"<li>"บัญชี Google ของคุณ"</li>\n<li>"ข้อมูลและการตั้งค่าของระบบและแอปพลิเคชัน"</li>\n<li>"แอปพลิเคชันที่ดาวน์โหลด"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ขณะนี้คุณได้ลงชื่อเข้าใช้บัญชีต่อไปนี้แล้ว:\n"</string>
@@ -1388,7 +1394,7 @@
     <string name="tethering_footer_info" msgid="1308462275952345985">"ใช้ฮอตสปอตและการเชื่อมต่อผ่านมือถือเพื่อให้อุปกรณ์อื่นๆ ใช้อินเทอร์เน็ตผ่านการเชื่อมต่ออินเทอร์เน็ตมือถือได้ แอปสามารถสร้างฮอตสปอตเพื่อแชร์เนื้อหากับอุปกรณ์ที่อยู่ใกล้ได้ด้วย"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"ความช่วยเหลือ"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"เครือข่ายมือถือ"</string>
-    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"แพคเกจอินเทอร์เน็ต"</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_text" msgid="1522783933230274787">"ใช้ <xliff:g id="NEW_APP">%1$s</xliff:g> เป็นแอป SMS ของคุณแทน <xliff:g id="CURRENT_APP">%2$s</xliff:g> ไหม"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"ข้อมูลความปลอดภัย"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"คุณไม่มีการเชื่อมต่อข้อมูล หากต้องการดูข้อมูลนี้ในขณะนี้ ให้ไปที่ %s จากคอมพิวเตอร์เครื่องใดก็ได้ที่เชื่อมต่อกับอินเทอร์เน็ต"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"กำลังโหลด…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"เลือกรหัสผ่านของคุณ"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"ตั้งค่าการล็อกหน้าจอ"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"ตั้งรหัสผ่านเพื่อความปลอดภัย"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"หากต้องการใช้ลายนิ้วมือ ให้ตั้งรหัสผ่าน"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"เลือกรูปแบบของคุณ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"หากต้องการใช้ลายนิ้วมือ ให้ตั้งค่ารูปแบบ"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"เลือก PIN ของคุณ"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"ตั้ง PIN เพื่อความปลอดภัย"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"หากต้องการใช้ลายนิ้วมือ ให้ตั้งค่า PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"ยืนยันรหัสผ่านของคุณ"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"ป้อนรหัสผ่านอีกครั้ง"</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_pin_header" msgid="7744513791910572550">"ป้อน 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>
@@ -1483,12 +1490,18 @@
     <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_strong_auth_required_device_pattern" msgid="530802132223800623">"ใช้รูปแบบของอุปกรณ์เพื่อเพิ่มความปลอดภัย"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"ป้อน PIN ของอุปกรณ์เพื่อเพิ่มความปลอดภัย"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"ป้อนรหัสผ่านอุปกรณ์เพื่อเพิ่มความปลอดภัย"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"ใช้รูปแบบของงานเพื่อเพิ่มความปลอดภัย"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"ป้อน PIN ของงานเพื่อเพิ่มความปลอดภัย"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"ป้อนรหัสผ่านของงานเพื่อเพิ่มความปลอดภัย"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"โทรศัพท์รีเซ็ตเป็นเป็นค่าเริ่มต้น ป้อนรูปแบบก่อนหน้าเพื่อใช้โทรศัพท์เครื่องนี้"</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"โทรศัพท์รีเซ็ตเป็นเป็นค่าเริ่มต้น ป้อน PIN ก่อนหน้าเพื่อใช้โทรศัพท์เครื่องนี้"</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"โทรศัพท์รีเซ็ตเป็นเป็นค่าเริ่มต้น ป้อนรหัสผ่านก่อนหน้าเพื่อใช้โทรศัพท์เครื่องนี้"</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"ยืนยันรูปแบบ"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"ยืนยัน PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"ยืนยันรหัสผ่าน"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN ไม่ถูกต้อง"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"รหัสผ่านไม่ถูกต้อง"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"รูปแบบไม่ถูกต้อง"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"สร้างวิดเจ็ตและอนุญาตการเข้าถึงหรือไม่"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"เมื่อสร้างวิดเจ็ตแล้ว <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> จะสามารถเข้าถึงข้อมูลทั้งหมดที่วิดเจ็ตแสดงได้"</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"อนุญาตให้ <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> สร้างวิดเจ็ตและเข้าถึงข้อมูลวิดเจ็ตได้เสมอ"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>วัน <xliff:g id="HOURS">%2$d</xliff:g>ชั่วโมง <xliff:g id="MINUTES">%3$d</xliff:g>นาที <xliff:g id="SECONDS">%4$d</xliff:g>วินาที"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>ชั่วโมง <xliff:g id="MINUTES">%2$d</xliff:g>นาที <xliff:g id="SECONDS">%3$d</xliff:g>วินาที"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>นาที <xliff:g id="SECONDS">%2$d</xliff:g>วินาที"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> วินาที"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"สถิติการใช้งาน"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"สถิติการใช้งาน"</string>
     <string name="display_order_text" msgid="8592776965827565271">"จัดเรียงตาม:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"โปรแกรมอ่านหน้าจอ การแสดงผล ส่วนควบคุมการโต้ตอบ"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"การตั้งค่าการมองเห็น"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"คุณสามารถปรับแต่งอุปกรณ์นี้ให้ตรงกับความต้องการของคุณ และเปลี่ยนฟีเจอร์การเข้าถึงเหล่านี้ได้ภายหลังในการตั้งค่า"</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"เพิ่มขนาดอักษร"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"เปลี่ยนขนาดแบบอักษร"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"โปรแกรมอ่านหน้าจอ"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"เสียงและข้อความบนหน้าจอ"</string>
     <string name="display_category_title" msgid="685461049938269166">"การแสดงผล"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"หากต้องการซูม"</b>" ให้แตะหน้าจอ 3 ครั้งเร็วๆ\n"<ul><li>"ลากนิ้ว 2 นิ้วหรือมากกว่าเพื่อเลื่อน"</li>\n<li>"บีบนิ้ว 2 นิ้วหรือมากกว่าเพื่อปรับการซูม"</li></ul>\n\n<b>"หากต้องการซูมชั่วคราว"</b>" ให้แตะหน้าจอ 3 ครั้งเร็วๆ และกดนิ้วค้างไว้ขณะแตะครั้งที่ 3\n"<ul><li>"ลากเพื่อเลื่อนไปยังส่วนต่างๆ ของหน้าจอ"</li>\n<li>"ยกนิ้วเพื่อซูมออก"</li></ul>\n\n"คุณไม่สามารถซูมเข้าในแป้นพิมพ์และแถบการนำทาง"</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"เมื่อการขยายเปิดอยู่ ให้ใช้ปุ่ม \"การเข้าถึง\" ที่ด้านล่างของหน้าจอเพื่อขยายอย่างรวดเร็ว\n\n"<b>"หากต้องการซูม"</b>" ให้แตะปุ่ม \"การเข้าถึง\" แล้วแตะที่ใดก็ได้ในหน้าจอ\n"<ul><li>"ลากนิ้ว 2 นิ้วหรือมากกว่าเพื่อเลื่อน"</li>\n<li>"บีบนิ้ว 2 นิ้วหรือมากกว่าเพื่อปรับการซูม"</li></ul>\n\n<b>"หากต้องการซูมชั่วคราว"</b>" ให้แตะปุ่ม \"การเข้าถึง\" แล้วแตะที่ใดก็ได้ในหน้าจอค้างไว้\n"<ul><li>"ลากเพื่อเลื่อนไปยังส่วนต่างๆ ของหน้าจอ"</li>\n<li>"ยกนิ้วเพื่อซูมออก"</li></ul>\n\n"คุณไม่สามารถซูมเข้าในแป้นพิมพ์หรือแถบการนำทาง"</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"ปุ่ม \"การเข้าถึง\" ตั้งค่าเป็น <xliff:g id="SERVICE">%1$s</xliff:g> หากต้องการใช้การขยาย ให้แตะปุ่ม \"การเข้าถึง\" ค้างไว้ แล้วเลือกการขยาย"</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"ทางลัดสำหรับการเข้าถึง"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"ทางลัดปุ่มปรับระดับเสียง"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"บริการทางลัด"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"อนุญาตจากหน้าจอล็อก"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"เมื่อทางลัดเปิดอยู่ คุณสามารถกดปุ่มปรับระดับเสียงทั้ง 2 ปุ่มไว้ 3 วินาทีเพื่อเริ่มฟีเจอร์การเข้าถึง"</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"เมื่อทางลัดเปิดอยู่ คุณสามารถกดปุ่มปรับระดับเสียงทั้ง 2 ปุ่มไว้ 3 วินาทีเพื่อเริ่มฟีเจอร์การเข้าถึงพิเศษ"</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">"อัปเดตการขยายหน้าจอโดยอัตโนมัติ"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"อัปเดตการขยายหน้าจอเมื่อเปลี่ยนแอปพลิเคชัน"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"อาจส่งผลกระทบต่อประสิทธิภาพ"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"คลิกหลังจากตัวชี้หยุดเคลื่อนที่"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"หน่วงเวลาก่อนคลิก"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"เปิด"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ปิด"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"แสดงในการตั้งค่าด่วน"</string>
@@ -2358,6 +2363,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"จัดการแพ็กเกจอินเทอร์เน็ต"</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>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"เครือข่ายมือถือ"</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_metered_auto" msgid="1262028400911918865">"อัตโนมัติ"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"มีการวัดปริมาณอินเทอร์เน็ต"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"ไม่มีการวัดปริมาณอินเทอร์เน็ต"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"การทำบัญชีข้อมูลผู้ให้บริการอาจแตกต่างจากอุปกรณ์ของคุณ"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"หมายเลขฉุกเฉิน"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"กลับสู่การโทร"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Call Manager"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"การเผยแพร่ข้อมูลฉุกเฉิน"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"การแจ้งเตือนเหตุฉุกเฉิน"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"ผู้ให้บริการเครือข่าย"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Access point names"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"โหมด 4G LTE ที่ปรับปรุงแล้ว"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"ซิมที่แนะนำสำหรับ"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"ถามทุกครั้ง"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"ต้องเลือก"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"การเลือกซิม"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"การตั้งค่า"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">แสดงรายการที่ซ่อน %d รายการ</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"การแจ้งเตือนของแอป"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"หมวดหมู่การแจ้งเตือน"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"ความสำคัญ"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"ให้แอปตัดสินใจ"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"อนุญาตให้ส่งเสียง"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"ไม่ต้องแสดงการแจ้งเตือน"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ไม่มีภาพหรือเสียงรบกวน"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"ไม่มีเสียง"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"ส่งเสียง"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"ส่งเสียงและแสดงในหน้าจอ"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"แสดงบนหน้าจอ"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"ต่ำ"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"ปานกลาง"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"สูง"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"ด่วน"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"อนุญาตให้ส่งเสียง"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"ไม่ส่งเสียงเตือน สั่น หรือแสดงชั่วครู่ในมุมมองหน้าจอปัจจุบันสำหรับการแจ้งเตือนเหล่านี้"</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"อนุญาตให้มีการขัดจังหวะ"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"อนุญาตให้แอปส่งเสียง สั่น และ/หรือแสดงการแจ้งเตือนบนหน้าจอ"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"ความสำคัญต่ำ"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"ความสำคัญปานกลาง"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"ความสำคัญสูง"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"ภาพแบบ PIP ใน"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"การแสดงภาพซ้อนภาพ"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"อนุญาตการแสดงภาพซ้อนภาพ"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"อนุญาตให้แอปนี้สร้างหน้าต่างการแสดงภาพซ้อนภาพในขณะที่แอปเปิดอยู่หรือหลังจากที่คุณปล่อยทิ้งไว้ (เช่น เพื่อดูวิดีโอต่อ) หน้าต่างนี้จะแสดงทับแอปอื่นๆ ที่คุณกำลังใช้"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"อนุญาตให้แอปนี้สร้างหน้าต่างการแสดงภาพซ้อนภาพในขณะที่แอปเปิดอยู่หรือหลังจากที่คุณปล่อยทิ้งไว้ (เช่น เพื่อดูวิดีโอต่อ) หน้าต่างนี้จะแสดงทับแอปอื่นๆ ที่คุณกำลังใช้"</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>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"โอนไฟล์"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"โอนรูปภาพ (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"ใช้อุปกรณ์เป็น MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"การมิเรอร์ SMS"</string>
     <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>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"ตั้งเวลาสำหรับแสงตอนกลางคืน"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"ปรับให้หน้าจอเป็นสีเหลืองอำพันเพื่อช่วยให้คุณนอนหลับได้ง่ายขึ้น"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"\"แสงตอนกลางคืน\" เปิดอยู่"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"ปรับให้หน้าจอเป็นสีเหลืองอำพัน ซึ่งอาจช่วยให้คุณนอนหลับได้ง่ายขึ้น"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"คำแนะนำ"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"ใช้สีแสดงผลที่เย็นกว่านี้"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"หากต้องการใช้การเปลี่ยนสี ให้ปิดหน้าจอ"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"เริ่มต้นอุปกรณ์ใหม่เพื่อให้การเปลี่ยนแปลงการตรวจสอบโทรศัพท์มีผล"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"HAL HDR+ ของกล้อง"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"เริ่มต้นอุปกรณ์ใหม่เพื่อให้การเปลี่ยนแปลง HAL HDR+ ของกล้องมีผล"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"เซ็นเซอร์เลเซอร์ของกล้อง"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"การอัปเดตระบบอัตโนมัติ"</string>
     <string name="usage" msgid="2977875522080448986">"การใช้งาน"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"ปริมาณการใช้อินเทอร์เน็ตมือถือ"</string>
@@ -3410,7 +3427,7 @@
     <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="data_usage_template" msgid="2923744765873163859">"ใช้ไป <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">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"ล้างข้อมูลและแปลง"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"รีเซ็ตการจำกัดอัตราของ ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"รีเซ็ตการจำกัดอัตราของ ShortcutManager แล้ว"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"ควบคุมการแจ้งเตือนบนหน้าจอล็อก"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"ควบคุมข้อมูลในหน้าจอล็อก"</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="8483187649355540109">"การสนับสนุนและเคล็ดลับ"</string>
@@ -3487,7 +3504,7 @@
     <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="2456198532288640046">"อุปกรณ์อื่นๆ มองไม่เห็น"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"ปิด"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"เชื่อมต่อกับ <xliff:g id="ID_1">%1$s</xliff:g> แล้ว"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"เชื่อมต่อหลายอุปกรณ์แล้ว"</string>
     <string name="demo_mode" msgid="2798762752209330277">"โหมดสาธิต UI ของระบบ"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Instant Apps"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"เปิดลิงก์ในแอป แม้ไม่ได้ติดตั้งแอปไว้"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Instant Apps"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"บัญชี Instant Apps"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"ค่ากำหนดของ Instant App"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"แอปที่ติดตั้ง"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"ตัวจัดการพื้นที่เก็บข้อมูลกำลังจัดการพื้นที่เก็บข้อมูลของคุณ"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"บัญชีสำหรับ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"การเชื่อมต่อ VPN ตลอดเวลาเปิดอยู่ในโปรไฟล์ส่วนตัวของคุณ"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"การเชื่อมต่อ VPN ตลอดเวลาเปิดอยู่ในโปรไฟล์งานของคุณ"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"ตั้งค่าพร็อกซี HTTP ส่วนกลางแล้ว"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"ข้อมูลรับรองที่เชื่อถือได้"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"ข้อมูลรับรองที่เชื่อถือได้"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"ข้อมูลรับรองที่เชื่อถือได้ในโปรไฟล์ส่วนตัวของคุณ"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"ข้อมูลรับรองที่เชื่อถือได้ในโปรไฟล์งานของคุณ"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">มีใบรับรอง CA อย่างน้อย <xliff:g id="COUNT_1">%d</xliff:g> รายการ</item>
       <item quantity="one">มีใบรับรอง CA อย่างน้อย <xliff:g id="COUNT_0">%d</xliff:g> รายการ</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"ข้อมูลการจัดสรรผู้ให้บริการ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ทริกเกอร์การจัดสรรผู้ให้บริการ"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"มีอะไรใหม่และน่าสนใจบ้าง"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ดูฟีเจอร์เด่น 5 อันดับแรก"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"ทัวร์ชมโทรศัพท์เครื่องใหม่"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ทัวร์ชมแท็บเล็ตเครื่องใหม่"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"ทัวร์ชมอุปกรณ์ใหม่"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"ฟีเจอร์นี้ไม่สามารถใช้ได้บนอุปกรณ์นี้"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"สถานะการลงทะเบียน IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"ลงทะเบียนแล้ว"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"ไม่ได้ลงทะเบียน"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 3eb5e2a..651439b 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Gustong i-access ni %1$s ang iyong mga mensahe. Bigyan ng access si %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Kahilingan sa pag-access sa SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Gustong i-access ng <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ang iyong SIM card. Idi-disable ng pagbibigay ng access sa SIM ang connectivity ng data sa iyong device habang nakakonekta. Bigyan ng access ang <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Nakikita bilang \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' sa iba pang device"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Nakikita bilang “<xliff:g id="DEVICE_NAME">^1</xliff:g>” sa iba pang device"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Ang iyong mga device"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Magpares ng bagong device"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Petsa at oras"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Susunod"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Laktawan ang fingerprint?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Aabutin lang nang isa o dalawang minuto ang pag-set up ng fingerprint. Kung lalaktawan mo ito, maaari mong idagdag ang iyong fingerprint sa mga setting sa ibang pagkakataon."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Laktawan ang lock ng screen?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Hindi mao-on ang mga feature sa pagprotekta ng device. Hindi mo mapipigilan ang ibang tao na gamitin ang tablet na ito kung mawala, manakaw, o ma-reset ito."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Hindi mao-on ang mga feature sa pagprotekta ng device. Hindi mo mapipigilan ang ibang tao na gamitin ang device na ito kung mawala, manakaw, o ma-reset ito."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Hindi mao-on ang mga feature sa pagprotekta ng device. Hindi mo mapipigilan ang ibang tao na gamitin ang teleponong ito kung mawala, manakaw, o ma-reset ito."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Naidagdag mo na ang maximum na bilang ng mga fingerprint"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Hindi na makapagdagdag ng higit pang fingerprint"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Alisin ang lahat ng fingerprint?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Alisin ang \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Gusto mo bang i-delete ang fingerprint na ito?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Hindi mo magagamit ang iyong mga fingerprint upang i-unlock ang telepono mo, magpahintulot ng mga pagbili, o mag-sign in sa mga app"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Hindi mo magagamit ang iyong mga fingerprint upang i-unlock ang profile sa trabaho mo, magpahintulot ng mga pagbili, o mag-sign in sa mga app para sa trabaho"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Oo, alisin"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protektahan ang tablet mo"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protektahan ang device"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protektahan phone mo"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Para sa karagdagang seguridad, mag-set up ng backup na lock ng screen."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Para sa karagdagang seguridad, mag-set up ng backup na lock ng screen."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Pigilan ang ibang taong magamit ang tablet na ito sa pamamagitan ng pag-a-activate sa mga feature ng proteksyon ng device. Piliin ang screen lock na gusto mong gamitin."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Pigilan ang ibang taong magamit ang device na ito sa pamamagitan ng pag-a-activate sa mga feature ng proteksyon ng device. Piliin ang screen lock na gusto mong gamitin."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Pigilan ang ibang taong magamit ang teleponong ito sa pamamagitan ng pag-a-activate sa mga feature ng proteksyon ng device. Piliin ang screen lock na gusto mong gamitin."</string>
@@ -497,37 +502,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Gusto mong bang alisin ang pagprotekta sa device?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Alisin ang proteksyon ng profile?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Hindi gagana ang mga feature sa pagprotekta sa device nang wala ang iyong pattern."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Hindi gagana ang mga feature sa pagprotekta sa device nang wala ang iyong pattern.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Hindi gagana ang mga feature sa pagprotekta ng device nang wala ang iyong pattern.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Aalisin din ang iyong mga naka-save na fingerprint sa device na ito at hindi ka makakapag-unlock ng iyong telepono, makakapagbigay ng pahintulot para sa mga pagbili o makakapag-sign in sa mga app sa pamamagitan ng mga ito.\""</string>
+</xliff:g>Aalisin din ang iyong mga naka-save na fingerprint sa device na ito at hindi ka makakapag-unlock ng iyong telepono, makakapagbigay ng pahintulot para sa mga pagbili, o makakapag-sign in sa mga app sa pamamagitan ng mga ito."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Hindi gagana ang mga feature sa pagprotekta sa device nang wala ang iyong PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Hindi gagana ang mga feature sa pagprotekta sa device nang wala ang iyong PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Hindi gagana ang mga feature sa pagprotekta sa device nang wala ang iyong PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Aalisin din ang iyong mga naka-save na fingerprint sa device na ito at hindi ka makakapag-unlock ng iyong telepono, makakapagbigay ng pahintulot para sa mga pagbili o makakapag-sign in sa mga app sa pamamagitan ng mga ito.\""</string>
+</xliff:g>Aalisin din ang iyong mga naka-save na fingerprint sa device na ito at hindi ka makakapag-unlock ng iyong telepono, makakapagbigay ng pahintulot para sa mga pagbili, o makakapag-sign in sa mga app sa pamamagitan ng mga ito."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Hindi gagana ang mga feature sa pagprotekta sa device nang wala ang iyong password."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Hindi gagana ang mga feature sa pagprotekta sa device nang wala ang iyong password.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Hindi gagana ang mga feature sa pagprotekta ng device nang wala ang iyong password.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Aalisin din ang iyong mga naka-save na fingerprint sa device na ito at hindi ka makakapag-unlock ng iyong telepono, makakapagbigay ng pahintulot para sa mga pagbili o kaya ay makakapag-sign in sa mga app sa pamamagitan ng mga ito.\""</string>
+</xliff:g>Aalisin din ang iyong mga naka-save na fingerprint sa device na ito at hindi ka makakapag-unlock ng iyong telepono, makakapagbigay ng pahintulot para sa mga pagbili, o makakapag-sign in sa mga app sa pamamagitan ng mga ito."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Hindi gagana ang mga feature sa pagprotekta sa device nang wala ang iyong screen lock."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Hindi gagana ang mga feature sa pagprotekta sa device nang wala ang iyong screen lock.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Hindi gagana ang mga feature sa pagprotekta ng device nang wala ang iyong lock ng screen.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Aalisin din ang iyong mga naka-save na fingerprint sa device na ito at hindi ka makakapag-unlock ng iyong telepono, makakapagbigay ng pahintulot para sa mga pagbili o makakapag-sign in sa mga app sa pamamagitan ng mga ito.\""</string>
+</xliff:g>Aalisin din ang iyong mga naka-save na fingerprint sa device na ito at hindi ka makakapag-unlock ng iyong telepono, makakapagbigay ng pahintulot para sa mga pagbili, o makakapag-sign in sa mga app sa pamamagitan ng mga ito."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Hindi gagana ang mga feature para sa proteksyon ng profile kung wala ang iyong pattern."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Hindi gagana ang mga feature para sa proteksyon ng profile kung wala ang iyong pattern.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Hindi gagana ang mga feature sa pagprotekta ng profile nang wala ang iyong pattern.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Aalisin din ang iyong mga naka-save na fingerprint sa profile na ito at hindi mo magagawang i-unlock ang iyong profile, pahintulutan ang mga pagbili o mag-sign in sa mga app gamit ang mga ito."</string>
+</xliff:g>Aalisin din ang iyong mga naka-save na fingerprint sa profile na ito at hindi ka makakapag-unlock ng iyong profile, makakapagbigay ng pahintulot para sa mga pagbili, o makakapag-sign in sa mga app sa pamamagitan ng mga ito."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Hindi gagana ang mga feature para sa proteksyon ng profile kung wala ang iyong PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Hindi gagana ang mga feature para sa proteksyon ng profile kung wala ang iyong PIN.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Hindi gagana ang mga feature sa pagprotekta ng profile nang wala ang iyong PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Aalisin din ang iyong mga naka-save na fingerprint sa profile na ito at hindi mo magagawang i-unlock ang iyong profile, pahintulutan ang mga pagbili o mag-sign in sa mga app gamit ang mga ito."</string>
+</xliff:g>Aalisin din ang iyong mga naka-save na fingerprint sa profile na ito at hindi ka makakapag-unlock ng iyong profile, makakapagbigay ng pahintulot para sa mga pagbili, o makakapag-sign in sa mga app sa pamamagitan ng mga ito."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Hindi gagana ang mga feature para sa proteksyon ng profile kung wala ang iyong password."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Hindi gagana ang mga feature para sa proteksyon ng profile kung wala ang iyong password.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Hindi gagana ang mga feature sa pagprotekta ng profile nang wala ang iyong password.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Aalisin din ang iyong mga naka-save na fingerprint sa profile na ito at hindi mo magagawang i-unlock ang iyong profile, pahintulutan ang mga pagbili o mag-sign in sa mga app gamit ang mga ito."</string>
+</xliff:g>Aalisin din ang iyong mga naka-save na fingerprint sa profile na ito at hindi ka makakapag-unlock ng iyong profile, makakapagbigay ng pahintulot para sa mga pagbili, o makakapag-sign in sa mga app sa pamamagitan ng mga ito."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Hindi gagana ang mga feature para sa proteksyon ng profile kung wala ang iyong screen lock."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Hindi gagana ang mga feature para sa proteksyon ng profile kung wala ang iyong screen lock.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Hindi gagana ang mga feature sa pagprotekta ng profile nang wala ang iyong lock ng screen.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Aalisin din ang iyong mga naka-save na fingerprint sa profile na ito at hindi mo magagawang i-unlock ang iyong profile, pahintulutan ang mga pagbili o mag-sign in sa mga app gamit ang mga ito."</string>
+</xliff:g>Aalisin din ang iyong mga naka-save na fingerprint sa profile na ito at hindi ka makakapag-unlock ng iyong telepono, makakapagbigay ng pahintulot para sa mga pagbili, o makakapag-sign in sa mga app sa pamamagitan ng mga ito."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Oo, alisin"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Baguhin ang naka-unlock na pattern"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Palitan ang PIN na pang-unlock"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Hindi pinapayagan ang pataas, pababa, o paulit-ulit na pagkakasunod-sunod ng mga digit"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Kanselahin"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"I-clear"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Kanselahin"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Susunod"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Kumpleto na ang pag-setup."</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Available ang WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Available ang WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ilagay ang iyong password sa network"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Carrier ng Wi-Fi network"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Kumonekta sa pamamagitan ng <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Upang mapahusay ang katumpakan ng lokasyon at para sa iba pang mga layunin, gustong i-on ng <xliff:g id="APP_NAME">%1$s</xliff:g> ang pag-scan ng network, kahit na naka-off ang Wi-Fi.\n\nPayagan ito para sa lahat ng apps na gustong mag-scan?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Upang i-off ito, pumunta sa Advanced sa overflow menu."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Payagan"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Kumonekta"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nabigong kumonekta sa network."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Kalimutan"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Baguhin"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Nabigong kalimutan ang network"</string>
     <string name="wifi_save" msgid="3331121567988522826">"I-save"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Nabigong i-save ang network"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Advanced na Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC address"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP address"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Impormasyon ng network"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet mask"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Mga IPv6 address"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Kanselahin ang imbitasyon?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Nais mo bang kanselahin ang imbitasyong kumonekta kay <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Kalimutan ang pangkat na ito?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Portable na Wi-Fi hotspot"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi hotspot"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Hindi nagbabahagi ng Internet o content sa iba pang device"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Ibinabahagi ang koneksyon sa Internet ng tablet na ito sa pamamagitan ng hotspot"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Ibinabahagi ang koneksyon sa Internet ng teleponong ito sa pamamagitan ng hotspot"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Nagbabahagi ng content ang app. Upang magbahagi ng koneksyon sa Internet, i-off ang hotspot, pagkatapos ay i-on"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Pangalan ng Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Pangalan ng hotspot"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Ino-on ang <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Maaaring kumonekta ang iba pang device sa <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Password ng Wi‑Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Password ng hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP Band"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Gamitin ang hotspot upang gumawa ng Wi-Fi network para sa iyong iba pang device. Nagbibigay ang Hotspot ng Internet gamit ang iyong koneksyon sa mobile data. May nalalapat na mga karagdagang singil sa mobile data."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Maaaring gumawa ang mga app ng hotspot upang magbahagi ng content sa mga kalapit na device."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Address na ginagamit ng mga serbisyong pang-emergency bilang iyong lokasyon kung magsasagawa ka ng emergency na tawag gamit ang Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ipakita"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Tunog"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Mga Volume"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Paghahanap"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Pamahalaan ang mga setting at kasaysayan ng paghahanap"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Walang resulta"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"I-clear ang history"</string>
     <string name="display_settings" msgid="7965901687241669598">"Display"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"I-auto rotate ang screen"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Matitingkad na kulay"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Nire-restore ang default na mga setting ng APN"</string>
     <string name="menu_restore" msgid="8260067415075573273">"I-reset sa default"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Nakumpleto ang pag-reset sa default na mga setting ng APN."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"I-reset"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"I-reset, network setting"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"I-reset ang mga opsyon"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Maaaring i-reset ang network, mga app, o device"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"I-reset ang Wi-Fi, mobile, at Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Ire-reset nito ang lahat ng setting ng network, kasama ang:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobile data"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"I-reset ang mga setting"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"I-reset ang lahat ng network setting? Hindi mo maaaring i-undo ang pagkilos na ito!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"I-reset?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Hindi available ang pag-reset ng network para sa user na ito"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Na-reset na ang mga network setting"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"I-reset ang data ng factory"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> account ang mare-reset</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> na account ang mare-reset</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Mare-reset ang internal storage at lahat ng data"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Burahin ang lahat ng data (factory reset)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Buburahin nito ang lahat ng data mula sa "<b>"internal storage"</b>" ng iyong tablet, kabilang ang:\n\n"<li>"Iyong Google account"</li>\n<li>"System at data ng app at mga setting"</li>\n<li>"Na-download na apps"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Buburahin nito ang lahat ng data mula sa "<b>"internal storage"</b>" ng iyong telepono, kabilang ang:\n\n"<li>"Iyong Google account"</li>\n<li>"Data at mga setting ng system at app"</li>\n<li>"Na-download na mga app"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kasalukuyan kang naka-sign in sa mga sumusunod na account:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Impormasyon sa kaligtasan"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Wala kang koneksyon ng data. Upang tingnan ang impormasyong ito ngayon, pumunta sa %s mula sa anumang computer na nakakonekta sa Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Naglo-load…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Piliin ang iyong password"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Magtakda ng lock ng screen"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Para sa seguridad, magtakda ng password"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Para magamit ang fingerprint, i-set ang pw"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Piliin ang iyong pattern"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Para magamit ang fingerprint, i-set ang pattern"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Piliin ang iyong PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Para sa seguridad, magtakda ng PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Para magamit ang fingerprint, i-set ang PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Kumpirmahin ang iyong password"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Ilagay muli ang iyong password"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Kumpirmahin ang iyong pattern"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Kumpirmahin ang iyong PIN"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Ilagay muli ang iyong PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Hindi tugma ang mga password"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Hindi tugma ang mga PIN"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Pagpipilian sa pag-unlock"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Gamitin ang iyong pattern sa trabaho upang magpatuloy"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Ilagay ang iyong PIN sa trabaho upang magpatuloy"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Ilagay ang iyong password sa trabaho upang magpatuloy"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Gamitin ang pattern sa device upang magpatuloy. Kinakailangan ito pagkatapos mag-restart ng device."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Ilagay ang iyong PIN sa device upang magpatuloy. Kinakailangan ito pagkatapos mag-restart ng device."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Ilagay ang password sa device upang magpatuloy. Kinakailangan ito pagkatapos mag-restart ng device."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Gamitin ang pattern sa trabaho upang magpatuloy. Kinakailangan ito pagkatapos mag-restart ng device."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Ilagay ang PIN sa trabaho upang magpatuloy. Kinakailangan ito pagkatapos mag-restart ng device."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Ilagay ang password sa trabaho upang magpatuloy. Kinakailangan ito pagkatapos mag-restart ng device."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Para sa karagdagang seguridad, gamitin ang pattern ng iyong device"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Para sa karagdagang seguridad, ilagay ang PIN ng iyong device"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Para sa karagdagang seguridad, ilagay ang password ng iyong device"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Para sa karagdagang seguridad, gamitin ang iyong pattern sa trabaho"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Para sa karagdagang seguridad, ilagay ang iyong PIN sa trabaho"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Para sa karagdagang seguridad, ilagay ang iyong password sa trabaho"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Na-reset sa mga factory setting ang iyong telepono. Ilagay ang dati mong pattern upang magamit ito."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Na-reset sa mga factory setting ang iyong telepono. Ilagay ang dati mong PIN upang magamit ito."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Na-reset sa mga factory setting ang iyong telepono. Ilagay ang dati mong password upang magamit ito."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"I-verify ang pattern"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"I-verify ang PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"I-verify ang password"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Maling PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Maling password"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Maling pattern"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Likhain ang widget at payagan ang access?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Pagkatapos mong likhain ang widget, maa-access ng <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ang lahat ng data na ipinapakita nito."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Palaging payagan ang <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> na lumikha ng mga widget at i-access ang data ng mga ito"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"mga <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>a <xliff:g id="HOURS">%2$d</xliff:g>o <xliff:g id="MINUTES">%3$d</xliff:g>m"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>o <xliff:g id="MINUTES">%2$d</xliff:g>m"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Mga istatistika sa paggamit"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Mga istatistika sa paggamit"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Uriin ayon sa:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Mga screen reader, display, kontrol sa pakikipag-ugnayan"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Mga Setting ng Paningin"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Maaari mong i-customize ang device na ito upang maging angkop sa iyong mga pangangailangan. Maaaring baguhin ang mga feature sa accessibility na ito sa ibang pagkakataon sa Mga Setting."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Lakihan ang font"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Baguhin ang laki ng font"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Mga screen reader"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio at text sa screen"</string>
     <string name="display_category_title" msgid="685461049938269166">"Display"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Upang mag-zoom"</b>", mabilisang i-tap ang screen nang 3 beses.\n"<ul><li>"I-drag ang 2 o higit pang daliri upang mag-scroll"</li>\n<li>"I-pinch ang 2 o higit pang daliri upang isaayos ang zoom"</li></ul>\n\n<b>"Upang mag-zoom pansamantala"</b>", mabilisang i-tap ang screen nang 3 beses at pumindot nang matagal sa pangatlong pag-tap.\n"<ul><li>"Mag-drag upang gumalaw-galaw sa screen"</li>\n<li>"Iangat ang iyong daliri upang mag-zoom out"</li></ul>\n\n"Hindi ka maaaring mag-zoom in sa keyboard at navigation bar."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Kapag naka-on ang pag-magnify, gamitin ang button na Pagiging Naa-access sa ibaba ng screen upang mabilisang mag-magnify.\n\n"<b>"Upang mag-zoom"</b>", i-tap ang button na Pagiging Naa-access, pagkatapos ay mag-tap saanman sa screen.\n"<ul><li>"I-drag ang 2 o higit pang daliri upang mag-scroll"</li>\n<li>"I-pinch ang 2 o higit pang daliri upang isaayos ang zoom"</li></ul>\n\n<b>"Upang mag-zoom pansamantala"</b>", i-tap ang button na Pagiging Naa-access, pagkatapos ay pumindot nang matagal saanman sa screen.\n"<ul><li>"Mag-drag upang gumalaw-galaw sa screen"</li>\n<li>"Iangat ang daliri upang mag-zoom out"</li></ul>\n\n"Hindi ka maaaring mag-zoom in sa keyboard o navigation bar."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Nakatakda sa <xliff:g id="SERVICE">%1$s</xliff:g> ang button na Pagiging Naa-access. Upang gumamit ng pag-magnify, pindutin nang matagal ang button na Pagiging Naa-access, pagkatapos ay piliin ang pag-magnify."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Shortcut sa pagiging naa-access"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Shortcut gamit ang volume key"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Serbisyo ng shortcut"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Payagan mula sa lock screen"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Kapag naka-on ang shortcut, maaari mong pindutin nang 3 segundo ang dalawang button ng volume upang magsimula ng feature ng pagiging naa-access."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Kapag naka-on ang shortcut, maaari mong pindutin ang dalawang volume key nang 3 segundo upang magsimula ng feature sa pagiging naa-access."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Text na high contrast"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"I-auto update pag-magnify ng screen"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"I-update pag-magnify ng screen sa app transition"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Maaaring makaapekto sa performance"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"I-click kapag huminto ang pointer"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Pagkaantala bago ang pag-click"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"NAKA-ON"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"NAKA-OFF"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Ipakita sa Mga Mabilisang Setting"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"pinili <xliff:g id="NUMBER">%1$d</xliff:g> sa <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> sa <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Piliin lahat"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Pamahalaan ang mga plano"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Paggamit ng data"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Paggamit ng data ng app"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Ang accounting ng data ng carrier ay maaaring naiiba sa iyong device."</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mga mobile network"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Mga nakametrong Wi‑Fi network"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Upang pumili ng mga nakametrong network, i-on ang Wi-FI."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Awtomatiko"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Nakametro"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Hindi nakametro"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Ang accounting ng data ng carrier ay maaaring naiiba sa iyong device."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Emergency na tawag"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Balikan ang tawag"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Call Manager"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Mga pang-emergency na broadcast"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Mga alerto sa emergency"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Mga network operator"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Mga access point name"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Enhanced 4G LTE Mode"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Ginustong SIM para sa"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Itanong palagi"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Kinakailangang pumili"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Pagpipilian ng SIM"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Mga Setting"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="one">Ipakita ang %d nakatagong item</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Notification sa app"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategorya ng notification"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Kahalagahan"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Hayaang ang app ang magpasya"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Payagan ang tunog"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Huwag kailanman magpakita ng mga notification"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Walang tunog o visual na pag-abala"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Walang tunog"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Gumawa ng tunog"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Gumawa ng tunog at mag-pop up sa screen"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Mag-pop sa screen"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Mababa"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Katamtaman"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Mataas"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Kinakailangan"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Payagan ang tunog"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Huwag tumunog, mag-vibrate, o ilabas ang mga notification na ito sa view sa kasalukuyang screen."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Payagan ang mga pagkaantala"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Hayaan ang app na tumunog, mag-vibrate, at/o mag-pop ng mga notification sa screen"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Hindi masyadong mahalaga"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Medyo mahalaga"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Napakahalaga"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip picture in"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Payagan ang picture-in-picture"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Payagan ang app na ito na gumawa ng isang picture-in-picture na window habang nakabukas ang app o pagkatapos mo itong iwan (halimbawa, upang magpatuloy sa panonood ng isang video). Lumalabas ang window na ito sa ibabaw ng iba pang ginagamit mong app."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Payagan ang app na ito na gumawa ng picture-in-picture na window habang nakabukas ang app o pagkatapos mo itong iwan (halimbawa, upang magpatuloy sa panonood ng video). Lumalabas ang window na ito sa ibabaw ng iba pang app na ginagamit mo."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Access na Huwag Istorbohin"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Walang mga naka-install na app ang humiling ng access na Huwag Istorbohin"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Naglo-load ng mga app..."</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Paglilipat ng mga file"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Paglilipat ng mga larawan (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Paggamit ng device bilang MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Pag-mirror ng SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Pagsusuri sa background"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Kumpletong access sa background"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Gamitin ang text mula sa screen"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Itakda ang iskedyul ng Night Light"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Maglapat ng amber na tint upang mas madali kang makatulog"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Naka-on ang Night Light"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"May tint na amber ang screen. Maaari ka nitong matulungan na makatulog."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Mga Suhestyon"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gumamit ng mas malalamig na kulay ng display"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Upang ilapat ang pagbabago sa kulay, i-off ang screen"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Upang ilapat ang pagbabago sa telephony monitor, i-reboot ang device"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Camera HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Upang mailapat ang pagbabago sa Camera HAL HDR+, i-reboot ang device"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor ng Laser ng Camera"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Mga awtomatikong pag-update ng system"</string>
     <string name="usage" msgid="2977875522080448986">"Paggamit"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Paggamit ng mobile data"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Babala sa paggamit ng data"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Itakda ang limitasyon ng data"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limitasyon ng data"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> ang nagamit noong <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> ang nagamit noong <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"I-configure"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Iba pang mga app na kasama sa paggamit"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"I-wipe at i-convert"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"I-reset ang ShortcutManager na naglilimita ng rate"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Na-reset na ang ShortcutManager na naglilimita ng rate"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrolin ang notification sa lockscreen"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Kontrolin ang impormasyon sa lock screen"</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="8483187649355540109">"Suporta at mga tip"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Walang mga naka-install na app ang humiling ng access sa Premium SMS"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Maaaring kailanganin mong magbayad para sa Premium SMS at isasama ito sa mga singilin ng iyong carrier. Kung ie-enable mo ang pahintulot para sa isang app, magagawa mong magpadala ng premium SMS gamit ang app na iyon."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Access sa Premium SMS"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Hindi nakikita sa iba pang device"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Naka-off"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Nakakonekta sa <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Nakakonekta sa maraming device"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Demo mode ng System UI"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Mga instant na app"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Magbukas ng mga link sa mga app, kahit na hindi naka-install ang mga ito"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Mga instant na app"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Account ng mga instant na app"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Mga kagustuhan sa Instant Apps"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Mga naka-install na app"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Pinamamahalaan na ngayon ng storage manager ang iyong storage"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Mga account para kay <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Naka-on ang palaging naka-on na VPN sa iyong personal na profile"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Naka-on ang palaging naka-on na VPN sa iyong profile sa trabaho"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Naitakda na ang pangkalahatang HTTP proxy"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Mga pinagkakatiwalaang kredensyal"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Mga pinagkakatiwalaang kredensyal"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Mga pinagkakatiwalaang kredensyal sa iyong personal na profile"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Mga pinagkakatiwalaang kredensyal sa iyong profile sa trabaho"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">Minimum na <xliff:g id="COUNT_1">%d</xliff:g> CA certificate</item>
       <item quantity="other">Minimum na <xliff:g id="COUNT_1">%d</xliff:g> na CA certificate</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Impormasyon sa Provisioning ng Carrier"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"I-trigger ang Provisioning ng Carrier"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Ano ang bago at kapana-panabik?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Tingnan ang nangungunang 5 feature"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Maglibot sa iyong bagong telepono"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Maglibot sa iyong bagong tablet"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Maglibot sa iyong bagong device"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Hindi available ang feature na ito sa device na ito"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Status ng pagpaparehistro ng IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Nakarehistro"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Hindi nakarehistro"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 7ad5aa3..a255a3f 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s, iletilerinize erişmek istiyor. %2$s için erişim izni veriyor musunuz?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM\'e erişim isteği"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, SIM kartınıza erişmek istiyor. SIM karta erişim vermek, bağlantı süresince cihazınızın veri bağlantısını devre dışı bırakır. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> adlı cihaza bağlantı verin"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Diğer cihazlar tarafından \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" olarak görülüyor"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Diğer cihazlar tarafından \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" olarak görülür"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Cihazlarınız"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Yeni cihaz eşle"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Tarih ve saat"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"İleri"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Parmak izi atlansın mı?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Parmak izi kurulumu yalnızca birkaç dakika sürer. Bu adımı atlarsanız parmak izinizi daha sonra ayarlardan ekleyebilirsiniz."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Ekran kilidi atlansın mı?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Cihaz koruma özellikleri etkinleştirilmeyecek. Dolayısıyla tablet kaybolduğunda, çalındığında veya sıfırlandığında başkalarının bu tableti kullanmasını önleyemeyeceksiniz."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Cihaz koruma özellikleri etkinleştirilmeyecek. Dolayısıyla cihaz kaybolduğunda, çalındığında veya sıfırlandığında başkalarının bu cihazı kullanmasını önleyemeyeceksiniz."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Cihaz koruma özellikleri etkinleştirilmeyecek. Dolayısıyla telefon kaybolduğunda, çalındığında veya sıfırlandığında başkalarının bu telefonu kullanmasını önleyemeyeceksiniz."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Maksimum sayıda parmak izi eklediniz"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Daha fazla parmak izi eklenemez"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Tüm parmak izleri kaldırılsın mı?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"\"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" parmak izini kaldırın"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Bu parmak izini silmek istiyor musunuz?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Telefonunuzun kilidini açmak, satın alma işlemlerini yetkilendirmek veya uygulamalarda oturum açmak için parmak izlerinizi kullanamayacaksınız"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Parmak izinizi kullanarak iş profilinizin kilidini açamayacak, satın alma işlemlerini yetkilendiremeyecek veya iş uygulamalarında oturum açamayacaksınız"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Evet, kaldır"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Tabletinizi koruyun"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Cihazınızı koruyun"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Telefonunuzu koruyun"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Daha fazla güvenlik için yedek ekran kilidi ayarlayın."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Daha fazla güvenlik için yedek ekran kilidi ayarlayın."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Cihaz koruma özelliklerini etkinleştirerek, izniniz olmadan başkalarının bu tableti kullanmasını engelleyin. Kullanmak istediğiniz ekran kilidini seçin."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Cihaz koruma özelliklerini etkinleştirerek, izniniz olmadan başkalarının bu cihazı kullanmasını engelleyin. Kullanmak istediğiniz ekran kilidini seçin."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Cihaz koruma özelliklerini etkinleştirerek, izniniz olmadan başkalarının bu telefonu kullanmasını engelleyin. Kullanmak istediğiniz ekran kilidini seçin."</string>
@@ -497,37 +502,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Cihaz koruması kaldırılsın mı?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Profil koruması kaldırılsın mı?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Cihaz koruma özellikleri deseniniz olmadan çalışmayacak."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Cihaz koruma özellikleri deseniniz olmadan çalışmayacak.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Cihaz koruma özellikleri deseniniz olmadan çalışmayacaktır.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Kaydedilen parmak izleriniz ayrıca bu cihazdan kaldırılacak ve parmak izlerinizi kullanarak telefonunuzun kilidini açamayacak, satın alma işlemlerini yetkilendiremeyecek veya uygulamalarda oturum açamayacaksınız."</string>
+</xliff:g>Kaydedilen dijital parmak iziniz de bu cihazdan kaldırılacak ve telefonunuzun kilidini açmak, satın alma işlemlerine yetki vermek veya uygulamalarda oturum açmak için kullanılamayacaktır."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Cihaz koruma özellikleri PIN\'iniz olmadan çalışmayacak."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Cihaz koruma özellikleri PIN\'iniz olmadan çalışmayacak.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Cihaz koruma özellikleri PIN\'iniz olmadan çalışmayacaktır.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Kaydedilen parmak izleriniz ayrıca bu cihazdan kaldırılacak ve parmak izlerinizi kullanarak telefonunuzun kilidini açamayacak, satın alma işlemlerini yetkilendiremeyecek veya uygulamalarda oturum açamayacaksınız."</string>
+</xliff:g>Kaydedilmiş dijital parmak iziniz de bu cihazdan kaldırılacak ve telefonunuzun kilidini açmak, satın alma işlemlerine yetki vermek veya uygulamalarda oturum açmak için kullanılamayacaktır."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Cihaz koruma özellikleri şifreniz olmadan çalışmayacak."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Cihaz koruma özellikleri şifreniz olmadan çalışmayacak.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Cihaz koruma özellikleri şifreniz olmadan çalışmayacaktır.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Kaydedilen parmak izleriniz ayrıca bu cihazdan kaldırılacak ve parmak izlerinizi kullanarak telefonunuzun kilidini açamayacak, satın alma işlemlerini yetkilendiremeyecek veya uygulamalarda oturum açamayacaksınız."</string>
+</xliff:g>Kaydedilen dijital parmak iziniz de bu cihazdan kaldırılacak ve telefonunuzun kilidini açmak, satın alma işlemlerine yetki vermek veya uygulamalarda oturum açmak için kullanılamayacaktır."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Cihaz koruma özellikleri ekran kilidi olmadan çalışmayacak."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Cihaz koruma özellikleri ekran kilidi olmadan çalışmayacak.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Cihaz koruma özellikleri ekran kilidi olmadan çalışmayacaktır.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Kaydedilen parmak izleriniz ayrıca bu cihazdan kaldırılacak ve parmak izlerinizi kullanarak telefonunuzun kilidini açamayacak, satın alma işlemlerini yetkilendiremeyecek veya uygulamalarda oturum açamayacaksınız."</string>
+</xliff:g>Kaydedilmiş dijital parmak iziniz de bu cihazdan kaldırılacak ve telefonunuzun kilidini açmak, satın alma işlemlerine yetki vermek veya uygulamalarda oturum açmak için kullanılamayacaktır."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Profil koruma özellikleri deseniniz olmadan çalışmayacaktır."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Profil koruma özellikleri deseniniz olmadan çalışmayacaktır.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Profil koruma özellikleri deseniniz olmadan çalışmayacaktır.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Kaydedilmiş parmak izleriniz de bu profilden kaldırılacaktır. Profilinizin kilidini açamayacak, satın alma işlemlerine yetki veremeyecek veya onları kullanarak uygulamalarda oturum açamayacaksınız."</string>
+</xliff:g>Kaydedilmiş dijital parmak iziniz de bu profilden kaldırılacak ve profilinizin kilidini açmak, satın alma işlemlerine yetki vermek veya uygulamalarda oturum açmak için kullanılamayacaktır."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Profil koruma özellikleri PIN\'iniz olmadan çalışmayacaktır."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Profil koruma özellikleri PIN\'iniz olmadan çalışmayacaktır.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Profil koruma özellikleri PIN\'iniz olmadan çalışmayacaktır.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Kaydedilmiş parmak izleriniz de bu profilden kaldırılacaktır. Profilinizin kilidini açamayacak, satın alma işlemlerine yetki veremeyecek veya onları kullanarak uygulamalarda oturum açamayacaksınız."</string>
+</xliff:g>Kaydedilmiş dijital parmak iziniz de bu profilden kaldırılacak ve profilinizin kilidini açmak, satın alma işlemlerine yetki vermek veya uygulamalarda oturum açmak için kullanılamayacaktır."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Profil koruma özellikleri şifreniz olmadan çalışmayacaktır."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Profil koruma özellikleri şifreniz olmadan çalışmayacaktır.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Profil koruma özellikleri şifreniz olmadan çalışmayacaktır.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Kaydedilmiş parmak izleriniz de bu profilden kaldırılacaktır. Profilinizin kilidini açamayacak, satın alma işlemlerine yetki veremeyecek veya onları kullanarak uygulamalarda oturum açamayacaksınız."</string>
+</xliff:g>Kaydedilen dijital parmak iziniz de bu cihazdan kaldırılacak ve profilinizin kilidini açmak, satın alma işlemlerine yetki vermek veya uygulamalarda oturum açmak için kullanılamayacaktır."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Profil koruma özellikleri ekran kilidiniz olmadan çalışmayacaktır."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Profil koruma özellikleri ekran kilidiniz olmadan çalışmayacaktır.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Profil koruma özellikleri ekran kilidiniz olmadan çalışmayacaktır.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Kaydedilmiş parmak izleriniz de bu profilden kaldırılacaktır. Profilinizin kilidini açamayacak, satın alma işlemlerine yetki veremeyecek veya onları kullanarak uygulamalarda oturum açamayacaksınız."</string>
+</xliff:g>Kaydedilmiş dijital parmak iziniz de bu profilden kaldırılacak ve profilinizin kilidini açmak, satın alma işlemlerine yetki vermek veya uygulamalarda oturum açmak için kullanılamayacaktır."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Evet, kaldır"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Kilit açma desenini değiştir"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Kilit açma PIN\'ini değiştir"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Artan, azalan veya tekrar eden rakam dizisine izin verilmiyor"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Tamam"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"İptal"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Temizle"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"İptal"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"İleri"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Kurulum tamamlandı."</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS kullanılabilir"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS kullanılabilir)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ağ şifrenizi girin"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Operatör kablosuz ağı"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> üzerinden bağlanın"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Konum bilgisinin doğruluğunu iyileştirmek ve diğer amaçlar için, <xliff:g id="APP_NAME">%1$s</xliff:g> Kablosuz bağlantı kapalı olduğunda bile ağ tarama işlevini açmak istiyor.\n\nTarama yapmak isteyen tüm uygulamaların bu işlevi kullanmalarına izin veriyor musunuz?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Bu özelliği kapatmak için taşma menüsünde Gelişmiş seçeneğine gidin."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"İzin ver"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Bağlan"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Ağa bağlanılamadı"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Unut"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Değiştir"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Ağ unutulamadı"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Kaydet"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Ağ kaydedilemedi"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Gelişmiş Kablosuz"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC adresi"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP adresi"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Ağ bilgisi"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Alt ağ maskesi"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 adresleri"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Davetiye iptal edilsin mi?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g> cihazına bağlanma davetiyesini iptal etmek istiyor musunuz?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Bu grup unutulsun mu?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Taşınabilir Kablosuz hotspot"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Kablosuz hotspot"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Diğer cihazlarla içerik veya internet paylaşılmıyor"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Bu tabletin internet bağlantısı hotspot üzerinden paylaşılıyor"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Bu telefonun internet bağlantısı hotspot üzerinden paylaşılıyor"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Uygulama içerik paylaşıyor. İnternet bağlantısını paylaşmak için hotspot\'u kapatıp tekrar açın"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Kablosuz ağ adı"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Hotspot adı"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> etkinleştiriliyor..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Diğer cihazlar şuna bağlanabilir: <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Kablosuz ağ şifresi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Hotspot şifresi"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Erişim Noktası Bandı"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Diğer cihazlarınıza yönelik kablosuz ağ oluşturmak için hotspot\'u kullanın. Hotspot, mobil veri bağlantınızı kullanarak internet bağlantısı sağlar. Bunun için ek mobil veri ücretleri uygulanabilir."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Uygulamalar yakınlardaki cihazlarla içerik paylaşmak için bir hotspot oluşturabilir."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Kablosuz bağlantı kullanarak acil durum çağrısı yaparsanız, acil durum hizmetleri tarafından konumunuz olarak kullanılan adres"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekran"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ses"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Ses Düzeyleri"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Ara"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Arama ayarlarını ve geçmişi yönet"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Sonuç yok"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Geçmişi temizle"</string>
     <string name="display_settings" msgid="7965901687241669598">"Ekran"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Ekranı otomatik döndür"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Canlı renkler"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Varsayılan APN ayarları geri yükleniyor."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Varsayılana sıfırla"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Varsayılan APN ayarlarına sıfırlama tamamlandı."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Sıfırla"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Ağ ayarlarını sıfırla"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Seçenekleri sıfırla"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Ağ uygulamaları veya cihaz sıfırlanabilir"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Kablosuz, mobil, Bluetooth\'u sıfırla"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Bu sıfırlama işlemi, aşağıdakiler de dahil olmak üzere tüm ağ ayarlarınızı sıfırlayacaktır:\n\n"<li>"Kablosuz ağ"</li>\n<li>"Mobil veri"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Ayarları sıfırla"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Tüm ağ ayarlarınız sıfırlansın mı? Bu işlemi geri alamazsınız!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Sıfırlansın mı?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Bu kullanıcı için ağ ayarlarına sıfırlama işlevi kullanılamıyor"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Ağ ayarları sıfırlandı"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Fab. verilerine sıfırla"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> hesap sıfırlanacak</item>
-      <item quantity="one">1 hesap sıfırlanacak</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Dahili depolama alanı ve tüm veriler sıfırlanacak"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Tüm verileri sil (fabrika ayarlarına sıfırla)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Bu işlem tablet bilgisayarınızın "<b>"dahili depolama alanından"</b>"şu verilerin tümünü siler:\n\n"<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ile ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Bu işlem, telefonunuzun "<b>"dahili depolama alanından"</b>" şu verilerin tümünü siler:\n\n"<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ile ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Şu anda aşağıdaki hesaplarda oturum açmış durumdasınız:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Güvenlik bilgileri"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Veri bağlantınız yok. Bu bilgileri şimdi görüntülemek için İnternet\'e bağlı herhangi bir bilgisayardan %s adresine gidin."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Yükleniyor…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Şifrenizi seçin"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ekran kilidi ayarlayın"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Güvenlik için şifre ayarlayın"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Parmak izi için şifre ayarlayın"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Deseninizi seçin"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Parmak izi için desen ayarlayın"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PIN\'inizi seçin"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Güvenlik için PIN ayarlayın"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Parmak izi için PIN ayarlayın"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Şifrenizi onaylayın"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Şifrenizi yeniden girin"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Deseninizi onaylayın"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PIN\'inizi onaylayın"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"PIN\'inizi yeniden girin"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Şifreler eşleşmiyor"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN\'ler eşleşmiyor"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Kilit açma seçeneği"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Devam etmek için iş profilinizin desenini kullanın"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Devam etmek için iş profilinizin PIN\'ini girin"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Devam etmek için iş profilinizin şifresini girin"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Devam etmek için cihaz deseninizi girin. Cihaz yeniden başlatıldıktan sonra gerekir."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Devam etmek için cihaz PIN\'inizi girin. Cihaz yeniden başlatıldıktan sonra gerekir."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Devam etmek için cihaz şifrenizi girin. Cihaz yeniden başlatıldıktan sonra gerekir."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Devam etmek için iş deseninizi girin. Cihaz yeniden başlatıldıktan sonra gerekir."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Devam etmek için iş PIN\'inizi girin. Cihaz yeniden başlatıldıktan sonra gerekir."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Devam etmek için iş şifrenizi girin. Cihaz yeniden başlatıldıktan sonra gerekir."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Daha fazla güvenlik için cihaz deseninizi kullanın"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Daha fazla güvenlik için cihaz PIN\'inizi girin"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Daha fazla güvenlik için cihaz şifrenizi girin"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Daha fazla güvenlik için iş deseninizi kullanın"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Daha fazla güvenlik için iş PIN\'inizi girin"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Daha fazla güvenlik için iş şifrenizi girin"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Telefonunuz fabrika ayarlarına sıfırlandı. Bu telefonu kullanmak için önceki deseninizi girin."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Telefonunuz fabrika ayarlarına sıfırlandı. Bu telefonu kullanmak için önceki PIN\'inizi girin."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Telefonunuz fabrika ayarlarına sıfırlandı. Bu telefonu kullanmak için önceki şifrenizi girin."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Deseni doğrulayın"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"PIN\'i doğrulayın"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Şifreyi doğrulayın"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Yanlış PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Yanlış şifre"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Yanlış desen"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Widget\'ı oluşturup erişime izin vermek istiyor musunuz?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Widget\'ı oluşturmanızdan sonra, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>, widget\'ın görüntülediği tüm verilere erişebilir."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> uygulamasına her zaman widget oluşturma ve verilerine erişme izni ver"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>g <xliff:g id="HOURS">%2$d</xliff:g>s <xliff:g id="MINUTES">%3$d</xliff:g>d <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>s <xliff:g id="MINUTES">%2$d</xliff:g>d <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>d <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> g <xliff:g id="HOURS">%2$d</xliff:g> sa <xliff:g id="MINUTES">%3$d</xliff:g> dk"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> sa <xliff:g id="MINUTES">%2$d</xliff:g> dk"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> dk"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Kullanım istatistikleri"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Kullanım istatistikleri"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sıralama ölçütü:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Ekran okuyucular, ekran, etkileşim kontrolleri"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Görüş Ayarları"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Bu cihazı gereksinimlerinize uygun şekilde özelleştirebilirsiniz. Bu erişilebilirlik özellikleri daha sonra Ayarlar\'dan değiştirilebilir."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Yazı tipini büyütün"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Yazı tipi boyutunu değiştir"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Ekran okuyucular"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Ses ve ekran metni"</string>
     <string name="display_category_title" msgid="685461049938269166">"Ekran"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Yakınlaştırmak için"</b>" ekrana 3 kez hızlıca dokunun.\n"<ul><li>"Kaydırmak için 2 veya daha fazla parmağınızı sürükleyin"</li>\n<li>"Yakınlaştırmayı ayarlamak için 2 veya daha fazla parmağınızı birbirine yaklaştırın"</li></ul>\n\n<b>"Geçici olarak büyütmek için"</b>" ekrana 3 kez hızlıca dokunun ve üçüncü dokunuşunuzda parmağınızı basılı tutun.\n"<ul><li>"Ekranda gezinmek için parmağınızı sürükleyin"</li>\n<li>"Uzaklaştırmak için parmağınızı kaldırın"</li></ul>\n\n"Klavyede veya gezinme çubuğundayken yakınlaştırma yapamazsınız."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Büyütme açıldığında, hızlı bir şekilde büyütmek için ekranın alt kısmındaki Erişilebilirlik düğmesini kullanın.\n\n"<b>"Yakınlaştırmak için"</b>" Erişilebilirlik düğmesine, ardından ekranda herhangi bir yere dokunun.\n"<ul><li>"Kaydırmak için 2 veya daha fazla parmağınızı sürükleyin"</li>\n<li>"Yakınlaştırmayı ayarlamak için 2 veya daha fazla parmağınızı birbirine yaklaştırın"</li></ul>\n\n<b>"Geçici olarak yakınlaştırmak için"</b>" Erişilebilirlik düğmesine dokunun, ardından ekranda herhangi bir yere dokunup basılı tutun.\n"<ul><li>"Ekranda hareket etmek için sürükleyin"</li>\n<li>"Uzaklaştırmak için parmağınızı çekin"</li></ul>\n\n"Klavyede veya gezinme çubuğundayken yakınlaştırma yapamazsınız."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Erişilebilirlik düğmesi <xliff:g id="SERVICE">%1$s</xliff:g> olarak ayarlandı. Büyütmeyi kullanmak için Erişilebilirlik düğmesine dokunup basılı tutun, ardından büyütmeyi seçin."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Erişilebilirlik kısayolu"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Ses tuşu kısayolu"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Kısayol hizmeti"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Kilit ekranından izin verme"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Kısayol açıkken bir erişilebilirlik özelliğini başlatmak için ses ayar düğmelerinin ikisini birden 3 saniyeliğine basılı tutabilirsiniz."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Kısayol açıkken erişilebilirlik özelliği başlatmak için ses ayar tuşlarının ikisini birden 3 saniyeliğine basılı tutabilirsiniz."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Yüksek kontrastlı metin"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Ekran büyütmeyi otomatik güncelle"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Uygulama geçişlerinde ekran büyütmeyi güncelle"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Performansı etkileyebilir"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"İşaretçinin hareketi durduktan sonra tıkla"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Tıklamadan önce gecikme süresi"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"AÇ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"KAPAT"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Hızlı Ayarlar\'da göster"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"toplam <xliff:g id="TOTAL">%2$d</xliff:g> dosyadan <xliff:g id="NUMBER">%1$d</xliff:g> tanesi seçildi"</string>
     <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">"Tümünü seç"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Planları yönet"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Veri kullanımı"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Uygulama veri kullanımı"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operatörünüzün veri hesaplaması, cihazınızınkinden farklı olabilir."</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobil ağlar"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Sınırlı Kablosuz ağlar"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Sınırlı ağları seçmek için Kablosuz bağlantıyı açın."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Otomatik"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Sınırlı"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Sınırsız"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Operatörünüzün veri hesaplaması, cihazınızınkinden farklı olabilir."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Acil durum çağrısı"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Çağrıya dön"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Çağrı Yöneticisi"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Acil durum yayınları"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Acil durum uyarıları"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Ağ operatörleri"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Erişim noktası adları"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Geliştirilmiş 4G LTE Modu"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Şunun için tercih edilen SIM:"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Her zaman sor"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Seçim gerekiyor"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"SIM seçimi"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Ayarlar"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">Gizli %d öğeyi göster</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Uygulama bildirimleri"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Bildirim kategorisi"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Önem"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Uygulama karar versin"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Sese izin ver"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Bildirimleri hiçbir zaman gösterme"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Ses veya görsel kesme yok"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Sessiz"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Ses çıkar"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Ses çıkar ve ekranda göster"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Ekranda pop-up pencerede göster"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Düşük"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Orta"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Yüksek"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Acil"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Sese izin ver"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Ses çıkarma, titreştirme veya bu bildirimleri geçerli ekrana getirme."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Kesintilere izin ver"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Uygulamanın ses çıkarmasına, titreşim yapmasına ve/veya ekranda bildirimler göstermesine izin verin"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Önem düzeyi düşük"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Önem düzeyi orta"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Önem düzeyi yüksek"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip ekran içinde"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Pencere içinde pencere"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Pencere içinde pencere özelliğine izin ver"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Bu uygulamanın, uygulama açıkken veya uygulamadan çıktıktan sonra (örneğin, video izlemeye devam etmek için) pencere içinde pencere oluşturmasına izin verin. Bu pencere, kullandığınız diğer uygulamaların üzerinde gösterilir."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Bu uygulamanın, uygulama açıkken veya uygulamadan çıktıktan sonra (örneğin, video izlemeye devam etmek için) pencere içinde pencere oluşturmasına izin verin. Bu pencere, kullandığınız diğer uygulamaların üzerinde gösterilir."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Rahatsız Etmeyin erişimi"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Yüklü hiçbir uygulama Rahatsız Etmeyin erişimi isteğinde bulunmadı"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Uygulamalar yükleniyor..."</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Dosya aktarma"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Fotoğraf aktarma (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Cihazı MIDI olarak kullanma"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS Yansıtma"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Arka plan kontrolü"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Tam arka plan erişimi"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Ekrandaki metni kullan"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Gece Işığı programını ayarla"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Uyumanıza yardımcı olması için ekranınızın tonunu amber yapar."</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Gece Işığı açık"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Ekran rengi amber tonuna geçirilir. Bu renk, uyumanıza yardımcı olabilir."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Öneriler"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Daha soğuk ekran renkleri kullan"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Renk değişikliğini uygulamak için ekranı kapatın"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telephony monitor değişikliğini uygulamak için cihazı yeniden başlatın"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Kamera HAL HDR+ değişikliğini uygulamak için cihazı yeniden başlatın"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kamera Lazer Sensörü"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Otomatik sistem güncellemeleri"</string>
     <string name="usage" msgid="2977875522080448986">"Kullanım"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobil veri kullanımı"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Veri uyarısı"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Veri sınırı ayarla"</string>
     <string name="data_limit" msgid="1885406964934590552">"Veri sınırı"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> tarihleri arasında <xliff:g id="ID_1">%1$s</xliff:g> kullanıldı"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g> arasında <xliff:g id="ID_1">%1$s</xliff:g> kullanıldı"</string>
     <string name="configure" msgid="1029654422228677273">"Yapılandır"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Kullanıma dahil olan diğer uygulamalar"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Sil ve dönüştür"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager hız sınırlamasını sıfırla"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager hız sınırlaması sıfırlandı"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Kilit ekranı bildirimlerini kontrol edin"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Kilit ekranınızdaki bilgileri 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="8483187649355540109">"Destek ve ipuçları"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Yüklü hiçbir uygulama, Premium SMS erişimi isteğinde bulunmadı"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium SMS kullanımı, para ödemenizi gerektirebilir ve bu ücret operatör faturanıza eklenir. Bir uygulamaya bu izni verdiğinizde söz konusu uygulamayı kullanarak ücretli SMS gönderebilirsiniz."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Premium SMS erişimi"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Diğer cihazlar tarafından görülemez"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Kapalı"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> cihazına bağlı"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Birden çok cihaza bağlı"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Sistem Kullanıcı Arayüzü demo modu"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Hazır uygulamalar"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Yüklü olmasalar bile uygulamalardaki bağlantıları açın"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Hazır uygulamalar"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Hazır uygulama hesabı"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Hazır Uygulama tercihleri"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Yüklü uygulamalar"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Depolama alanınız artık depolama yöneticisi tarafından yönetiliyor"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> adlı kullanıcının hesapları"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Her zaman açık VPN kişisel profilinizde açılmış"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Her zaman açık VPN iş profilinizde açılmış"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Genel HTTP proxy\'si ayarlanmış"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Güvenilir kimlik bilgileri"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Güvenilir kimlik bilgileri"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Kişisel profilinizde güvenilir kimlik bilgileri"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"İş profilinizde güvenilir kimlik bilgileri"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Minimum <xliff:g id="COUNT_1">%d</xliff:g> CA sertifikası</item>
       <item quantity="one">Minimum <xliff:g id="COUNT_0">%d</xliff:g> CA sertifikası</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operatör Temel Hazırlık Bilgileri"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Tetikleyici Operatör Temel Hazırlığı"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Yeni ve heyecan verici neler var?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"En önemli 5 özelliği inceleyin"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Yeni telefonunuzu tanıyın"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Yeni tabletinizi tanıyın"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Yeni cihazınızı tanıyın"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Bu özellik bu cihazda kullanılamıyor"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS kaydı durumu"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Kaydettirildi"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Kaydettirilmedi"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index adb318d..4303552 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -168,7 +168,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s хоче отримати доступ до ваших повідомлень. Надати %2$s доступ?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Запит на доступ до SIM-карти"</string>
     <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="bluetooth_device_name_summary" msgid="4757990010751789977">"Видно як \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" для інших пристроїв"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Видно як \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" для інших пристроїв"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Ваші пристрої"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Підключити новий пристрій"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Дата й час"</string>
@@ -378,6 +378,9 @@
     <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="1961957425135180242">"Далі"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Пропустити?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Налаштування відбитка пальця триває кілька хвилин. Якщо ви пропустите цей крок, відбиток пальця можна додати пізніше в налаштуваннях."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Пропустити?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Функції захисту пристрою не буде ввімкнено. Ви не зможете завадити іншим користуватися цим планшетом, якщо його буде втрачено, викрадено чи скинуто до заводських налаштувань."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Функції захисту пристрою не буде ввімкнено. Ви не зможете завадити іншим користуватися цим пристроєм, якщо його буде втрачено, викрадено чи скинуто до заводських налаштувань."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Функції захисту пристрою не буде ввімкнено. Ви не зможете завадити іншим користуватися цим телефоном, якщо його буде втрачено, викрадено чи скинуто до заводських налаштувань."</string>
@@ -417,6 +420,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Ви додали максимальну кількість відбитків пальців"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Більше не можна додати відбитки пальців"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Видалити всі відбитки пальців?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Видалити \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\""</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Видалити цей відбиток пальця?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Ви не зможете розблоковувати телефон, робити покупки та заходити в додатки за допомогою відбитків пальців"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Ви не зможете розблоковувати робочий профіль, робити покупки та заходити в робочі додатки за допомогою відбитків пальців"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Так, видалити"</string>
@@ -461,7 +466,7 @@
     <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="5585650064305600578">"Щоб підвищити рівень безпеки, налаштуйте резервний спосіб блокування екрана."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Щоб підвищити рівень безпеки, налаштуйте резервний спосіб блокування екрана."</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>
@@ -503,35 +508,35 @@
     <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_fingerprint" msgid="8212242533942400457">"Функції захисту пристрою не працюватимуть без ключа.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Функції захисту пристрою не працюватимуть без ключа.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Ви більше не зможете розблоковувати телефон, дозволяти покупки або входити в додатки за допомогою відбитків пальців, оскільки їх також буде видалено з цього пристрою."</string>
+</xliff:g>Ви більше не зможете розблоковувати телефон, робити покупки або входити в додатки за допомогою відбитків пальців, оскільки їх також буде видалено з цього пристрою."</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">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Функції захисту пристрою не працюватимуть без PIN-коду.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Ви більше не зможете розблоковувати телефон, дозволяти покупки або входити в додатки за допомогою відбитків пальців, оскільки їх також буде видалено з цього пристрою."</string>
+</xliff:g>Ви більше не зможете розблоковувати телефон, робити покупки або входити в додатки за допомогою відбитків пальців, оскільки їх також буде видалено з цього пристрою."</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Функції захисту пристрою не працюватимуть без пароля.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Ви більше не зможете розблоковувати телефон, дозволяти покупки або входити в додатки за допомогою відбитків пальців, оскільки їх також буде видалено з цього пристрою."</string>
+</xliff:g>Ви більше не зможете розблоковувати телефон, робити покупки або входити в додатки за допомогою відбитків пальців, оскільки їх також буде видалено з цього пристрою."</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Функції захисту пристрою не працюватимуть без блокування екрана.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Ви більше не зможете розблоковувати телефон, дозволяти покупки або входити в додатки за допомогою відбитків пальців, оскільки їх також буде видалено з цього пристрою."</string>
+</xliff:g>Ви більше не зможете розблоковувати телефон, робити покупки або входити в додатки за допомогою відбитків пальців, оскільки їх також буде видалено з цього пристрою."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Функції захисту профілю не працюватимуть без ключа."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Функції захисту профілю не працюватимуть без ключа.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Функції захисту профілю не працюватимуть без ключа.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Ви більше не зможете розблоковувати профіль, робити покупки та входити в додатки за допомогою відбитків пальців, оскільки їх також буде видалено з цього профілю."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Функції захисту профілю не працюватимуть без PIN-коду."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Функції захисту профілю не працюватимуть без PIN-коду.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Функції захисту профілю не працюватимуть без PIN-коду.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Ви більше не зможете розблоковувати профіль, робити покупки та входити в додатки за допомогою відбитків пальців, оскільки їх також буде видалено з цього профілю."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Функції захисту профілю не працюватимуть без пароля."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Функції захисту профілю не працюватимуть без пароля.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Функції захисту профілю не працюватимуть без пароля.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Ви більше не зможете розблоковувати профіль, робити покупки та входити в додатки за допомогою відбитків пальців, оскільки їх також буде видалено з цього профілю."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Функції захисту профілю не працюватимуть без блокування екрана."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Функції захисту профілю не працюватимуть без блокування екрана.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Функції захисту профілю не працюватимуть без блокування екрана.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Ви більше не зможете розблоковувати профіль, робити покупки та входити в додатки за допомогою відбитків пальців, оскільки їх також буде видалено з цього профілю."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Так, видалити"</string>
@@ -604,6 +609,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Цифри в порядку зростання чи спадання та повторювані цифри заборонені"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Скасувати"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Очистити"</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>
@@ -838,6 +844,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Є доступ до WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" Є доступ до WPS"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Введіть пароль своєї мережі"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Мережа Wi-Fi оператора"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Під’єднатися через мережу оператора <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Щоб покращити точність даних про місцезнаходження, а також для інших цілей, програма <xliff:g id="APP_NAME">%1$s</xliff:g> хоче вмикати сканування мережі, навіть коли Wi-Fi вимкнено.\n\nДозволити це для всіх програм, які потребують сканування?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Щоб вимкнути, у додатковому меню виберіть \"Додатково\"."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Дозволити"</string>
@@ -855,6 +863,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Підключити"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Помилка під’єднання до мережі."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Видалити"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Змінити"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Помилка видалення мережі"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Зберегти"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Помилка збереження мережі"</string>
@@ -869,6 +878,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Розширені налаштування Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-адреса"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"ІР-адреса"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Інформація про мережу"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Маска підмережі"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Адреси IPv6"</string>
@@ -901,16 +911,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Скасувати запрошення?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Скасувати запрошення під’єднатися до пристрою <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Видалити цю групу?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Портативна точка доступу Wi‑Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Точка доступу Wi‑Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Інші пристрої не матимуть доступу до Інтернету чи вмісту"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Надається доступ до інтернет-з’єднання на цьому планшеті через точку доступу"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Надається доступ до інтернет-з’єднання на цьому телефоні через точку доступу"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Додаток ділиться вмістом. Щоб надати доступ до інтернет-з’єднання, вимкніть і знову ввімкніть точку доступу"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Назва Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Назва точки доступу"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Увімкнення точки доступу \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\"…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Інші пристрої можуть підключитися до точки доступу \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\""</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Пароль Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Пароль точки доступу"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Діапазон частот точки доступу"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Створювати мережу Wi‑Fi для інших пристроїв за допомогою точки доступу. Точка доступу надає Інтернет, використовуючи мобільну мережу. Може стягуватися додаткова плата за мобільний Інтернет."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Додатки можуть створювати точку доступу, щоб ділитися вмістом із пристроями поруч."</string>
@@ -962,7 +971,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Якщо ввімкнути Wi-Fi, ваш телефон зможе спрямовувати дзвінки через мережі Wi-Fi або мережу вашого оператора, залежно від вибраних налаштувань і потужності сигналу мережі. Перш ніж увімкнути цю функцію, уточніть в оператора, скільки коштує ця послуга, та інші деталі."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Оновити екстрену адресу"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"Адреса, яку знатимуть екстрені служби, якщо ви зателефонуєте 112 через Wi-Fi"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"Адреса, яку знатимуть екстрені служби у вашій місцевості, коли ви екстрено телефонуватимете через Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Екран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Гучність"</string>
@@ -1016,6 +1025,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Пошук"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Керуйте налаштув. пошуку та історією"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Результатів немає"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Очистити історію"</string>
     <string name="display_settings" msgid="7965901687241669598">"Екран"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Автоповорот екрана"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Яскраві кольори"</string>
@@ -1350,8 +1360,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Відновлення налаштувань APN за умовчанням."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Скинути налаштування"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Налаштування за умовчанням відновлено."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Скинути"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Скидання налаштувань мереж"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Скинути параметри"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Можна скинути налаштування мережі, додатків або пристрою"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Скинути параметри Wi-Fi, мобільного передавання даних і Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Буде скинуто всі налаштування мережі, зокрема \n\n"<li>"Wi‑Fi"</li>\n<li>"мобільний трафік"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Скинути налаштування"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Скинути всі налаштування мереж? Цю дію не можна скасувати."</string>
@@ -1359,14 +1370,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Скинути?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Цей користувач не може скидати налаштування мережі"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Налаштування мереж скинуто"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Скидання налаштувань"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one">Буде скинуто налаштування <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> облікового запису</item>
-      <item quantity="few">Буде скинуто налаштування <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> облікових записів</item>
-      <item quantity="many">Буде скинуто налаштування <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> облікових записів</item>
-      <item quantity="other">Буде скинуто налаштування <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> облікового запису</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Внутрішню пам’ять і всі дані буде очищено"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Стерти всі дані (відновити заводські налаштування)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Буде видалено всі дані з "<b>"внутрішньої пам’яті"</b>" вашого планшета, зокрема:\n\n"<li>"ваш обліковий запис Google"</li>\n<li>"дані й налаштування системи та додатків"</li>\n<li>"завантажені додатки"</li>"."</string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Буде видалено всі дані з "<b>"внутрішньої пам’яті"</b>" вашого телефона, зокрема:\n\n"<li>"Ваш обліковий запис Google"</li>\n<li>"Дані й налаштування системи та додатків"</li>\n<li>"Завантажені додатки"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Наразі ви ввійшли в такі облікові записи:\n"</string>
@@ -1490,15 +1494,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Інф-я про безпеку"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Відсутнє з’єднання з мережею. Щоб переглянути цю інформацію зараз, перейдіть на %s з будь-якого комп’ютера, під’єднаного до Інтернету."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Завантаження…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Виберіть пароль"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Налаштуйте блокування екрана"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"З міркувань безпеки налаштуйте пароль"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Щоб користуватися відбитком пальця, налаштуйте пароль"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Створіть ключ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Щоб користуватися відбитком пальця, налаштуйте ключ"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Виберіть свій PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"З міркувань безпеки налаштуйте PIN-код"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Щоб користуватися відбитком пальця, налаштуйте PIN-код"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Підтвердьте свій пароль"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Введіть пароль ще раз"</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_pin_header" msgid="7744513791910572550">"Введіть 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>
@@ -1511,12 +1516,18 @@
     <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_strong_auth_required_device_pattern" msgid="530802132223800623">"З міркувань безпеки введіть ключ пристрою"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"З міркувань безпеки введіть PIN-код пристрою"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"З міркувань безпеки введіть пароль пристрою"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"З міркувань безпеки введіть ключ робочого профілю"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"З міркувань безпеки введіть PIN-код робочого профілю"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"З міркувань безпеки введіть пароль робочого профілю"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Налаштування телефона скинуто. Щоб користуватися цим телефоном, введіть попередній ключ."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Налаштування телефона скинуто. Щоб користуватися цим телефоном, введіть попередній PIN-код."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Налаштування телефона скинуто. Щоб користуватися цим телефоном, введіть попередній пароль."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Підтвердьте ключ"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Підтвердьте PIN-код"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Підтвердьте пароль"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Неправильний PIN-код"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Неправильний пароль"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Неправильний ключ"</string>
@@ -1821,13 +1832,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Створити віджет і дозволити доступ?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Після створення віджета хост <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> зможе отримувати доступ до всіх даних, які в ньому відображаються."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Завжди дозволяти хосту <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> створювати віджети й отримувати доступ до їх даних"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>дн. <xliff:g id="HOURS">%2$d</xliff:g>год. <xliff:g id="MINUTES">%3$d</xliff:g>хв. <xliff:g id="SECONDS">%4$d</xliff:g>с."</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>год. <xliff:g id="MINUTES">%2$d</xliff:g>хв. <xliff:g id="SECONDS">%3$d</xliff:g>с."</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>хв. <xliff:g id="SECONDS">%2$d</xliff:g>с."</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>сек."</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"Статист. використ."</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Статистика викор."</string>
     <string name="display_order_text" msgid="8592776965827565271">"Сорт. за:"</string>
@@ -1839,7 +1843,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Програма зчитування з екрана, дисплей і елементи керування взаємодією"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Спеціальні можливості"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Ви можете налаштувати цей пристрій для своїх потреб. Ці спеціальні можливості можна пізніше змінити в налаштуваннях."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Збільшити розмір шрифту"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Змінити розмір шрифту"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Програми зчитування з екрана"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Аудіо та текст на екрані"</string>
     <string name="display_category_title" msgid="685461049938269166">"Дисплей"</string>
@@ -1860,10 +1864,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Щоб збільшити вміст"</b>", тричі торкніться екрана.\n"<ul><li>"Щоб прокрутити вміст, проведіть по екрану принаймні двома пальцями."</li>\n<li>"Щоб змінити масштаб, стисніть або розведіть принаймні два пальці."</li></ul>\n\n<b>"Щоб тимчасово збільшити вміст"</b>", тричі натисніть і втримуйте його.\n"<ul><li>"Пересувайте палець, щоб переміщатись екраном."</li>\n<li>"Підніміть палець, щоб знову зменшити елемент."</li></ul>\n\n"Масштабування не підтримується на клавіатурі та панелі навігації."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Коли ввімкнено збільшення, використовуйте кнопку спеціальних можливостей унизу екрана, щоб швидко збільшувати його вміст.\n\n"<b>"Щоб збільшити вміст"</b>", торкніться кнопки спеціальних можливостей, а потім будь-де на екрані.\n"<ul><li>"Щоб прокрутити вміст, проведіть по екрану принаймні двома пальцями."</li>\n<li>"Щоб змінити масштаб, стисніть або розведіть принаймні два пальці."</li></ul>\n\n<b>"Щоб тимчасово збільшити вміст"</b>", торкніться кнопки спеціальних можливостей, а потім натисніть і втримуйте будь-яке місце на екрані.\n"<ul><li>"Пересувайте палець, щоб переміщатись екраном.у"</li>\n<li>"Підніміть палець, щоб знову зменшити елемент."</li></ul>\n\n"Масштабування не підтримується на клавіатурі та панелі навігації."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Для кнопки спеціальних можливостей вибрано службу \"<xliff:g id="SERVICE">%1$s</xliff:g>\". Щоб змінити на збільшення, натисніть і втримуйте кнопку спеціальних можливостей, а потім виберіть \"Збільшення\"."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Ярлик"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Комбінація клавіш гучності"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Служба, пов’язана з ярликом"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Дозволити на заблокованому екрані"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Якщо ввімкнено ярлик спеціальних можливостей, ви можете активувати функцію спеціальних можливостей, натиснувши обидві клавіші гучності й утримуючи їх протягом 3 секунд."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Якщо цю комбінацію клавіш увімкнено, ви можете активувати спеціальні можливості, утримуючи обидві клавіші гучності протягом 3 секунд."</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">"Автоматично оновлювати збільшення"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Оновлювати збільшення екрана в інших програмах"</string>
@@ -1876,7 +1880,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Може вплинути на продуктивність"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Клік після зупинки курсора"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Затримка перед кліком"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g>: <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"УВІМК."</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ВИМК."</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Показувати на панелі швидкого налаштування"</string>
@@ -2402,6 +2405,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Керувати планами"</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>
@@ -2487,6 +2491,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мобільні мережі"</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_metered_auto" msgid="1262028400911918865">"Автоматично"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"З тарифікацією трафіку"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Без тарифікації трафіку"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Ваш оператор може по-іншому вимірювати статистику використання даних."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Аварійний виклик"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Повернутися до дзвінка"</string>
@@ -2712,7 +2719,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Менеджер викликів"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Повідомлення екстрених служб"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Екстрені сповіщення"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Оператори мережі"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Назви точок доступу"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Розширений режим 4G LTE"</string>
@@ -2781,6 +2788,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Використання SIM-карт"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Запитувати щоразу"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Потрібно вибрати"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Вибір SIM-карти"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Налаштування"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="one">Показати %d схований елемент</item>
@@ -2936,18 +2944,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Сповіщення з додатків"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Категорія сповіщень"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Пріоритет"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Дозволити додатку вирішувати"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Дозволити звуковий сигнал"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Ніколи не показувати сповіщення"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Без звуку та візуальних сповіщень"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Без звуку"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Зі звуком"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Зі звуком і спливаючими вікнами"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Спливають на екрані"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Неважливе сповіщення"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Звичайне сповіщення"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Важливе сповіщення"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Термінове сповіщення"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Дозволити звуковий сигнал"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Не подавати звуковий сигнал і вібросигнал та не показувати ці сповіщення на поточному екрані."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Дозволити сповіщення"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Дозволити додатку подавати звуковий сигнал, відбосигнал і/або показувати спливаючі сповіщення на екрані"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Низький пріоритет"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Середній пріоритет"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Високий пріоритет"</string>
@@ -2980,7 +2989,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"картинка в картинці"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Картинка в картинці"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Дозволити функцію картинки в картинці"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Додаток зможе створювати вікно з картинкою в картинці, доки додаток відкрито або після виходу з нього (наприклад, щоб продовжити перегляд відео). Це вікно з’являтиметься поверх інших додатків."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Додаток зможе створювати вікно з картинкою в картинці, доки додаток відкрито або після виходу з нього (наприклад, щоб продовжити перегляд відео). Це вікно з’являтиметься поверх інших додатків."</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>
@@ -3303,6 +3312,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Перенесення файлів"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Перенесення фото (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Використовувати пристрій як MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Дзеркалювання SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Перевірка у фоновому режимі"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Повний доступ у фоновому режиміj"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Використовувати текст з екрана"</string>
@@ -3449,6 +3459,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="night_display_suggestion_title" msgid="6602129097059325291">"Налаштувати графік нічного режиму"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Бурштиновий відтінок екрана сприятиме сну"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Нічне освітлення ввімкнено"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Можливо, бурштиновий відтінок екрана допоможе вам заснути."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Пропозиції"</string>
@@ -3471,6 +3483,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Використовувати холодніші кольори дисплея"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Щоб змінити кольори, вимкніть екран"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Щоб застосувати зміни у функції Telephony Monitor, перезапустіть пристрій"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Режим HDR+ на рівні HAL камери"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Щоб зміна режиму HDR+ на рівні HAL камери почала діяти, перезапустіть пристрій"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Лазерний датчик камери"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматичне оновлення системи"</string>
     <string name="usage" msgid="2977875522080448986">"Використання"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Мобільний трафік"</string>
@@ -3498,7 +3513,7 @@
     <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_2">%2$s</xliff:g> використано <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<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">
@@ -3571,7 +3586,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Стерти та конвертувати"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Скинути обмеження швидкості в ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Обмеження швидкості в ShortcutManager скинуто"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Керуйте сповіщеннями на заблок. екрані"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Керуйте інформацією на заблокованому екрані"</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="8483187649355540109">"Підтримка та поради"</string>
@@ -3579,7 +3594,7 @@
     <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="2456198532288640046">"Невидимий для інших пристроїв"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Вимкнено"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Під’єднано до пристрою <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Під’єднано до кількох пристроїв"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Демо-режим інтерфейсу системи"</string>
@@ -3687,7 +3702,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Додатки з миттєвим запуском"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Відкривати посилання в додатках, навіть якщо їх не встановлено"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Додатки з миттєвим запуском"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Обліковий запис додатків із миттєвим запуском"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Параметри додатків із миттєвим запуском"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Установлені додатки"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Зараз пам’яттю керує диспетчер пам’яті"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Облікові записи користувача <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3738,7 +3753,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Постійну мережу VPN увімкнено у вашому особистому профілі"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Постійну мережу VPN увімкнено у вашому робочому профілі"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Установлено глобальний проксі-сервер HTTP"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Надійні облікові дані"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Надійні облікові дані"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Надійні облікові дані в особистому профілі"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Надійні облікові дані в робочому профілі"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">Щонайменше <xliff:g id="COUNT_1">%d</xliff:g> сертифікат ЦС</item>
       <item quantity="few">Щонайменше <xliff:g id="COUNT_1">%d</xliff:g> сертифікати ЦС</item>
@@ -3811,7 +3828,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Інформація про ініціалізацію оператора"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Активатор ініціалізації оператора"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Що нового та цікавого?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Перегляньте 5 найкращих функцій"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Ознайомтеся зі своїм новим телефоном"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Ознайомтеся зі своїм новим планшетом"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Ознайомтеся зі своїм новим пристроєм"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ця функція недоступна на цьому пристрої"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Статус реєстрації IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Зареєстровано"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Не зареєстровано"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 621e185..7820abe 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"‏%1$s آپ کے پیغامات تک رسائی حاصل کرنا چاہتا ہے۔ ‎%2$s کو رسائی دیں؟"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"‏SIM تک رسائی کی درخواست"</string>
     <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="bluetooth_device_name_summary" msgid="4757990010751789977">"دیگر آلات کے لیے بطور \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' مرئی ہے"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"دیگر آلات کیلئے بطور ’<xliff:g id="DEVICE_NAME">^1</xliff:g>‘ مرئی ہے"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"آپ کے آلات"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"نئے آلہ کا جوڑا بنائیں"</string>
     <string name="date_and_time" msgid="9062980487860757694">"تاریخ اور وقت"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"آگے جائیں"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"فنگر پرنٹ کو نظر انداز کریں؟"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"فنگر پرنٹ سیٹ اپ میں صرف ایک یا دو منٹ لگتے ہیں۔ اگر آپ اسے نظر انداز کرتے ہیں، تو آپ بعد میں ترتیبات میں اپنی فنگر پرنٹ شامل کرسکتے ہیں۔"</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"اسکرین لاک کو نظر انداز کریں؟"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"آلہ کے تحفظ کی خصوصیات آن نہیں ہوں گی۔ اس کے ضائع، چوری یا دوبارہ ترتیب دئے جانے پر آپ دوسروں کو اس ٹیبلیٹ کے استعمال سے نہیں روک پائیں گے۔"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"آلہ کے تحفظ کی خصوصیات آن نہیں ہوں گی۔ اس کے ضائع، چوری یا دوبارہ ترتیب دئے جانے پر آپ دوسروں کو اس آلہ کے استعمال سے نہیں روک پائیں گے۔"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"آلہ کے تحفظ کی خصوصیات آن نہیں ہوں گی۔ اس کے ضائع، چوری یا دوبارہ ترتیب دئے جانے پر آپ دوسروں کو اس فون کے استعمال سے نہیں روک پائیں گے۔"</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"آپ فنگر پرنٹس کی زیادہ سے زیادہ تعداد شامل کر چکے ہیں"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"مزید فنگر پرنٹس شامل نہیں کر سکتے"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"تمام فنگر پرنٹس ہٹائیں؟"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"’<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>‘ ہٹائیں"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"کیا آپ یہ فنگر پرنٹ حذف کرنا چاہتے ہیں؟"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"آپ اپنے فون کو غیر مقفل کرنے، خریداریوں کی اجازت دینے، ایپس میں سائن ان ہونے کیلئے اپنے فنگر پرنٹس استعمال نہیں کر پائیں گے۔"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"آپ اپنے دفتری پروفائل کو غیر مقفل کرنے، خریداریوں کی اجازت دینے یا دفتری ایپس میں سائن ان ہونے کیلئے اپنے فنگر پرنٹس استعمال نہیں کر پائیں گے"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"جی ہاں، ہٹائیں"</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"اضافی سیکیورٹی کیلئے ایک بیک اپ اسکرین قفل سیٹ اپ کریں۔"</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"اضافی سیکیورٹی کیلئے ایک بیک اپ اسکرین لاک سیٹ اپ کریں۔"</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>
@@ -497,37 +502,37 @@
     <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_fingerprint" msgid="8212242533942400457">"آلہ کے تحفظ کی خصوصیات آپ کے پیٹرن کے بغیر کام نہیں کریں گی۔<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"آلہ کے تحفظ کی خصوصیات آپ کے پیٹرن کے بغیر کام نہیں کریں گی۔<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_fingerprint" msgid="875669051899437197">"‏آلہ کے تحفظ کی خصوصیات آپ کی PIN کے بغیر کام نہیں کریں گی۔<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"‏آلہ کے تحفظ کی خصوصیات آپ کے 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_fingerprint" msgid="2228159168587170445">"آلہ کے تحفظ کی خصوصیات آپ کے پاس ورڈ کے بغیر کام نہیں کریں گی۔<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"آلہ کے تحفظ کی خصوصیات آپ کے پاس ورڈ کے بغیر کام نہیں کریں گی۔<xliff:g id="EMPTY_LINE">
 
-</xliff:g>آپ کے محفوظ کردہ فنگر پرنٹس بھی اس آلہ سے ہٹا دیے جائیں گے اور آپ ان سے اپنے فون کو غیر مقفل، خریداریوں کی اجازت یا ایپس میں سائن ان  نہیں کر پائیں گے۔"</string>
+</xliff:g>آپ کے محفوظ کردہ فنگر پرنٹس بھی اس آلہ سے ہٹا دیے جائیں گے اور آپ ان سے اپنے فون کو غیر مقفل، خریداریوں کی اجازت یا ایپس میں سائن ان نہیں کر پائیں گے۔"</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"آلہ کے تحفظ کی خصوصیات آپ کے اسکرین لاک کے بغیر کام نہیں کریں گی۔<xliff:g id="EMPTY_LINE">
 
 </xliff:g>آپ کے محفوظ کردہ فنگر پرنٹس بھی اس آلہ سے ہٹا دیے جائیں گے اور آپ ان سے اپنے فون کو غیر مقفل، خریداریوں کی اجازت یا ایپس میں سائن ان نہیں کر پائیں گے۔"</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"پروفائل کے تحفظ کی خصوصیات آپ کے پیٹرن کے بغیر کام نہیں کریں گی۔"</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"پروفائل کے تحفظ کی خصوصیات آپ کے پیٹرن کے بغیر کام نہیں کریں گی۔<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"پروفائل کے تحفظ کی خصوصیات آپ کے پیٹرن کے بغیر کام نہیں کریں گی۔<xliff:g id="EMPTY_LINE">
 
-</xliff:g>آپ کے محفوظ کردہ فنگر پرنٹس بھی اس پروفائل سے ہٹا دیے جائیں گے اور آپ ان سے اپنے فون کو غیر مقفل، خریداریوں کی اجازت یا ایپس میں سائن ان نہیں کر پائیں گے۔"</string>
+</xliff:g>آپ کے محفوظ کردہ فنگر پرنٹس بھی اس پروفائل سے ہٹا دیے جائیں گے اور آپ ان سے اپنے پروفائل کو غیر مقفل، خریداریوں کی اجازت یا ایپس میں سائن ان نہیں کر پائیں گے۔"</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"‏پروفائل کے تحفظ کی خصوصیات آپ کی PIN کے بغیر کام نہیں کریں گی۔"</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"‏پروفائل کے تحفظ کی خصوصیات آپ کی PIN کے بغیر کام نہیں کریں گی۔<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"‏پروفائل کے تحفظ کی خصوصیات آپ کے PIN کے بغیر کام نہیں کریں گی۔<xliff:g id="EMPTY_LINE">
 
-</xliff:g>آپ کے محفوظ کردہ فنگر پرنٹس بھی اس پروفائل سے ہٹا دیے جائیں گے اور آپ ان سے اپنے فون کو غیر مقفل، خریداریوں کی اجازت یا ایپس میں سائن ان نہیں کر پائیں گے۔"</string>
+</xliff:g>آپ کے محفوظ کردہ فنگر پرنٹس بھی اس پروفائل سے ہٹا دیے جائیں گے اور آپ ان سے اپنے پروفائل کو غیر مقفل، خریداریوں کی اجازت یا ایپس میں سائن ان نہیں کر پائیں گے۔"</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"پروفائل کے تحفظ کی خصوصیات آپ کے پاسورڈ کے بغیر کام نہیں کریں گی۔"</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"آلہ کے تحفظ کی خصوصیات آپ کے پاسورڈ کے بغیر کام نہیں کریں گی۔<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"پروفائل کے تحفظ کی خصوصیات آپ کے پاسورڈ کے بغیر کام نہیں کریں گی۔<xliff:g id="EMPTY_LINE">
 
-</xliff:g>آپ کے محفوظ کردہ فنگر پرنٹس بھی اس پروفائل سے ہٹا دیے جائیں گے اور آپ ان سے اپنے پروفائل کو غیر مقفل، خریداریوں کی اجازت یا ایپس میں سائن ان  نہیں کر پائیں گے۔"</string>
+</xliff:g>آپ کے محفوظ کردہ فنگر پرنٹس بھی اس پروفائل سے ہٹا دیے جائیں گے اور آپ ان سے اپنے پروفائل کو غیر مقفل، خریداریوں کی اجازت یا ایپس میں سائن ان نہیں کر پائیں گے۔"</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"پروفائل کے تحفظ کی خصوصیات آپ کے اسکرین قفل کے بغیر کام نہیں کریں گی۔"</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"پروفائل کے تحفظ کی خصوصیات آپ کے اسکرین قفل کے بغیر کام نہیں کریں گی۔<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"پروفائل کے تحفظ کی خصوصیات آپ کے اسکرین لاک کے بغیر کام نہیں کریں گی۔<xliff:g id="EMPTY_LINE">
 
-</xliff:g>آپ کے محفوظ کردہ فنگر پرنٹس بھی اس پروفائل سے ہٹا دیے جائیں گے اور آپ ان سے اپنے فون کو غیر مقفل، خریداریوں کی اجازت یا ایپس میں سائن ان نہیں کر پائیں گے۔"</string>
+</xliff:g>آپ کے محفوظ کردہ فنگر پرنٹس بھی اس پروفائل سے ہٹا دیے جائیں گے اور آپ ان سے اپنے پروفائل کو غیر مقفل، خریداریوں کی اجازت یا ایپس میں سائن ان نہیں کر پائیں گے۔"</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"جی ہاں، ہٹائیں"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"غیر مقفل کرنے کا پیٹرن تبدیل کریں"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"‏غیر مقفل کرنے کا PIN تبدیل کریں"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"ہندسوں کی صعودی، نزولی یا مکرر ترتیب کی اجازت نہیں ہے"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ٹھیک ہے"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"منسوخ کریں"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"صاف کریں"</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>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"‏WPS دستیاب ہے"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS دستیاب ہے)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"اپنا نیٹ ورک پاس ورڈ درج کریں"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"‏کیریئر Wi‑Fi نیٹ ورک"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"منسلک ہوں بذریعہ <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"‏مقام کی قطعیت کو بہتر بنانے اور دوسرے مقاصد کیلئے، <xliff:g id="APP_NAME">%1$s</xliff:g> Wi-Fi بند ہونے پر بھی نیٹ ورک اسکیننگ آن کرنا چاہتی ہے۔\n\nاسکین کرنے کی خواہاں سبھی ایپس کیلئے اس کی اجازت دیں؟"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"اسے آف کرنے کیلئے، اوور فلو مینو میں ایڈوانسڈ پر جائیں۔"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"اجازت دیں"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"مربوط کریں"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"نیٹ ورک سے مربوط ہونے میں ناکام رہا"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"بھول جائیں"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"ترمیم کریں"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"نیٹ ورک کو بھولنے میں ناکام ہوگیا"</string>
     <string name="wifi_save" msgid="3331121567988522826">"محفوظ کریں"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"نیٹ ورک محفوظ کرنے میں ناکام ہوگیا"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"‏جدید Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"‏MAC پتہ"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"‏IP پتہ"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"نیٹ ورک کی معلومات"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"سب نیٹ ماسک"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"‏IPv6  پتے"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"دعوت منسوخ کریں؟"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"کیا آپ <xliff:g id="PEER_NAME">%1$s</xliff:g> کے ساتھ مربوط ہونے کی دعوت منسوخ کرنا چاہتے ہیں؟"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"اس گروپ کو بھول جائیں؟"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"‏پورٹیبل Wi‑Fi ہاٹ اسپاٹ"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"‏Wi‑Fi ہاٹ اسپاٹ"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"دیگر آلات کے ساتھ انٹرنیٹ یا مواد کا اشتراک نہیں ہو رہا ہے"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"ہاٹ اسپاٹ کے ذریعے اس ٹیبلیٹ کے انٹرنیٹ کنکشن کا اشتراک ہو رہا ہے"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"ہاٹ اسپاٹ کے ذریعے اس فون کے انٹرنیٹ کنکشن کا اشتراک ہو رہا ہے"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"ایپ مواد کا اشتراک کر رہی ہے۔ انٹرنیٹ کنکشن کا اشتراک کرنے کے لیے، ہاٹ اسپاٹ آف کر کے آن کریں"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"‏Wi‑Fi کا نام"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"ہاٹ اسپاٹ کا نام"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> آن ہو رہا ہے..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"دیگر آلات <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> سے منسلک ہو سکتی ہیں"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"‏Wi-Fi پاس ورڈ"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"ہاٹ اسپاٹ کا پاس ورڈ"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"‏AP بینڈ"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"‏اپنے دیگر آلات کیلئے Wi‑Fi نیٹ ورک بنانے کی خاطر ہاٹ اسپاٹ کا استعمال کریں۔ ہاٹ اسپاٹ آپ کے موبائل ڈیٹا کنکشن کا استعمال کر کے انٹرنیٹ فراہم کرتا ہے۔ اضافی موبائل ڈیٹا کے چارجز عائد ہو سکتے ہیں۔"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"قریبی آلات کے ساتھ مواد کا اشتراک کرنے کے لیے ایپس ایک ہاٹ اسپاٹ بنا سکتی ہیں۔"</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"‏Wi-Fi کالنگ آن ہونے پر، آپ کا فون آپ کی ترجیح اور زیادہ مضبوط سگنل کی بنیاد پر کالز کا روٹ Wi-Fi یا آپ کے کیریئر نیٹ ورک کے ذریعہ کر سکتا ہے۔ اس خصوصیت کو آن کرنے سے پہلے، فیس اور دیگر تفصیلات کیلئے اپنے کیریئر سے رابطہ کریں۔"</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"ہنگامی پتہ اپ ڈیٹ کریں"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"‏اگر آپ WiFi استعمال کرکے 911 پر کال کریں تو ایمرجنسی سروسز کی جانب سے پتہ آپ کے مقام کے طور پر استعمال ہوتا ہے"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"‏اگر آپ Wi-Fi استعمال کر کے ایمرجنسی کال کرتے ہیں تو ایمرجنسی سروسز کی جانب آپ کا پتہ آپ کے مقام کے طور پر استعمال ہوتا ہے"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ڈسپلے"</string>
     <string name="sound_settings" msgid="5534671337768745343">"آواز"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"والیومز"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"تلاش کریں"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"تلاش کی ترتیبات اور سرگزشت کا نظم کریں"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"کوئی نتائج نہیں"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"سرگزشت صاف کریں"</string>
     <string name="display_settings" msgid="7965901687241669598">"ڈسپلے"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"اسکرین کو خود کار طور پر گھمائیں"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"بھڑکیلے رنگ"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"‏ڈیفالٹ APN ترتیبات بحال ہو رہی ہیں۔"</string>
     <string name="menu_restore" msgid="8260067415075573273">"ڈیفالٹ پر دوبارہ ترتیب دیں"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"‏ڈیفالٹ APN ترتیبات کو دوبارہ ترتیب دینے کا عمل مکمل ہو گیا۔"</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"ری سیٹ کریں"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"نیٹ ورک کی ترتیبات دوبارہ ترتیب دیں"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"ری سیٹ کے اختیارات"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"نیٹ ورک، ایپس، یا آلہ کو ری سیٹ کیا جا سکتا ہے"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"‏Wi-Fi، موبائل اور بلوٹوتھ کو دوبارہ ترتیب دیں"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"‏یہ نیٹ ورک کی سبھی ترتیبات کو دوبارہ ترتیب دے گا، بشمول:\n\n"<li>"Wi‑Fi"</li>\n<li>"موبائل ڈیٹا"</li>\n<li>"بلوٹوتھ"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"ترتیبات دوبارہ ترتیب دیں"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"نیٹ ورک کی سبھی ترتیبات کو دوبارہ ترتیب دیں؟ آپ اس کارروائی کو کالعدم نہیں کر سکتے ہیں!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"دوبارہ ترتیب دیں؟"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"اس صارف کیلئے نیٹ ورک کو دوبارہ ترتیب دینا دستیاب نہیں ہے"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"نیٹ ورک کی ترتیبات کو دوبارہ ترتیب دیا گیا ہے"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"فیکٹری ڈیٹا ری سیٹ"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> اکاؤنٹس ری سیٹ کئے جائیں گے</item>
-      <item quantity="one">1 اکاؤنٹ ری سیٹ کیا جائے گا</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"داخلی اسٹوریج اور تمام ڈیٹا ری سیٹ کئے جائیں گے"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"تمام ڈیٹا (فیکٹری ری سیٹ) حذف کریں"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"‏یہ آپ کے ٹیبلٹ کے "<b>"داخلی اسٹوریج"</b>" سے سبھی ڈیٹا کو حذف کر دے گا، بشمول:\n\n"<li>"آپ کا Google اکاؤنٹ"</li>\n<li>"سسٹم اور ایپ ڈیٹا اور ترتیبات"</li>\n<li>"ڈاؤن لوڈ کردہ ایپس"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"‏یہ آپ کے فون کے "<b>"داخلی اسٹوریج"</b>" سے سبھی ڈیٹا کو حذف کر دے گا، بشمول:\n\n"<li>"آپ کا Google اکاؤنٹ"</li>\n<li>"سسٹم اور ایپ ڈیٹا اور ترتیبات"</li>\n<li>"ڈاؤن لوڈ کردہ ایپس"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"آپ فی الحال مندرجہ ذیل اکاؤنٹس میں سائن ان ہیں:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"حفاظت سے متعلق معلومات"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"‏آپ کے پاس ڈيٹا کنکشن نہيں ہے۔ اس معلومات کو ابھی دیکھنے کیلئے، انٹرنیٹ سے مربوط کسی بھی کمپیوٹر سے ‎%s پر جائیں۔"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"لوڈ ہو رہا ہے…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"اپنا پاس ورڈ منتخب کریں"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"اسکرین لاک سیٹ کریں"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"سیکیورٹی کیلئے پاسورڈ سیٹ کریں"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"فنگر پرنٹ کے استعمال کے لیے پاسورڈ سیٹ کریں"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"اپنا پیٹرن منتخب کریں"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"فنگر پرنٹ کے استعمال کے لیے پیٹرن سیٹ کریں"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"‏اپنا PIN منتخب کریں"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"‏سیکیورٹی کیلئے PIN سیٹ کریں"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"‏فنگر پرنٹ کے استعمال کے لیے PIN سیٹ کریں"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"اپنے پاس ورڈ کی توثیق کریں"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"اپنا پاس ورڈ دوبارہ درج کریں"</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_pin_header" msgid="7744513791910572550">"‏اپنا PIN دوبارہ درج کریں"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"پاس ورڈز مماثل نہیں ہیں"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"‏PINs مماثل نہیں ہیں"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"غیر مقفل کرنے کیلئے انتخاب"</string>
@@ -1483,12 +1490,18 @@
     <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_strong_auth_required_device_pattern" msgid="530802132223800623">"اضافی سیکیورٹی کیلئے اپنے آلہ کا پیٹرن استعمال کریں"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"‏اضافی سیکیورٹی کیلئے اپنے آلہ کا PIN درج کریں"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"اضافی سیکیورٹی کیلئے، اپنے آلہ کا پاس ورڈ درج کریں"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"اضافی سیکیورٹی کیلئے اپنا دفتری پیٹرن استعمال کریں"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"‏اضافی سیکیورٹی کیلئے اپنا دفتری PIN درج کریں"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"اضافی سیکیورٹی کیلئے اپنا دفتری پاس ورڈ درج کریں"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"آپ کے فون کو فیکٹری ترتیبات پر ری سیٹ کر دیا گیا تھا۔ اس فون کا استعمال کرنے کیلئے، اپنا پچھلا پیٹرن درج کریں۔"</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"‏آپ کے فون کو فیکٹری ترتیبات پر ری سیٹ کر دیا گیا تھا۔ اس فون کا استعمال کرنے کیلئے، اپنا پچھلا PIN درج کریں۔"</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"آپ کے فون کو فیکٹری ترتیبات پر ری سیٹ کر دیا گیا تھا۔ اس فون کا استعمال کرنے کیلئے، اپنا پچھلا پاس ورڈ درج کریں۔"</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"پیٹرن کی توثیق کریں"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"‏PIN کی توثیق کریں"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"پاس ورڈ کی توثیق کریں"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"‏غلط PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"غلط پاس ورڈ"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"غلط پیٹرن"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"ویجیٹ بنائیں اور رسائی کی اجازت دیں؟"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"آپ کے ویجیٹ بنا لینے کے بعد، <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ان سبھی ڈیٹا تک رسائی حاصل کرسکتا ہے جو یہ ڈسپلے کرتا ہے۔"</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> کو ہمیشہ ویجٹس بنانے اور ان کے ڈیٹا تک رسائی حاصل کرنے کی اجازت دیں"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>دن <xliff:g id="HOURS">%2$d</xliff:g>گھنٹے <xliff:g id="MINUTES">%3$d</xliff:g>منٹ <xliff:g id="SECONDS">%4$d</xliff:g>سیکنڈ"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>گھنٹے <xliff:g id="MINUTES">%2$d</xliff:g>منٹ <xliff:g id="SECONDS">%3$d</xliff:g>سیکنڈ"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>منٹ <xliff:g id="SECONDS">%2$d</xliff:g>سیکنڈ"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> سیکنڈ"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"استعمال کے اعداد و شمار"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"استعمال کے اعداد و شمار"</string>
     <string name="display_order_text" msgid="8592776965827565271">"ترتیب دیں بلحاظ:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"اسکرین قارئین، ڈسپلے، تعامل کے کنٹرولز"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"بصارتی ترتیبات"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"آپ اس آلہ کو اپنی ضروریات کے مطابق حسب ضرورت بنا سکتے ہیں۔ یہ ایکسیسبیلٹی خصوصیات بعد میں ترتیبات میں تبدیل ہو سکتی ہیں۔"</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"فونٹ سائز بڑھائیں"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"فونٹ سائز تبدیل کریں"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"قارئین اسکرین"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"آڈیو اور اسکرین پر موجود ٹیکسٹ"</string>
     <string name="display_category_title" msgid="685461049938269166">"ڈسپلے"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><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_screen_magnification_navbar_summary" msgid="1996584694050087161">"میگنیفکیشن آن ہونے پر، تیزی سے بڑا کرنے کیلئے اسکرین کے نیچے ایکسیسبیلٹی بٹن استعمال کریں۔\n\n"<b>"زوم کرنے کیلئے"</b>"، ایکسیسبیلٹی بٹن پر تھپتھپائیں، پھر اسکرین پر کہیں بھی تھپتھپائیں۔\n"<ul><li>"اسکرول کرنے کیلئے 2 یا زیادہ انگلیوں سے گھسیٹیں"</li>\n<li>"زوم ایڈجسٹ کرنے کیلئے 2 یا زیادہ انگلیوں سے چٹکی بھریں"</li></ul>\n\n<b>"عارضی طور پر زوم کرنے کیلئے"</b>"، ایکسیسبیلٹی بٹن پر تھپتھپائیں، پھر اسکرین پر کہیں بھی ٹچ کریں اور دبائے رکھیں۔\n"<ul><li>"اسکرین پر اِدھر اُدھر حرکت دینے کیلئے گھسیٹیں"</li>\n<li>"زوم آؤٹ کرنے کیلئے انگلی اٹھائیں"</li></ul>\n\n"آپ کی بورڈ یا نیویگیشن بار پر زوم ان نہیں کر سکتے۔"</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"ایکسیسبیلٹی بٹن <xliff:g id="SERVICE">%1$s</xliff:g> پر سیٹ ہے۔ میگنیفکیشن استعمال کرنے کیلئے، ایکسیسبیلٹی بٹن ٹچ کریں اور دبائے رکھیں، پھر میگنیفکیشن منتخب کریں۔"</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"ایکسیسبیلٹی کا شارٹ کٹ"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"والیوم کی کلید کا شارٹ کٹ"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"شارٹ کٹ سروس"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"مقفل اسکرین سے اجازت دیں"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"شارٹ کٹ آن ہونے پر، آپ ایکسیسبیلٹی خصوصیت شروع کرنے کیلئے 3 سیکنڈ تک دونوں والیوم بٹنز دبائے رکھ سکتے ہیں۔"</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"شارٹ کٹ آن ہونے پر، آپ ایک ایکسیسبیلٹی خصوصیت شروع کرنے کیلئے 3 سیکنڈ تک والیوم کی دونوں کلیدوں کو دبائے رکھ سکتے ہیں۔"</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">"سکرین میگنیفکیشن از خود اپ ڈیٹ کریں"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"ایپ تبدیلیوں پر سکرین میگنیفکیشن کو اپ ڈیٹ کریں"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"کارکردگی متاثر ہو سکتی ہے"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"پوائنٹر رُک جائے تو کلک کریں"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"کلک سے قبل توقف"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"آن"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"آف"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"فوری ترتیبات میں دکھائیں"</string>
@@ -2358,6 +2363,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"پلانز کا نظم کریں"</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>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"موبائل نیٹ ورکس"</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_metered_auto" msgid="1262028400911918865">"خودکار"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"میٹرڈ ہے"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"میٹرڈ نہیں ہے"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"کیریئر ڈیٹا کا حساب آپ کے آلہ سے مختلف ہو سکتا ہے۔"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"ہنگامی کال"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"کال پر واپس جائیں"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"کال مینیجر"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"ہنگامی براڈکاسٹس"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"ایمرجنسی الرٹس"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"نیٹ ورک آپریٹرز"</string>
     <string name="access_point_names" msgid="1381602020438634481">"رسائی کی جگہ کا نام"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"‏Enhanced 4G LTE وضع"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"‏ترجیحی SIM برائے"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"ہر بار پوچھیں"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"انتخاب درکار ہے"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"‏SIM کا انتخاب"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"ترتیبات"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for settings_suggestion_header_summary_hidden_items (5597356221942118048) -->
@@ -2878,18 +2888,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"ایپ کی اطلاعات"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"اطلاع کا زمرہ"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"اہمیت"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"ایپ کو فیصلہ کرنے دیں"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"آواز کی اجازت دیں"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"کبھی اطلاعات نہ دکھائیں"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"کوئی صوتی یا بصری مداخلت نہیں"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"کوئی آواز نہیں ہے"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"آواز نکالیں"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"آواز نکالیں اور اسکرین پر پاپ کریں"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"اسکرین پر دکھائیں"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"کم"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"متوسط"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"زیادہ"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"ارجنٹ"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"آواز کی اجازت دیں"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"آواز نہ نکالیں، وائبریٹ نہ کریں اور ان اطلاعات کو موجودہ اسکرین پر نہ دکھائیں۔"</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"مداخلتوں کو اجازت دیں"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"ایپ کو اسکرین پر آواز، وائبریٹ اور/یا پاپ اطلاعات ظاہر کرنے دیں"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"کم اہمیت"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"متوسط اہمیت"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"زیادہ اہمیت"</string>
@@ -2920,7 +2931,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"تصویر میں تصویر"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"تصویر میں تصویر"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"تصویر میں تصویر کی اجازت دیں"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"ایپ کے کھلے رہنے پر یا آپ کے اسے چھوڑنے کے بعد اس ایپ کو تصویر میں تصویر ونڈو بنانے کی اجازت دیں (مثال کے طور پر، ویڈیو دیکھنا جاری رکھیں)۔ یہ ونڈو آپ کے ذریعے استعمال کی جانے والی دیگر ایپس کے اوپری حصے پر ڈسپلے ہوتی ہے۔"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"ایپ کے کھلے رہنے پر یا آپ کے اسے چھوڑنے کے بعد اس ایپ کو تصویر میں تصویر ونڈو بنانے کی اجازت دیں (مثال کے طور پر، ویڈیو دیکھنا جاری رکھنے کیلئے)۔ یہ ونڈو آپ کے ذریعے استعمال کی جانے والی دیگر ایپس کے اوپری حصے پر ڈسپلے ہوتی ہے۔"</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>
@@ -3223,6 +3234,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"فائلیں منتقل کرنا"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"‏تصاویر منتقل کرنا (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"‏آلے کو بطور MIDI استعمال کرنا"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"‏SMS مررنگ"</string>
     <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>
@@ -3365,6 +3377,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="night_display_suggestion_title" msgid="6602129097059325291">"نائٹ لائٹ شیڈول سیٹ کریں"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"سونے میں مدد کیلئے اسکرین کا رنگ ہلکا امبر کریں"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"رات کی روشنی آن ہے"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"اسکرین کا رنگ ہلکا امبر ہے۔ اس سے ممکن ہے آپ کو سونے میں مدد ملے۔"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"تجاویز"</string>
@@ -3383,6 +3397,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"ڈسپلے کیلئے سرد رنگ استعمال کریں"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"رنگ میں تبدیلی لاگو کرنے کیلئے اسکرین آف کریں"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"ٹیلیفونی مانیٹر کی تبدیلی لاگو کرنے کیلئے، آلہ ریبوٹ کریں"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"‏کیمرا HAL HDR+‎"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"‏کیمرا HAL HDR+‎ کی تبدیلی لاگو کرنے کے لیے، آلہ ریبوٹ کریں"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"کیمرا لیزر سینسر"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"خودکار سسٹم اپ ڈیٹس"</string>
     <string name="usage" msgid="2977875522080448986">"استعمال"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"موبائل ڈیٹا کا استعمال"</string>
@@ -3408,7 +3425,7 @@
     <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_2">%2$s</xliff:g> کے درمیان <xliff:g id="ID_1">%1$s</xliff:g> استعمال ہوا"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g> کو <xliff:g id="ID_1">%1$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">
@@ -3477,7 +3494,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"صاف کریں اور بدلیں"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"‏ShortcutManager کی شرح محدود بندی ری سیٹ کریں"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"‏ShortcutManager کی شرح محدود بندی ری سیٹ ہو گئی"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"قفل اسکرین کی اطلاعات کنٹرول کریں"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"مقفل اسکرین پر معلومات کنٹرول کریں"</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="8483187649355540109">"سپورٹ اور تجاویز"</string>
@@ -3485,7 +3502,7 @@
     <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="2456198532288640046">"دیگر آلات کو مرئی نہیں"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"آف"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> سے منسلک کردہ"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"متعدد آلات سے منسلک کردہ"</string>
     <string name="demo_mode" msgid="2798762752209330277">"‏سسٹم UI ڈیمو موڈ"</string>
@@ -3587,7 +3604,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"فوری ایپس"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"جو ایپس انسٹال نہیں ہیں، ان میں بھی لنکس کھولیں"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"فوری ایپس"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"فوری ایپس کا اکاؤنٹ"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"فوری ایپس کی ترجیحات"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"انسٹال کردہ ایپس"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"آپ کی اسٹوریج کا نظم اب اسٹوریج مینیجر کی جانب سے کیا جا رہا ہے"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> کے لیے اکاؤنٹس"</string>
@@ -3634,7 +3651,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"‏ہمیشہ آن VPN آپ کی ذاتی پروفائل میں آن ہو گيا"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"‏ہمیشہ آن VPN آپ کی دفتری پروفائل میں آن ہو گيا"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"‏عالمی HTTP پراکسی سیٹ ہے"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"بھروسہ مند اسناد"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"بھروسہ مند اسناد"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"آپ کے ذاتی پروفائل میں بھروسہ مند اسناد"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"آپ کے دفتری پروفائل میں بھروسہ مند اسناد"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">‏کم از کم <xliff:g id="COUNT_1">%d</xliff:g> CA سرٹیفکیٹس</item>
       <item quantity="one">‏کم از کم <xliff:g id="COUNT_0">%d</xliff:g> CA سرٹیفکیٹ</item>
@@ -3697,7 +3716,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"کیرئیر فراہمی معلومات"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ٹرگر کیرئیر فراہمی"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"نیا اور دلچسپ کیا ہے؟"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"سرفہرست 5 خصوصیات دیکھیں"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"اپنے نئے فون کا ایک ٹؤر لیں"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"اپنے نئے ٹیبلیٹ کا ایک ٹؤر لیں"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"اپنے نئے آلے کا ایک ٹؤر لیں"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"یہ خصوصیت اس آلہ میں دستیاب نہیں ہے"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"‏IMS رجسٹریشن کی صورتحال"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"رجسٹر شدہ"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"رجسٹر نہیں ہے"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 5dd0805..cb13e4e 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s xabarlaringizni ochmoqchi. %2$s‘ga ruxsat berilsinmi?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM karta ma’lumotlariga kirish so‘rovi"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"“<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>” qurilmasi SIM karta ma’lumotlarini ko‘rmoqchi. SIM karta ma’lumotlarini ko‘rishga ruxsat bersangiz, qurilmangizdagi ulanishlar vaqtincha o‘chib qoladi. “<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>” qurilmasiga ruxsat berish."</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Boshqa qurilmalarga “<xliff:g id="DEVICE_NAME">^1</xliff:g>” sifatida ko‘rinadi"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Boshqa qurilmalarga “<xliff:g id="DEVICE_NAME">^1</xliff:g>” sifatida ko‘rinadi"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Qurilmalaringiz"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Yangi qurilmani ulash"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Sana va vaqt"</string>
@@ -372,6 +372,9 @@
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Davom etish"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Tashlab ketish"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Keyingisi"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Barmoq izi sozlanmasinmi?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Barmoq izini sozlash bir yoki ikki daqiqa vaqt oladi. Ularni keyinchalik qurilma sozlamalari orqali kiritishingiz mumkin."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Ekran qulfi sozlanmasinmi?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Qurilmani himoyalash funksiyalari yoqilmaydi. Agar planshetingiz yo‘qolsa, o‘g‘irlansa yoki asliga qaytarilsa, siz boshqalarning undan foydalanishiga to‘sqinlik qila olmaysiz."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Qurilmani himoyalash funksiyasi yoqilmaydi. Agar qurilmangiz yo‘qolib qolsa, o‘g‘irlansa yoki asliga qaytarilsa, siz boshqalarning undan foydalanishiga to‘sqinlik qila olmaysiz."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Qurilmani himoyalash funksiyasi yoqilmaydi. Agar telefoningiz yo‘qolib qolsa, o‘g‘irlansa yoki asliga qaytarilsa, siz boshqalarning undan foydalanishiga to‘sqinlik qila olmaysiz."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Barmoq izlari maksimal miqdorda qo‘shildi"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Boshqa barmoq izini qo‘shib bo‘lmaydi"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Barmoq izlari olib tashlansinmi?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"“<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>” olib tashlansinmi?"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Bu barmoq izi o‘chirib tashlansinmi?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Telefoningizni qulfdan chiqarish, xaridlarni amalga oshirish yoki ilovalarga kirish uchhun barmoq izingizdan foydalana olmay qolasiz"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Ishchi profilingizni qulfdan chiqarish, xaridlarni amalga oshirish yoki ish uchun ilovalarga kirish uchun barmoq izingizdan foydalana olmay qolasiz"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Ha, olib tashlansin"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Planshetingizni himoyalang"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Qurilmangizni himoyalang"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Telefoningizni himoyalang"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Ekran qulfi uchun muqobil usulni ham tanlang."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Ekran qulfi uchun muqobil usulni ham tanlang."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Qurilmani himoyalash funksiyalarini faollashtirish orqali boshqalarning ushbu planshetdan sizning ruxsatingizsiz foydalanishining oldini oling. Ekran qulfini tanlang."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Qurilmani himoyalash funksiyalarini faollashtirish orqali boshqalarning ushbu qurilmadan sizning ruxsatingizsiz foydalanishining oldini oling. Ekran qulfini tanlang."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Qurilmani himoyalash funksiyalarini faollashtirish orqali boshqalarning ushbu telefondan sizning ruxsatingizsiz foydalanishining oldini oling. Ekran qulfini tanlang."</string>
@@ -497,37 +502,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Qurilma himoyasi olib tashlansinmi?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Profilni himoyalash funksiyasi o‘chirilsinmi?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Qurilmani himoyalash funksiyasi grafik kalitsiz ishlamaydi."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Qurilmani himoyalash funksiyasi grafik kalitsiz ishlamaydi.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Qurilmani himoyalash funksiyasi grafik kalitsiz ishlamaydi.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Tizimga saqlangan barmoq izingiz ham ushbu qurilmadan o‘chirib tashlanadi va siz uning yordamida telefoningizni qulfdan chiqarish, xaridlarni amalga oshirish yoki ilovalardagi hisoblaringizga kirish imkoniyatidan mahrum bo‘lasiz."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Qurilmani himoyalash funksiyasi PIN-kodsiz ishlamaydi."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Qurilmani himoyalash funksiyalari PIN-kodsiz ishlamaydi.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Qurilmani himoyalash funksiyalari PIN-kodsiz ishlamaydi.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Tizimga saqlangan barmoq izingiz ham ushbu qurilmadan o‘chirib tashlanadi va siz uning yordamida telefoningizni qulfdan chiqarish, xaridlarni amalga oshirish yoki ilovalardagi hisoblaringizga kirish imkoniyatidan mahrum bo‘lasiz."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Qurilmani himoyalash funksiyasi parolsiz ishlamaydi."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Qurilmani himoyalash funksiyasi parolsiz ishlamaydi.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Qurilmani himoyalash funksiyasi parolsiz ishlamaydi.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Tizimga saqlangan barmoq izingiz ham ushbu qurilmadan o‘chirib tashlanadi va siz uning yordamida telefoningizni qulfdan chiqarish, xaridlarni amalga oshirish yoki ilovalardagi hisoblaringizga kirish imkoniyatidan mahrum bo‘lasiz."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Qurilmani himoyalash funksiyasi ekran qulfisiz ishlamaydi."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Qurilmani himoyalash funksiyalari ekran qulfisiz ishlamaydi.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Qurilmani himoyalash funksiyalari ekran qulfisiz ishlamaydi.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Tizimga saqlangan barmoq izingiz ham ushbu qurilmadan o‘chirib tashlanadi va siz uning yordamida telefoningizni qulfdan chiqarish, xaridlarni amalga oshirish yoki ilovalardagi hisoblaringizga kirish imkoniyatidan mahrum bo‘lasiz."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Profilni himoyalash funksiyasi grafik kalitsiz ishlamaydi."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Profilni himoyalash funksiyasi grafik kalitsiz ishlamaydi.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Profilni himoyalash funksiyasi grafik kalitsiz ishlamaydi.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Tizimga saqlangan barmoq izingiz ham ushbu profildan o‘chirib tashlanadi va siz uning yordamida profilingizni qulfdan chiqarish, xaridlarni amalga oshirish yoki ilovalardagi hisoblaringizga kirish imkoniyatidan mahrum bo‘lasiz.\""</string>
+</xliff:g>Tizimga saqlangan barmoq izingiz ham ushbu profildan o‘chirib tashlanadi va siz uning yordamida profilingizni qulfdan chiqarish, xaridlarni amalga oshirish yoki ilovalardagi hisoblaringizga kirish imkoniyatidan mahrum bo‘lasiz."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Profilni himoyalash funksiyasi PIN kodsiz ishlamaydi."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Profilni himoyalash funksiyalari PIN kodsiz ishlamaydi.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Profilni himoyalash funksiyalari PIN kodsiz ishlamaydi.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Tizimga saqlangan barmoq izingiz ham ushbu profildan o‘chirib tashlanadi va siz uning yordamida profilingizni qulfdan chiqarish, xaridlarni amalga oshirish yoki ilovalardagi hisoblaringizga kirish imkoniyatidan mahrum bo‘lasiz.\""</string>
+</xliff:g>Tizimga saqlangan barmoq izingiz ham ushbu profildan o‘chirib tashlanadi va siz uning yordamida profilingizni qulfdan chiqarish, xaridlarni amalga oshirish yoki ilovalardagi hisoblaringizga kirish imkoniyatidan mahrum bo‘lasiz."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Profilni himoyalash funksiyasi parolsiz ishlamaydi."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Profilni himoyalash funksiyasi parolsiz ishlamaydi.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Profilni himoyalash funksiyasi parolsiz ishlamaydi.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Tizimga saqlangan barmoq izingiz ham ushbu profildan o‘chirib tashlanadi va siz uning yordamida profilingizni qulfdan chiqarish, xaridlarni amalga oshirish yoki ilovalardagi hisoblaringizga kirish imkoniyatidan mahrum bo‘lasiz.\""</string>
+</xliff:g>Tizimga saqlangan barmoq izingiz ham ushbu profildan o‘chirib tashlanadi va siz uning yordamida profilingizni qulfdan chiqarish, xaridlarni amalga oshirish yoki ilovalardagi hisoblaringizga kirish imkoniyatidan mahrum bo‘lasiz."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Profilni himoyalash funksiyasi ekran qulfisiz ishlamaydi."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Profilni himoyalash funksiyalari ekran qulfisiz ishlamaydi.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Profilni himoyalash funksiyalari ekran qulfisiz ishlamaydi.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Tizimga saqlangan barmoq izingiz ham ushbu profildan o‘chirib tashlanadi va siz uning yordamida profilingizni qulfdan chiqarish, xaridlarni amalga oshirish yoki ilovalardagi hisoblaringizga kirish imkoniyatidan mahrum bo‘lasiz.\""</string>
+</xliff:g>Tizimga saqlangan barmoq izingiz ham ushbu profildan o‘chirib tashlanadi va siz uning yordamida profilingizni qulfdan chiqarish, xaridlarni amalga oshirish yoki ilovalardagi hisoblaringizga kirish imkoniyatidan mahrum bo‘lasiz."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Ha, olib tashlansin"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Grafik kalitni o‘zgartirish"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Qulfdan ochish PIN kodini o‘zgartirish"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Oshib boruvchi, kamayib boruvchi yoki qaytarilgan ketma-ket raqamlarga ruxsat berilmaydi"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Bekor qilish"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Tozalash"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Bekor qilish"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Keyingisi"</string>
     <string name="lock_setup" msgid="3355847066343753943">"O‘rnatildi."</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS mavjud"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS mavjud)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Tarmoqqa ulanish uchun parolni kiriting"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Aloqa operatorining Wi‑Fi tarmog‘i"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> orqali ulanish"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Joylashuv aniqligini yana ham yaxshilash va boshqa maqsadlar uchun, Wi-Fi o‘chirilgan bo‘lsada <xliff:g id="APP_NAME">%1$s</xliff:g> tarmoqlarni qidirish vazifasini yoqmoqchi.\n\nBu ruxsat tarmoqlarni qidirishni istagan barcha ilovalarga berilsinmi?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Uni o‘chirish uchun menyudan “Qo‘shimcha” bandiga o‘ting."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Ruxsat berish"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Ulanish"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Tarmoqqa ulanmadi"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"O‘chirish"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"O‘zgartirish"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Tarmoqni unutmadi"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Saqlash"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Tarmoqni saqlamadi"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Qo‘shimcha funksiyalar"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-manzil"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP manzil"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Tarmoqqa oid ma’lumot"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Quyi tarmoq niqobi"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 manzillar"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Taklif bekor qilinsinmi?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g> bilan ulanishga sizga yuborilgan taklifni bekor qilmoqchimisiz?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Bu guruh unitilsinmi?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Wi‑Fi hotspot"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi hotspot"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Internet yoki kontent boshqa qurilmalarga ulashilmayapti"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Bu planshet internet aloqasi hotspot orqali tarqatilmoqda"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Bu telefon internet aloqasi hotspot orqali tarqatilmoqda"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Ilova kontent ulashmoqda. Internet tarqatish uchun hotspotni o‘chirib, keyin qayta yoqing"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi nomi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Hotspot nomi"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> yoqilmoqda…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Boshqa qurilmalar <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> tarmog‘iga ulanishi mumkin"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi paroli"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Hotspot paroli"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Wi-Fi chastotalari diapazoni"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Boshqa qurilmalaringiz uchun Wi-Fi tarmoq yaratish uchun hotspotdan foydalaning. Hotspot mobil internetingizni tarqatadi. Qo‘shimcha mobil internet uchun to‘lovlar olinishi mumkin."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Ilovalar yaqin-atrofdagi qurilmalarga kontent ulashish uchun hotspot yarata oladi."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Wi-Fi orqali favqulodda chaqiruvni amalga oshirganingizda, favqulodda xizmatlar sizning joylashuvingiz sifatida foydalanadigan manzil"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekran"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Tovush"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Ovoz balandligi"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Qidiruv"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Qidiruv sozlamalari va tarix boshqaruvi"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Hech narsa topilmadi"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Jurnalni tozalash"</string>
     <string name="display_settings" msgid="7965901687241669598">"Ekran"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Ekranning avtomatik burilishi"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Yorqin ranglar"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"APN standart sozlamalari tiklanmoqda."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Sozlamalarni tiklash"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Standart sozlamalar tiklandi."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Asliga qaytarish"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Tarmoq sozlamalarini tiklash"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Asliga qaytarish"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Tarmoq, ilova yoki qurilma sozlamalarini asliga qaytarishingiz mumkin"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Wi-Fi, mobil internet va Bluetooth parametrlarini tiklash"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Bu barcha tarmoq sozlamalarini, jumladan, mazkur sozlamalarni asliga qaytaradi:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobil internet"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Sozlamalarni tiklash"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Barcha tarmoq sozlamalari qayta tiklansinmi? Bu amalni ortga qaytarib bo‘lmaydi!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Asliga qaytarilsinmi?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Bu foydalanuvchi tarmoq sozlamalarini tiklay olmaydi"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Tarmoq sozlamalari qayta tiklandi"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Zavod sozlamalarini tiklash"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> ta hisob asliga qaytariladi</item>
-      <item quantity="one">1 ta hisob asliga qaytariladi</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Ichki xotira va barcha ma’lumotlar tozalanadi"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Barcha ma’lumotlarni o‘chirish (zavod sozlamalarini tiklash)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Planshetning "<b>"ichki xotirasidagi"</b>" barcha ma’lumotlar o‘chib ketadi, jumladan:\n\n"<li>" Google hisobingiz"</li>\n<li>"Tizim va ilovalarning ma’lumotlari/sozlamalari"</li>\n<li>"Yuklab olingan ilovalar"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Telefonning "<b>"ichki xotirasidagi"</b>" barcha ma’lumotlar o‘chib ketadi, jumladan:\n\n"<li>" Google hisobingiz"</li>\n<li>"Tizim va ilovalarning ma’lumotlari/sozlamalari"</li>\n<li>"Yuklab olingan ilovalar"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Siz hozir tizimga quyidagi hisoblardan kirgansiz:\n"</string>
@@ -1390,9 +1396,9 @@
     <string name="network_settings_title" msgid="2876509814832830757">"Mobil tarmoq"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Uyali tarmoq paketlari"</string>
     <string name="sms_application_title" msgid="4903928270533250448">"SMS ilovasi"</string>
-    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS ilovasi o‘zgartirilsinmi?"</string>
-    <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"SMS ilovasi sifatida <xliff:g id="NEW_APP">%1$s</xliff:g>dan <xliff:g id="CURRENT_APP">%2$s</xliff:g> o‘rniga foydalanilsinmi?"</string>
-    <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"<xliff:g id="NEW_APP">%s</xliff:g>dan SMS ilovasi sifatida foydalanilsinmi?"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS ilovasi almashtirilsinmi?"</string>
+    <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"SMS xabarlar uchun <xliff:g id="CURRENT_APP">%2$s</xliff:g> emas, <xliff:g id="NEW_APP">%1$s</xliff:g> ishlatilsinmi?"</string>
+    <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"SMS xabarlar uchun <xliff:g id="NEW_APP">%s</xliff:g> ishlatilsinmi?"</string>
     <string name="network_scorer_picker_title" msgid="6383879578279046456">"Tarmoqlar reytingi muallifi"</string>
     <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"Hech biri"</string>
     <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"Wi‑Fi yordamchisi o‘zgartirilsinmi?"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Xavfsizlik qoidalari"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Sizda internet ulanish yo‘q. Bu ma‘lumotni ko‘rish uchun, internetga ulangan kompyuterda %s manziliga kiring."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Yuklanmoqda…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Parol tanlang"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Ekran qulfini sozlang"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Xavfsizlik uchun parol o‘rnating"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Barmoq izidan foydalanish uchun parol o‘rnating"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Grafik kalit yarating"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Barmoq izidan foydalanish uchun grafik kalit o‘rnating"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PIN kod kiriting"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Xavfsizlik uchun PIN kod o‘rnating"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Barmoq izidan foydalanish uchun PIN kod o‘rnating"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Parolni tasdiqlang"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Parolni qayta kiriting"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Grafik kalitni tasdiqlang"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PIN kodni kiriting"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"PIN kodni qayta kiriting"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Parol mos kelmadi"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-kod mos kelmadi"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Qulfni ochish usuli"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Davom etish uchun ishchi profilingiz grafik kalitini kiriting"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Davom etish uchun ishchi profilingiz PIN kodini kiriting"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Davom etish uchun ishchi profilingiz parolini kiriting"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Davom etish uchun grafik kalitni chizing. Qurilma o‘chirib yoqilgandan so‘ng talab qilinadi."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Davom etish uchun qurilmangiz PIN kodini kiriting. Qurilma o‘chirib yoqilgandan so‘ng talab qilinadi."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Davom etish uchun qurilmangiz parolini kiriting. Qurilma o‘chirib yoqilgandan so‘ng talab qilinadi."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Davom etish uchun ishchi profilingiz grafik kalitini kiriting. Qurilma o‘chirib yoqilgandan so‘ng talab qilinadi."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Davom etish uchun ishchi profilingiz PIN kodini kiriting. Qurilma o‘chirib yoqilgandan so‘ng talab qilinadi."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Davom etish uchun ishchi profilingiz parolini kiriting. Qurilma o‘chirib yoqilgandan so‘ng talab qilinadi."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Grafik kalitni kiriting"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Qurilma PIN kodini kiriting"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Qurilma parolini kiriting"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Ishchi profil grafik kalitini kiriting"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Ishchi profil PIN kodini kiriting"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Ishchi profil parolini kiriting"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Telefoningiz zavod sozlamalariga qaytarildi. Bu telefondan foydalanish uchun avvalgi grafik kalitni kiriting."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Telefoningiz zavod sozlamalariga qaytarildi. Bu telefondan foydalanish uchun avvalgi PIN kodni kiriting."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Telefoningiz zavod sozlamalariga qaytarildi. Bu telefondan foydalanish uchun avvalgi parolni kiriting."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Grafik kalitni tasdiqlash"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"PIN kodni tasdiqlash"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Parolni tasdiqlash"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN-kod noto‘g‘ri"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Parol noto‘g‘ri"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Grafik kalit xato"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vidjet yaratib unga kirishga ruxsat berilsinmi?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Vidjet yaratilgandan so‘ng, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> u ko‘rsatadigan barcha ma‘lumotga kira oladi."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>ga Vidjetlar yaratib, ularning ma‘lumotlariga kirishga har doim ruxsab berilsin"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> kun <xliff:g id="HOURS">%2$d</xliff:g> soat <xliff:g id="MINUTES">%3$d</xliff:g> d <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> soat <xliff:g id="MINUTES">%2$d</xliff:g> d <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> d <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> kun <xliff:g id="HOURS">%2$d</xliff:g> soat <xliff:g id="MINUTES">%3$d</xliff:g> d"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> soat <xliff:g id="MINUTES">%2$d</xliff:g> d"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> d"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Sarf statistikasi"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Sarf statistikasi"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Saralash:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Ekrandan o‘qish vositalari, displey, o‘zaro aloqa boshqaruv elementlari"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Maxsus imkoniyatlar"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Qurilmangizdan qulay foydalanish uchun maxsus imkoniyatlardan foydalaning. Bu parametrlarni keyinroq sozlamalar orqali o‘zgartirish mumkin."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Shrift o‘lchamini kattalashtirish"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Shrift o‘lchamini o‘zgartirish"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Ekrandan o‘qish vositalari"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio va ekrandagi matn"</string>
     <string name="display_category_title" msgid="685461049938269166">"Ekran"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Kattalashtirish"</b>" uchun ekranga bitta barmoq bilan 3 marta bosing.\n"<ul><li>"Siljitish uchun ikkita barmog‘ingiz bilan suring"</li>\n<li>"Masshtabini o‘zgartirish uchun ekran ustida ikki barmog‘ingizni jipslashtiring"</li></ul>\n\n<b>"Vaqtinchalik kattalashtirish"</b>" uchun ekran ustida barmog‘ingizni 3 marta tez-tez bosib, oxirgisini bosib turing.\n"<ul><li>"Ekran bo‘ylab harakatlanish uchun suring"</li>\n<li>"O‘z holatiga qaytarish uchun barmoqni qo‘yib yuboring"</li></ul>\n\n"Klaviatura yoki navigatsiya paneli orqali kattalashtirib bo‘lmaydi."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Agar kattalashtirish yoqilsa, ekranning pastidagi Maxsus imkoniyatlar tugmasi orqali tezda kattalashtirish mumkin.\n\n"<b>"Kattalashtirish"</b>" uchun Maxsus imkoniyatlar tugmasini bosib, ekranning istalgan joyini bosing.\n"<ul><li>"Siljitish uchun bir nechta barmog‘ingiz bilan suring"</li>\n<li>"Masshtabini o‘zgartirish uchun bir nechta barmog‘ingizni jipslashtiring"</li></ul>\n\n<b>"Vaqtinchalik kattalashtirish uchun"</b>" Maxsus imkoniyatlar tugmasini bosib, ekranning istalga joyini bosib turing.\n"<ul><li>"Ekran bo‘ylab harakatlanish uchun suring"</li>\n<li>"O‘z holatiga qaytarish uchun barmoqni qo‘yib yuboring"</li></ul>\n\n"Klaviatura yoki navigatsiya paneli orqali kattalashtirib bo‘lmaydi."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Maxsus imkoniyatlar tugmasi <xliff:g id="SERVICE">%1$s</xliff:g> xizmatiga sozlangan. Kattalashtirish uchun Maxsus imkoniyatlar tugmasini bosib turib, keyin kattalashtirishni tanlang."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Tezkor ishga tushirish"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Tovush balandligi tugmasi"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Xizmatni tezkor ishga tushirish"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Qulflangan ekrandan ruxsat berish"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Agar tezkor tugmalar yoniq bo‘lsa, maxsus imkoniyatlar funksiyasini ishga tushirish uchun ikkala ovoz balandligini boshqarish tugmasini 3 soniya bosib turing."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Agar tezkor tugmalar yoniq bo‘lsa, maxsus imkoniyatlar funksiyasini ishga tushirish uchun ikkala ovoz balandligini boshqarish tugmasini 3 soniya bosib turing."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Yuqori kontrastli matn"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Ekranda kattalashtirish xususiyatini avtomatik ravishda yangilash"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Bir ilovadan ikkinchisiga o‘tishda ekranda kattalashtirish xususiyatini yangilash"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Unumdorligiga ta’sir qilishi mumkin"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Kursor harakatlanishdan to‘xtagandan keyin bosing"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Bosishdan oldin biroz kuting"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"YONIQ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"O‘CHIQ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Tezkor sozlamalarda ko‘rsatish"</string>
@@ -2370,6 +2375,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Tanlandi: <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="TOTAL">%2$s</xliff:g>dan <xliff:g id="NUMBER">%1$s</xliff:g>tasi"</string>
     <string name="select_all" msgid="1562774643280376715">"Hammasini belgilash"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Tarif rejalarini boshqarish"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Trafik sarfi"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Ilova sarflagan trafik"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Aloqa operatorining hisob-kitobi qurilmanikidan farq qilishi mumkin."</string>
@@ -2455,6 +2461,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobil tarmoqlar"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Pulli Wi-Fi tarmoqlari"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Pulli tarmoqlarni belgilash uchun Wi-Fi aloqasini yoqing."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Avtomatik"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Pulli"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Bepul"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Aloqa operatorining hisob-kitobi qurilmanikidan farq qilishi mumkin."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Favqulodda chaqiruv"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Chaqiruvga qaytish"</string>
@@ -2672,7 +2681,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Qo‘ng‘iroqlar boshqaruvchisi"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Favqulodda tarqatma xabarlar"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Favqulodda ogohlantirishlar"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Tarmoq operatorlari"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Ulanish nuqtalari"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Kuchaytirilgan 4G LTE rejimi"</string>
@@ -2741,6 +2750,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Quyidagi uchun afzal ko‘rilgan SIM karta"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Har safar so‘ralsin"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Tanlash zarur"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"SIM kartani tanlang"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Sozlamalar"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">%d ta yashirin elementni ko‘rsatish</item>
@@ -2892,18 +2902,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Ilova bildirishnomalari"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Bildirishnomalar turkumi"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Muhimligi"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Ilovaning ixtiyorida qoldiring"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Ovozga ruxsat berish"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Bildirishnomalar hech qachon ko‘rsatilmasin"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Bildirishnomalarsiz"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Ovozsiz"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Ovozli"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Ovoz va qalqib chiquvchi oyna"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Ekranga qalqib chiqish"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Past"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"O‘rtacha"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Yuqori"</string>
-    <string name="notification_importance_high_title" msgid="3058778300264746473">"Juda muhim"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Ovozga ruxsat berish"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Qurilma ovozli signal va tebranish bermaydi, bildirishnomalar boshqa ilovalar ustidan ochilmaydi"</string>
+    <string name="notification_importance_high_title" msgid="3058778300264746473">"Shoshilinch"</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Bildirishnomalarga ruxsat berish"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Ilovaga ovozli signal va tebranishni yoqishi hamda ekranga bildirishnomalarni chiqarishiga imkon beradi"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Kamroq muhim"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"O‘rtacha muhim"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Juda muhim"</string>
@@ -2934,7 +2945,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"tasvir ustida tasvir"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Tasvir ustida tasvir"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Tasvir ustida tasvir rejimiga ruxsat berish"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Bu ilova ochiqligida yoki uni qoldirib ketganingizda (masalan, video tomosha qilishni davom ettirish uchun) bu ilova Tasvir ustida tasvir rejimida ishlashiga ruxsat bering. Bu oyna boshqa ishlatilayotgan ilovalar ustida ochiladi."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Bu ilova ochiqligida yoki uni qoldirib ketganingizda (masalan, video tomosha qilishni davom ettirish uchun) bu ilova Tasvir ustida tasvir rejimida ishlashiga ruxsat bering. Bu oyna boshqa ishlatilayotgan ilovalar ustida ochiladi."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Bezovta qilinmasin rejimi"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Hech qaysi ilova “Bezovta qilinmasin” funksiyasiga ruxsat so‘ramagan"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ilovalar yuklanmoqda…"</string>
@@ -3237,6 +3248,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Fayllarni o‘tkazish"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Rasm uzatish (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"MIDI sifatida foydalanish"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"SMS translatsiyasi"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Fonda tekshirish"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Butun fonga ruxsat"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Ekrandagi matndan foydalanish"</string>
@@ -3379,6 +3391,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="night_display_suggestion_title" msgid="6602129097059325291">"Tungi rejim jadvalini sozlash"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Uyqu uchun sariq ekran"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Tungi rejim yoqilgan"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Ekran qizg‘ish tusga kirdi. Bu osonroq uyquga ketishga yordamlashadi."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Tavsiyalar"</string>
@@ -3397,6 +3411,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Salqin displey ranglaridan foydalanish"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Rangni o‘zgartirish uchun ekranni o‘chiring"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telefoniya nazoratiga o‘zgartirish kiritish uchun qurilmani o‘chirib yoqing"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Kamera HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Kamera HAL HDR+ qilib o‘zgartirish uchun qurilmani qayta ishga tushiring"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kameraning lazer sensori"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Avtomatik tizim yangilanishlari"</string>
     <string name="usage" msgid="2977875522080448986">"Trafik sarfi"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobil internet-trafik"</string>
@@ -3422,7 +3439,7 @@
     <string name="data_warning" msgid="209133958008062117">"Ogohlantirishlar"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Trafik cheklovini belgilash"</string>
     <string name="data_limit" msgid="1885406964934590552">"Trafik cheklovi"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> oraliqda <xliff:g id="ID_1">%1$s</xliff:g> sarflandi"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> ishlatilgan (<xliff:g id="ID_2">%2$s</xliff:g>)"</string>
     <string name="configure" msgid="1029654422228677273">"Sozlash"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Foydalanilayotgan boshqa ilovalar"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3491,7 +3508,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"O‘chirib tashlash va o‘girish"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager hisoblagichini qaytadan boshlash"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager hisoblagichi qaytadan boshlandi"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Ekran qulfi bildirishnomalarini boshqaring"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Ekran qulfidagi ma’lumotlarni 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="8483187649355540109">"Yordam va maslahatlar"</string>
@@ -3499,7 +3516,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"O‘rnatilgan ilovalardan hech biri SMSdan foydalanish uchun ruxsat so‘ramagan."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"SMS uchun sizdan haq olinishi va operatorga qo‘shimcha to‘lov amalga oshirilishi mumkin. Agar ilova uchun ruxsatnoma taqdim etsangiz, o‘sha ilovadan SMS yuborishingiz mumkin bo‘ladi."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Pulli SMS xabarlarga ruxsat"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Boshqa qurilmalarga ko‘rinmaydi"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"O‘chiq"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> qurilmasiga ulangan"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Bir nechta qurilmaga ulangan"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Tizim interfeysi demo rejimi"</string>
@@ -3601,7 +3618,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Darhol ochiladigan ilovalar"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Havolalarni ilovalarda (hatto ular o‘rnatilmagan bo‘lsa ham) ochish"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Darhol ochiladigan ilovalar"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Darhol ochiladigan ilovalar uchun hisob"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Darhol ochiladigan ilovalar sozlamalari"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"O‘rnatilgan ilovalar"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Xotirangiz hozirda xotira boshqaruvi tomonidan boshqarilmoqda"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> uchun hisoblar"</string>
@@ -3648,7 +3665,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Doimiy VPN shaxsiy profilingizda yoqildi"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Doimiy VPN ishchi profilingizda yoqildi"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP proksi-serveri sozlandi"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Ishonchli sertifikatlar"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Ishonchli sertifikatlar"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Shaxsiy profilingizdagi ishonchli sertifikatlar"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Ishchi profilingizdagi ishonchli sertifikatlar"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Kamida <xliff:g id="COUNT_1">%d</xliff:g> ta CA sertifikati</item>
       <item quantity="one">Kamida <xliff:g id="COUNT_0">%d</xliff:g> ta CA sertifikati</item>
@@ -3711,7 +3730,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operator haqida"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Operator ta’minotini yoqish/o‘chirish"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Nima yangi va qiziqarli narsalar bor?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Eng sara 5 ta xususiyati bilan tanishing"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Yangi telefoningiz bilan tanishib chiqing"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Yangi planshetingiz bilan tanishib chiqing"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Yangi qurilmangiz bilan tanishib chiqing"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Bu funksiya ushbu qurilmada ishlamaydi"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS registratsiyasi holati"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Registratsiya qilingan"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Registratsiya qilinmagan"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 9b24f2c..68d966a 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s muốn truy cập tin nhắn của bạn. Bạn có muốn cấp quyền truy cập cho %2$s không?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Yêu cầu truy cập SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> muốn truy cập vào thẻ SIM của bạn. Cấp quyền truy cập vào thẻ SIM sẽ vô hiệu hóa khả năng kết nối dữ liệu trên thiết bị của bạn trong suốt thời gian kết nối. Cấp quyền truy cập vào <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Hiển thị là <xliff:g id="DEVICE_NAME">^1</xliff:g> với các thiết bị khác"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Hiển thị là <xliff:g id="DEVICE_NAME">^1</xliff:g> với các thiết bị khác"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Thiết bị của bạn"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Ghép nối thiết bị mới"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Ngày và giờ"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Tiếp theo"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Bạn muốn bỏ qua vân tay?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Bạn chỉ mất một hoặc hai phút để thiết lập vân tay. Nếu bỏ qua bước này, bạn có thể thêm vân tay vào lúc khác trong cài đặt."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Bạn muốn bỏ qua khóa màn hình?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Các tính năng bảo vệ thiết bị sẽ không được bật. Bạn sẽ không thể ngăn người khác sử dụng máy tính bảng này nếu máy tính bảng bị mất, bị đánh cắp hoặc bị đặt lại."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Các tính năng bảo vệ thiết bị sẽ không được bật. Bạn sẽ không thể ngăn người khác sử dụng thiết bị này nếu thiết bị bị mất, bị đánh cắp hoặc bị đặt lại."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Các tính năng bảo vệ thiết bị sẽ không được bật. Bạn sẽ không thể ngăn người khác sử dụng điện thoại này nếu điện thoại bị mất, bị đánh cắp hoặc bị đặt lại."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Bạn đã thêm số vân tay tối đa"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Không thể thêm dấu vân tay khác"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Xóa tất cả dấu vân tay?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Xóa \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Bạn có muốn xóa vân tay này không?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Bạn sẽ không thể sử dụng vân tay để mở khóa điện thoại của mình, ủy quyền mua hàng hoặc đăng nhập vào ứng dụng bằng vân tay đó"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Bạn sẽ không thể sử dụng vân tay của mình để mở khóa hồ sơ công việc, ủy quyền mua hàng hay đăng nhập vào ứng dụng công việc"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Có, xóa"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Bảo vệ máy tính bảng của bạn"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Bảo vệ thiết bị của bạn"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Bảo vệ điện thoại của bạn"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Để tăng cường bảo mật, hãy thiết lập khóa màn hình dự phòng."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Để tăng cường bảo mật, hãy thiết lập khóa màn hình dự phòng."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Ngăn người khác sử dụng máy tính bảng này mà không có sự cho phép của bạn bằng cách kích hoạt tính năng bảo vệ thiết bị. Chọn khóa màn hình bạn muốn sử dụng."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Ngăn người khác sử dụng thiết bị này mà không có sự cho phép của bạn bằng cách kích hoạt tính năng bảo vệ thiết bị. Chọn khóa màn hình bạn muốn sử dụng."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Ngăn người khác sử dụng điện thoại này mà không có sự cho phép của bạn bằng cách kích hoạt tính năng bảo vệ thiết bị. Chọn khóa màn hình bạn muốn sử dụng."</string>
@@ -497,37 +502,37 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Xóa tính năng bảo vệ thiết bị?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Xóa tính năng bảo vệ hồ sơ?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Các tính năng bảo vệ thiết bị sẽ không hoạt động mà không có mẫu của bạn."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Các tính năng bảo vệ thiết bị sẽ không hoạt động mà không có mẫu của bạn.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Các tính năng bảo vệ thiết bị sẽ không hoạt động nếu không có hình mở khóa của bạn.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Dấu vân tay đã lưu của bạn cũng sẽ bị xóa khỏi thiết bị này và bạn sẽ không thể mở khóa điện thoại, ủy quyền mua hay đăng nhập vào các ứng dụng bằng dấu vân tay\"."</string>
+</xliff:g>Vân tay đã lưu của bạn cũng sẽ bị xóa khỏi thiết bị này và bạn sẽ không thể mở khóa điện thoại, ủy quyền mua hàng hoặc đăng nhập vào các ứng dụng bằng vân tay đó."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Các tính năng bảo vệ thiết bị sẽ không hoạt động mà không có mã PIN của bạn."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Các tính năng bảo vệ thiết bị sẽ không hoạt động mà không có mã PIN của bạn.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Các tính năng bảo vệ thiết bị sẽ không hoạt động nếu không có mã PIN của bạn.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Dấu vân tay đã lưu của bạn cũng sẽ bị xóa khỏi thiết bị này và bạn sẽ không thể mở khóa điện thoại, ủy quyền mua hoặc đăng nhập vào các ứng dụng bằng dấu vân tay\"."</string>
+</xliff:g>Vân tay đã lưu của bạn cũng sẽ bị xóa khỏi thiết bị này và bạn sẽ không thể mở khóa điện thoại, ủy quyền mua hàng hoặc đăng nhập vào các ứng dụng bằng vân tay đó."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Các tính năng bảo vệ thiết bị sẽ không hoạt động mà không có mật khẩu của bạn."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Các tính năng bảo vệ thiết bị sẽ không hoạt động mà không có mật khẩu của bạn.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Tính năng bảo vệ thiết bị sẽ không hoạt động nếu không có mật khẩu của bạn.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Dấu vân tay đã lưu của bạn cũng sẽ bị xóa khỏi thiết bị này và bạn sẽ không thể mở khóa điện thoại, ủy quyền mua hay đăng nhập vào các ứng dụng bằng dấu vân tay.\""</string>
+</xliff:g>Vân tay đã lưu của bạn cũng sẽ bị xóa khỏi thiết bị này và bạn sẽ không thể mở khóa điện thoại, ủy quyền mua hàng hay đăng nhập vào ứng dụng bằng vân tay đó."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Các tính năng bảo vệ thiết bị sẽ không hoạt động mà không có khóa màn hình của bạn."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Các tính năng bảo vệ thiết bị sẽ không hoạt động mà không có khóa màn hình của bạn.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Các tính năng bảo vệ thiết bị sẽ không hoạt động nếu không có khóa màn hình của bạn.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Dấu vân tay đã lưu của bạn cũng sẽ bị xóa khỏi thiết bị này và bạn sẽ không thể mở khóa điện thoại, ủy quyền mua hoặc đăng nhập vào các ứng dụng bằng dấu vân tay\"."</string>
+</xliff:g>Vân tay đã lưu của bạn cũng sẽ bị xóa khỏi thiết bị này và bạn sẽ không thể mở khóa điện thoại, ủy quyền mua hàng hoặc đăng nhập vào các ứng dụng bằng vân tay đó."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Các tính năng bảo vệ hồ sơ sẽ không hoạt động nếu không có hình mở khóa của bạn."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Các tính năng bảo vệ hồ sơ sẽ không hoạt động nếu không có hình mở khóa của bạn.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Các tính năng bảo vệ hồ sơ sẽ không hoạt động nếu không có hình mở khóa của bạn.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Vân tay đã lưu của bạn cũng sẽ bị xóa khỏi hồ sơ này và bạn sẽ không thể mở khóa hồ sơ của mình, ủy quyền mua hàng hoặc đăng nhập vào các ứng dụng bằng vân tay đó\"."</string>
+</xliff:g>Vân tay đã lưu của bạn cũng sẽ bị xóa khỏi hồ sơ này và bạn sẽ không thể mở khóa hồ sơ, ủy quyền mua hàng hoặc đăng nhập vào các ứng dụng bằng vân tay đó."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Các tính năng bảo vệ hồ sơ sẽ không hoạt động nếu không có mã PIN của bạn."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Các tính năng bảo vệ hồ sơ sẽ không hoạt động nếu không có mã PIN của bạn.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Các tính năng bảo vệ hồ sơ sẽ không hoạt động nếu không có mã PIN của bạn.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Vân tay đã lưu của bạn cũng sẽ bị xóa khỏi hồ sơ này và bạn sẽ không thể mở khóa hồ sơ của mình, ủy quyền mua hàng hoặc đăng nhập vào các ứng dụng bằng vân tay đó\"."</string>
+</xliff:g>Vân tay đã lưu của bạn cũng sẽ bị xóa khỏi hồ sơ này và bạn sẽ không thể mở khóa hồ sơ, ủy quyền mua hàng hoặc đăng nhập vào các ứng dụng bằng vân tay đó."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Các tính năng bảo vệ hồ sơ sẽ không hoạt động nếu không có mật khẩu của bạn."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Các tính năng bảo vệ hồ sơ sẽ không hoạt động nếu không có mật khẩu của bạn.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Các tính năng bảo vệ hồ sơ sẽ không hoạt động nếu không có mật khẩu của bạn.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Vân tay đã lưu của bạn cũng sẽ bị xóa khỏi hồ sơ này và bạn sẽ không thể mở khóa hồ sơ của mình, ủy quyền mua hàng hoặc đăng nhập vào các ứng dụng bằng vân tay đó\"."</string>
+</xliff:g>Vân tay đã lưu của bạn cũng sẽ bị xóa khỏi hồ sơ này và bạn sẽ không thể mở khóa hồ sơ, ủy quyền mua hàng hoặc đăng nhập vào ứng dụng bằng vân tay đó."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Các tính năng bảo vệ hồ sơ sẽ không hoạt động nếu không có khóa màn hình của bạn."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Các tính năng bảo vệ hồ sơ sẽ không hoạt động nếu không có khóa màn hình của bạn.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Các tính năng bảo vệ hồ sơ sẽ không hoạt động nếu không có khóa màn hình của bạn.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Vân tay đã lưu của bạn cũng sẽ bị xóa khỏi hồ sơ này và bạn sẽ không thể mở khóa hồ sơ của mình, ủy quyền mua hàng hoặc đăng nhập vào các ứng dụng bằng vân tay đó\"."</string>
+</xliff:g>Vân tay đã lưu của bạn cũng sẽ bị xóa khỏi hồ sơ này và bạn sẽ không thể mở khóa hồ sơ, ủy quyền mua hàng hoặc đăng nhập vào các ứng dụng bằng vân tay đó."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Có, xóa"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Thay đổi hình mở khóa"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Thay đổi mã PIN mở khóa"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Không cho phép thứ tự chữ số tăng dần, giảm dần hoặc lặp lại"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Hủy"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Xóa"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Hủy"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Tiếp theo"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Đã hoàn tất thiết lập."</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Có WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Có WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Nhập mật khẩu mạng của bạn"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Mạng Wi‑Fi của nhà cung cấp dịch vụ"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Kết nối qua <xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Để nâng cao độ chính xác vị trí và phục vụ các mục đích khác, <xliff:g id="APP_NAME">%1$s</xliff:g> muốn bật tính năng quét mạng ngay cả khi Wi-Fi đang tắt.\n\nCho phép cài đặt này đối với tất cả ứng dụng muốn quét?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Để tắt tính năng này, đi tới phần Nâng cao trong trình đơn mục bổ sung."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Cho phép"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Kết nối"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Không thể kết nối với mạng"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Quên"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Sửa đổi"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Không thể bỏ qua mạng"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Lưu"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Không thể lưu mạng"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi‑Fi nâng cao"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Địa chỉ MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Địa chỉ IP"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Thông tin về mạng"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Mặt nạ mạng con"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Địa chỉ IPv6"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Hủy lời mời?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Bạn có muốn hủy lời mời kết nối với <xliff:g id="PEER_NAME">%1$s</xliff:g> không?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Bỏ qua nhóm này?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Điểm phát sóng Wi‑Fi di động"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Điểm phát sóng Wi‑Fi"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Không chia sẻ Internet hoặc nội dung với các thiết bị khác"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Chia sẻ kết nối Internet của máy tính bảng này qua điểm phát sóng"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Chia sẻ kết nối Internet của điện thoại này qua điểm phát sóng"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Ứng dụng đang chia sẻ nội dung. Để chia sẻ kết nối Internet, hãy tắt điểm phát sóng, rồi bật lại"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Tên Wi-Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Tên điểm phát sóng"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Đang bật <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Các thiết bị khác có thể kết nối với <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Mật khẩu Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Mật khẩu điểm phát sóng"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Băng tần AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Sử dụng điểm phát sóng để tạo mạng Wi-Fi cho các thiết bị khác của bạn. Điểm phát sóng cung cấp kết nối Internet bằng kết nối dữ liệu di động của bạn. Bạn có thể mất thêm phí dữ liệu di động."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Ứng dụng có thể tạo một điểm phát sóng để chia sẻ nội dung với các thiết bị lân cận."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Địa chỉ sẽ đượ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 dịch vụ khẩn cấp qua Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Hiển thị"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Âm thanh"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Âm lượng"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Tìm kiếm"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Quản lý cài đặt và lịch sử tìm kiếm"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Không có kết quả nào"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Xóa lịch sử"</string>
     <string name="display_settings" msgid="7965901687241669598">"Hiển thị"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Tự động xoay màn hình"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Màu sắc rực rỡ"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Đang khôi phục cài đặt APN mặc định."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Đặt lại về mặc định"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Đặt lại cài đặt APN mặc định đã hoàn tất."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Đặt lại"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Đã đặt lại cài đặt mạng"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Tùy chọn đặt lại"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Có thể đặt lại mạng, ứng dụng hoặc thiết bị"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Đặt lại Wi-Fi, di động và Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Thao tác này sẽ đặt lại tất cả cài đặt mạng, bao gồm:\n\n"<li>"Wi‑Fi"</li>\n<li>"Dữ liệu di động"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Đặt lại cài đặt"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Đặt lại tất cả cài đặt mạng? Bạn không thể hoàn tác thao tác này!"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Đặt lại?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Đặt lại mạng không khả dụng cho người dùng này"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Cài đặt mạng đã được đặt lại"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Đặt lại về dữ liệu gốc"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> tài khoản sẽ được đặt lại</item>
-      <item quantity="one">1 tài khoản sẽ được đặt lại</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Bộ nhớ trong và tất cả các dữ liệu sẽ được đặt lại"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Xóa mọi dữ liệu (đặt lại thiết bị)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Tác vụ này sẽ xóa tất cả dữ liệu từ "<b>"bộ nhớ trong"</b>" của máy tính bảng, bao gồm:\n\n"<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu và cài đặt hệ thống và ứng dụng"</li>\n<li>"Ứng dụng đã tải xuống"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Tác vụ này sẽ xóa tất cả dữ liệu từ "<b>"bộ nhớ trong"</b>" của điện thoại, bao gồm:\n\n"<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu và cài đặt hệ thống và ứng dụng"</li>\n<li>"Ứng dụng đã tải xuống"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Bạn hiện đã đăng nhập vào các tài khoản sau đây:\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Thông tin an toàn"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Bạn chưa có kết nối dữ liệu. Để xem thông tin này ngay bây giờ, hãy truy cập %s từ bất kỳ máy tính nào đã kết nối với Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Đang tải…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Chọn mật khẩu của bạn"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Đặt khóa màn hình"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Để bảo mật, hãy đặt mật khẩu"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Để dùng vân tay, đặt mật khẩu"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Chọn hình của bạn"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Để dùng vân tay, đặt hình m.khóa"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Chọn mã PIN của bạn"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Để bảo mật, hãy đặt mã PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Để dùng vân tay, đặt mã PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Xác nhận mật khẩu của bạn"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Nhập lại mật khẩu của bạn"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Xác nhận hình của bạn"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Xác nhận mã PIN của bạn"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Nhập lại mã PIN của bạn"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Mật khẩu không khớp"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Mã PIN không khớp"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Chọn phương thức mở khóa"</string>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Sử dụng hình mở khóa công việc của bạn để tiếp tục"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Nhập mã PIN công việc của bạn để tiếp tục"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Nhập mật khẩu công việc của bạn để tiếp tục"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Dùng hình mở khóa thiết bị của bạn để tiếp tục. Đây là điều bắt buộc sau khi thiết bị khởi động lại."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Nhập mã PIN thiết bị của bạn để tiếp tục. Đây là điều bắt buộc sau khi thiết bị khởi động lại."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Nhập mật khẩu thiết bị của bạn để tiếp tục. Đây là điều bắt buộc sau khi thiết bị khởi động lại."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Dùng hình mở khóa công việc để tiếp tục. Đây là điều bắt buộc sau khi thiết bị khởi động lại."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Nhập mã PIN công việc để tiếp tục. Đây là điều bắt buộc sau khi thiết bị khởi động lại."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Nhập mật khẩu công việc để tiếp tục. Đây là điều bắt buộc sau khi thiết bị khởi động lại."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Để tăng cường bảo mật, hãy sử dụng hình mở khóa thiết bị của bạn"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Để tăng cường bảo mật, hãy nhập mã PIN thiết bị của bạn"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Để tăng cường bảo mật, hãy nhập mật khẩu thiết bị của bạn"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Để tăng cường bảo mật, hãy sử dụng hình mở khóa công việc của bạn"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Để tăng cường bảo mật, hãy nhập mã PIN công việc của bạn"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Để tăng cường bảo mật, hãy nhập mật khẩu công việc của bạn"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Điện thoại đã được đặt lại về cài đặt gốc. Để sử dụng điện thoại này, hãy nhập hình mở khóa trước."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Điện thoại đã được đặt lại về cài đặt gốc. Để sử dụng điện thoại này, hãy nhập mã PIN trước đó."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Điện thoại đã được đặt lại về cài đặt gốc. Để sử dụng điện thoại này, hãy nhập mật khẩu trước đó."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Xác minh hình mở khóa"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Xác minh mã PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Xác minh mật khẩu"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Mã PIN sai"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Mật khẩu sai"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Hình sai"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Tạo tiện ích và cho phép truy cập?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Sau khi bạn tạo tiện ích, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> có thể truy cập tất cả dữ liệu mà nó hiển thị."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Luôn cho phép <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> tạo các tiện ích và truy cập dữ liệu của chúng"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> ngày <xliff:g id="HOURS">%2$d</xliff:g> giờ <xliff:g id="MINUTES">%3$d</xliff:g> phút <xliff:g id="SECONDS">%4$d</xliff:g> giây"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> giờ <xliff:g id="MINUTES">%2$d</xliff:g> phút <xliff:g id="SECONDS">%3$d</xliff:g> giây"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> phút <xliff:g id="SECONDS">%2$d</xliff:g> giây"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> giây"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> ngày <xliff:g id="HOURS">%2$d</xliff:g> giờ <xliff:g id="MINUTES">%3$d</xliff:g> phút"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> giờ <xliff:g id="MINUTES">%2$d</xliff:g> phút"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> phút"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Thống kê sử dụng"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Thống kê sử dụng"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sắp xếp theo:"</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Trình đọc màn hình, màn hình, tương tác"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Cài đặt hiển thị"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Bạn có thể tùy chỉnh thiết bị này cho phù hợp với nhu cầu của mình. Bạn có thể thay đổi các tính năng trợ năng này sau trong Cài đặt."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Tăng kích thước phông chữ"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Thay đổi cỡ chữ"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Trình đọc màn hình"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Âm thanh và văn bản trên màn hình"</string>
     <string name="display_category_title" msgid="685461049938269166">"Màn hình"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Để thu phóng"</b>", nhấn nhanh màn hình 3 lần.\n"<ul><li>"Kéo 2 hoặc nhiều ngón tay để cuộn"</li>\n<li>"Chụm 2 hoặc nhiều ngón tay để điều chỉnh mức thu phóng"</li></ul>\n\n<b>"Để thu phóng tạm thời"</b>", nhấn nhanh màn hình 3 lần và giữ ngón tay của bạn vào lần nhấn thứ ba.\n"<ul><li>"Kéo để di chuyển quanh màn hình"</li>\n<li>"Nhấc ngón tay để thu nhỏ"</li></ul>\n\n"Bạn không thể phóng to trên thanh điều hướng."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Khi tính năng phóng đại được bật, sử dụng nút Trợ năng ở cuối màn hình để phóng đại nhanh.\n\n"<b>"Để thu phóng"</b>", nhấn vào nút Trợ năng, sau đó nhấn bất kỳ chỗ nào trên màn hình.\n"<ul><li>"Kéo 2 hoặc nhiều ngón tay để cuộn"</li>\n<li>"Chụm 2 hoặc nhiều ngón tay để điều chỉnh mức thu phóng"</li></ul>\n\n<b>"Để thu phóng tạm thời"</b>", nhấn vào nút Trợ năng, sau đó chạm và giữ bất kỳ chỗ nào trên màn hình.\n"<ul><li>"Kéo để di chuyển quanh màn hình"</li>\n<li>"Nhấc ngón tay để thu nhỏ"</li></ul>\n\n"Bạn không thể phóng to trên bàn phím hoặc thanh điều hướng."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Nút Trợ năng được đặt thành <xliff:g id="SERVICE">%1$s</xliff:g>. Để sử dụng tính năng phóng đại, hãy chạm và giữ nút Trợ năng, sau đó chọn độ phóng đại."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Phím tắt trợ năng"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Phím tắt bằng phím âm lượng"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Dịch vụ phím tắt"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Cho phép từ màn hình khóa"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Khi phím tắt được bật, bạn có thể nhấn cả hai nút âm lượng trong 3 giây để khởi động tính năng trợ năng."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Khi phím tắt đang bật, bạn có thể nhấn vào cả hai phím âm lượng trong 3 giây để bắt đầu tính năng trợ năng."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Văn bản có độ tương phản cao"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Tự động cập nhật phóng đại màn hình"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Cập nhật phóng đại màn hình khi chuyển ứng dụng"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Có thể ảnh hưởng đến hiệu suất"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Nhấp sau khi con trỏ ngừng di chuyển"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Trì hoãn trước khi nhấp"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"BẬT"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"TẮT"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Hiển thị trong Cài đặt nhanh"</string>
@@ -2358,6 +2363,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"đã chọn <xliff:g id="NUMBER">%1$d</xliff:g> trong tổng số <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> trong tổng số <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Chọn tất cả"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Quản lý gói dữ liệu"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Sử dụng dữ liệu"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Dữ liệu ứng dụng"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Cách tính dữ liệu của nhà cung cấp dịch vụ có thể khác với thiết bị của bạn."</string>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mạng di động"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Mạng Wi‑Fi có đo lượng dữ liệu"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Để chọn mạng có đo lượng dữ liệu, hãy bật Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Tự động"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Đo lượng dữ liệu"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Không đo lượng dữ liệu"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Cách tính dữ liệu của nhà cung cấp dịch vụ có thể khác với thiết bị của bạn."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Cuộc gọi khẩn cấp"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Quay lại cuộc gọi"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Trình quản lý cuộc gọi"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Phát sóng trong tình huống khẩn cấp"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Cảnh báo khẩn cấp"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Nhà cung cấp dịch vụ mạng"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Tên điểm truy cập"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Chế độ 4G LTE được tăng cường"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"Thẻ SIM ưu tiên cho"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Hỏi mỗi lần gọi"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Lựa chọn là bắt buộc"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Chọn SIM"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Cài đặt"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">Hiển thị %d mục ẩn</item>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Thông báo ứng dụng"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Loại thông báo"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Mức độ quan trọng"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Để ứng dụng quyết định"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Cho phép âm thanh"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Không bao giờ hiển thị thông báo"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Không làm gián đoạn bằng âm báo hoặc hình ảnh"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Không có âm báo"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Phát âm báo"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Phát âm báo và hiển thị trên màn hình"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"Hiển thị trên màn hình"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Thấp"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Trung bình"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Cao"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Khẩn cấp"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Cho phép âm thanh"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Không phát ra âm thanh, rung hoặc hiển thị các thông báo này khi xem trên màn hình hiện tại."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Cho phép gián đoạn"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Cho phép ứng dụng phát ra âm thanh, rung và/hoặc hiển thị thông báo trên màn hình"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Tầm quan trọng thấp"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Tầm quan trọng trung bình"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Tầm quan trọng cao"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"ảnh trong ảnh"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Ảnh trong ảnh"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Cho phép ảnh trong ảnh"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Cho phép ứng dụng tạo cửa sổ ảnh trong ảnh trong khi ứng dụng đang mở hoặc sau khi bạn rời khỏi ứng dụng đó (ví dụ: để tiếp tục xem video). Cửa sổ này sẽ hiển thị trên các ứng dụng khác mà bạn đang sử dụng."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Cho phép ứng dụng này tạo cửa sổ ảnh trong ảnh khi ứng dụng đang mở hoặc sau khi bạn rời khỏi ứng dụng đó (chẳng hạn như để tiếp tục xem video). Cửa sổ này sẽ hiển thị trên các ứng dụng khác mà bạn đang sử dụng."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Truy cập Không làm phiền"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Không có ứng dụng được cài đặt nào yêu cầu quyền truy cập Không làm phiền"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Đang tải ứng dụng..."</string>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Chuyển tệp"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Chuyển ảnh (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Sử dụng thiết bị làm MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Phản chiếu SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Kiểm tra nền"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Toàn quyền truy cập nền"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Sử dụng văn bản từ màn hình"</string>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"Đặt lịch Đèn đọc sách"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Màn hình màu hổ phách giúp buồn ngủ"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Đèn đọc sách được bật"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Màn hình được phủ màu hổ phách. Điều này có thể giúp bạn dễ ngủ."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Đề xuất"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Sử dụng màu hiển thị lạnh hơn"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Để áp dụng thay đổi màu, hãy tắt màn hình"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Để áp dụng thay đổi với giám sát điện thoại, hãy khởi động lại thiết bị"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Máy ảnh HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Để áp dụng thay đổi Máy ảnh HAL HDR+, hãy khởi động lại thiết bị"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Cảm biến laser của máy ảnh"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Cập nhật hệ thống tự động"</string>
     <string name="usage" msgid="2977875522080448986">"Sử dụng"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Sử dụng dữ liệu di động"</string>
@@ -3410,7 +3427,7 @@
     <string name="data_warning" msgid="209133958008062117">"Cảnh báo dữ liệu"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Đặt giới hạn dữ liệu"</string>
     <string name="data_limit" msgid="1885406964934590552">"Giới hạn dữ liệu"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"Đã sử dụng <xliff:g id="ID_1">%1$s</xliff:g> trong khoảng thời gian từ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"Đã sử dụng <xliff:g id="ID_1">%1$s</xliff:g> từ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Định cấu hình"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Những ứng dụng khác được bao gồm trong mức sử dụng"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Xóa và chuyển đổi"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Đặt lại giới hạn tốc độ trong ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Đã đặt lại 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_title" msgid="387052719462473500">"Kiểm soát thông tin 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="8483187649355540109">"Hỗ trợ và mẹo"</string>
@@ -3487,7 +3504,7 @@
     <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>
     <string name="premium_sms_warning" msgid="9086859595338944882">"SMS cao cấp có thể làm bạn mất tiền và sẽ tính thêm vào hóa đơn của nhà cung cấp dịch vụ của bạn. Nếu bạn bật quyền cho một ứng dụng, bạn sẽ có thể gửi SMS cao cấp bằng ứng dụng đó."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Quyền truy cập SMS cao cấp"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Không hiển thị với các thiết bị khác"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Tắt"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Được kết nối với <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Được kết nối với nhiều thiết bị"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Chế độ trình diễn giao diện người dùng hệ thống"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Ứng dụng tức thì"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Mở liên kết trong ứng dụng ngay cả khi ứng dụng không được cài đặt"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Ứng dụng tức thì"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Tài khoản ứng dụng tức thì"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Tùy chọn Ứng dụng tức thì"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Ứng dụng đã cài đặt"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Bộ nhớ của bạn hiện đang được quản lý bởi trình quản lý bộ nhớ"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Tài khoản cho <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Đã bật tùy chọn luôn bật VPN trong hồ sơ cá nhân của bạn"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Đã bật tùy chọn luôn bật VPN trong hồ sơ công việc của bạn"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Đặt proxy HTTP chung"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Chứng chỉ tin cậy"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Thông tin xác thực đáng tin cậy"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Thông tin xác thực đáng tin cậy trong hồ sơ cá nhân của bạn"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Thông tin xác thực đáng tin cậy trong hồ sơ công việc của bạn"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Tối thiểu <xliff:g id="COUNT_1">%d</xliff:g> chứng chỉ CA</item>
       <item quantity="one">Tối thiểu <xliff:g id="COUNT_0">%d</xliff:g> chứng chỉ CA</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Thông tin cấp phép của nhà cung cấp dịch vụ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Kích hoạt cấp phép của nhà cung cấp dịch vụ"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Thông tin mới và thú vị?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Dùng thử 5 tính năng hàng đầu"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Tham quan điện thoại mới của bạn"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Tham quan máy tính bảng mới của bạn"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Tham quan thiết bị mới của bạn"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Không sử dụng được tính năng này trên thiết bị này"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Trạng thái đăng ký IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Đã đăng ký"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Chưa được đăng ký"</string>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index cf3af7a..bce2543 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -69,7 +69,7 @@
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"正在扫描..."</item>
     <item msgid="8513729475867537913">"正在连接..."</item>
-    <item msgid="515055375277271756">"正在进行身份验证..."</item>
+    <item msgid="515055375277271756">"正在验证身份…"</item>
     <item msgid="1943354004029184381">"正在获取IP地址..."</item>
     <item msgid="4221763391123233270">"已连接"</item>
     <item msgid="624838831631122137">"已暂停"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a5861ce..07b06b7 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"“%1$s”想要查看您的消息。要向“%2$s”授予权限吗？"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM 访问权限请求"</string>
     <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="bluetooth_device_name_summary" msgid="4757990010751789977">"向其他设备显示为“<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"向其他设备显示为“<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"您的设备"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"与新设备配对"</string>
     <string name="date_and_time" msgid="9062980487860757694">"日期和时间"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"下一屏幕"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"要跳过指纹设置？"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"指纹设置只需片刻时间。如果您跳过此设置，之后可以在设置中添加您的指纹。"</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"要跳过屏幕锁定吗？"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"系统将不会启用设备保护功能。如果您的平板电脑丢失、被盗或被重置，您将无法防止他人使用此平板电脑。"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"系统将不会启用设备保护功能。如果您的设备丢失、被盗或被重置，您将无法防止他人使用此设备。"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"系统将不会启用设备保护功能。如果您的手机丢失、被盗或被重置，您将无法防止他人使用此手机。"</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"您添加的指纹数量已达到上限"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"无法添加更多的指纹"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"要移除所有指纹吗？"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"移除“<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>”"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"要删除此指纹吗？"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"您将无法使用指纹来解锁手机、对购买交易进行授权或登录应用"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"您将无法使用指纹解锁您的工作资料、对购买交易进行授权或登录工作应用"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"是，移除"</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"为提升安全性，请设置备用屏幕锁定方式。"</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"为提升安全性，请设置备用屏幕锁定方式。"</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>
@@ -497,37 +502,37 @@
     <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_fingerprint" msgid="8212242533942400457">"移除您的解锁图案后，设备保护功能将无法使用。<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"移除您的解锁图案后，设备保护功能将无法使用。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>您保存的指纹也将从此设备上移除。如此一来，您就无法通过指纹解锁手机、授权购买交易或登录应用。"</string>
+</xliff:g>您保存的指纹也将从此设备中移除，因此您将无法通过指纹解锁手机、授权购买交易或登录应用。"</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">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"移除您的 PIN 码后，设备保护功能将无法使用。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>您保存的指纹也将从此设备上移除。如此一来，您就无法通过指纹解锁手机、授权购买交易或登录应用。"</string>
+</xliff:g>您保存的指纹也将从此设备中移除，因此您将无法通过指纹解锁手机、授权购买交易或登录应用。"</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"移除您的密码后，设备保护功能将无法使用。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>您保存的指纹也将从此设备上移除。如此一来，您就无法通过指纹解锁手机、授权购买交易或登录应用。"</string>
+</xliff:g>您保存的指纹也将从此设备中移除，因此您将无法通过指纹解锁手机、授权购买交易或登录应用。"</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"移除您的屏幕锁定方式后，设备保护功能将无法使用。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>您保存的指纹也将从此设备上移除。如此一来，您就无法通过指纹解锁手机、授权购买交易或登录应用。"</string>
+</xliff:g>您保存的指纹也将从此设备中移除，因此您将无法通过指纹解锁手机、授权购买交易或登录应用。"</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"移除您的解锁图案后，个人资料保护功能将无法使用。"</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"移除您的解锁图案后，个人资料保护功能将无法使用。<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"移除您的解锁图案后，资料保护功能将无法使用。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>您已保存的指纹也将从此个人资料中移除，而且您将无法使用这些指纹来解锁个人资料、对购买交易进行授权或登录应用。"</string>
+</xliff:g>您保存的指纹也将从此资料中移除，因此您将无法通过指纹解锁资料、授权购买交易或登录应用。"</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"移除您的 PIN 码后，个人资料保护功能将无法使用。"</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"移除您的 PIN 码后，个人资料保护功能将无法使用。<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"移除您的 PIN 码后，资料保护功能将无法使用。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>您已保存的指纹也将从此个人资料中移除，而且您将无法使用这些指纹来解锁个人资料、对购买交易进行授权或登录应用。"</string>
+</xliff:g>您保存的指纹也将从此资料中移除，因此您将无法通过指纹解锁资料、授权购买交易或登录应用。"</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"移除您的密码后，个人资料保护功能将无法使用。"</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"移除您的密码后，个人资料保护功能将无法使用。<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"移除您的密码后，资料保护功能将无法使用。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>您已保存的指纹也将从此个人资料中移除，而且您将无法使用这些指纹来解锁个人资料、对购买交易进行授权或登录应用。"</string>
+</xliff:g>您保存的指纹也将从此资料中移除，因此您将无法通过指纹解锁您的资料、授权购买交易或登录应用。"</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"移除您的屏幕锁定方式后，个人资料保护功能将无法使用。"</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"移除您的屏幕锁定方式后，个人资料保护功能将无法使用。<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"移除您的屏幕锁定方式后，资料保护功能将无法使用。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>您已保存的指纹也将从此个人资料中移除，而且您将无法使用这些指纹来解锁个人资料、对购买交易进行授权或登录应用。"</string>
+</xliff:g>您保存的指纹将从此资料中移除，因此您将无法通过指纹解锁资料、授权购买交易或登录应用。"</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"是，移除"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"更改解锁图案"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"更改解锁PIN码"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"不允许使用以升序、降序或重复序列进行排列的一串数字"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"确定"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"取消"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"清除"</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>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"可使用 WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" （可使用 WPS）"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"请输入您的网络密码"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"运营商 WLAN 网络"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"通过<xliff:g id="NAME">%1%s</xliff:g>连接"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"为了提高位置信息精确度以及其他目的，“<xliff:g id="APP_NAME">%1$s</xliff:g>”请求启用网络扫描功能（在关闭了WLAN时也可进行扫描）。\n\n是否对所有需要进行扫描的应用批准这项请求？"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"要关闭此功能，请转到菜单下的“高级”。"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"允许"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"连接"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"无法连接网络"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"取消保存"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"修改"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"无法取消保存网络"</string>
     <string name="wifi_save" msgid="3331121567988522826">"保存"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"无法保存网络"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"高级WLAN"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC 地址"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP 地址"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"网络信息"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"子网掩码"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 地址"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"取消邀请？"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"要取消连接<xliff:g id="PEER_NAME">%1$s</xliff:g>的邀请吗？"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"取消保存此群组？"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"便携式WLAN热点"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"WLAN 热点"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"目前没有与其他设备共享互联网连接或内容"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"正在通过热点共享此平板电脑的互联网连接"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"正在通过热点共享此手机的互联网连接"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"应用正在共享内容。要共享互联网连接，请先关闭热点，然后重新打开"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"WLAN 名称"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"热点名称"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"正在打开<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"其他设备可以连接到<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"WLAN 密码"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"热点密码"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP 频段"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"使用热点创建 WLAN 网络供其他设备使用。热点会使用您的移动数据连接提供互联网连接。这可能会产生额外的移动数据流量费用。"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"应用可以通过创建热点，与附近的设备共享内容。"</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"开启“WLAN 通话”功能后，您的手机可根据您的偏好设置，通过 WLAN 网络或您的运营商网络通话（具体取决于哪个网络信号较强）。开启此功能之前，请先向您的运营商咨询收费情况及其他详情。"</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"更新紧急地址"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"当您使用 WLAN 拨打 911 时，紧急服务会将此地址视为您所在位置的地址"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"当您通过 WLAN 网络拨打紧急呼救电话时，紧急服务会将该地址视为您所在位置的地址"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"显示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"声音"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"音量"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"搜索"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"管理搜索设置和历史记录"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"没有结果"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"清除历史记录"</string>
     <string name="display_settings" msgid="7965901687241669598">"显示"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"自动旋转屏幕"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"鲜明的色彩"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"正在恢复默认 APN 设置。"</string>
     <string name="menu_restore" msgid="8260067415075573273">"重置为默认设置"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"已重置默认APN设置。"</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"重置"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"重置网络设置"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"重置选项"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"网络、应用或设备可以重置"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"重置 WLAN、移动数据网络和蓝牙设置"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"此操作会重置所有网络设置，包括：\n\n"<li>"WLAN"</li>\n<li>"移动数据网络"</li>\n<li>"蓝牙"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"重置设置"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"要重置所有网络设置吗？此操作无法撤消！"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"要重置网络设置吗？"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"此用户无权重置网络设置"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"网络设置已重置"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"恢复出厂设置"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> 个帐号将会重置</item>
-      <item quantity="one">1 个帐号将会重置</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"内部存储空间和所有数据都将被重置"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"清除所有数据（恢复出厂设置）"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"此操作会清除您平板电脑"<b>"内部存储设备"</b>"中的所有数据，包括：\n\n"<li>"您的Google帐号"</li>\n<li>"系统和应用的数据和设置"</li>\n<li>"下载的应用"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"此操作会清除您手机"<b>"内部存储空间"</b>"中的所有数据，包括：\n\n"<li>"您的 Google 帐号"</li>\n<li>"系统和应用的数据和设置"</li>\n<li>"已下载的应用"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"目前，您已登录以下帐号：\n"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"安全信息"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"您没有数据连接。要立即查看此信息，请使用联网的计算机访问%s。"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"正在加载..."</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"选择您的密码"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"设置屏幕锁定"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"为了安全起见，请设置密码"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"要使用指纹，请设置密码"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"选择您的图案"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"要使用指纹，请设置解锁图案"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"选择PIN码"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"为了安全起见，请设置 PIN 码"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"要使用指纹，请设置 PIN 码"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"确认您的密码"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"重新输入密码"</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_pin_header" msgid="7744513791910572550">"重新输入 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>
@@ -1483,12 +1490,18 @@
     <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 码以继续。重启设备后需要输入设备 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 码以继续。重启设备后需要输入工作 PIN 码。"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"请输入您的工作密码以继续。重启设备后需要输入工作密码。"</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"为了提升安全性，请绘制您的设备解锁图案"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"为了提升安全性，请输入您的设备 PIN 码"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"为了提升安全性，请输入您的设备密码"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"为了提升安全性，请绘制您的工作资料解锁图案"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"为了提升安全性，请输入您的工作资料 PIN 码"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"为了提升安全性，请输入您的工作资料密码"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"您的手机已恢复出厂设置。要使用此手机，请输入您以前的解锁图案。"</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"您的手机已恢复出厂设置。要使用此手机，请输入您以前的 PIN 码。"</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"您的手机已恢复出厂设置。要使用此手机，请输入您以前的密码。"</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"验证图案"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"验证 PIN 码"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"验证密码"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN 码错误"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"密码错误"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"图案错误"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"是否允许该应用创建微件并查看其数据？"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"当您创建微件后，“<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>”将能查看其显示的所有数据。"</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"始终允许“<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>”创建微件并查看其数据"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>天<xliff:g id="HOURS">%2$d</xliff:g>小时<xliff:g id="MINUTES">%3$d</xliff:g>分<xliff:g id="SECONDS">%4$d</xliff:g>秒"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>小时<xliff:g id="MINUTES">%2$d</xliff:g>分<xliff:g id="SECONDS">%3$d</xliff:g>秒"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>分<xliff:g id="SECONDS">%2$d</xliff:g>秒"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>秒"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"使用情况统计数据"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"使用情况统计数据"</string>
     <string name="display_order_text" msgid="8592776965827565271">"排序方式："</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"屏幕阅读器、显示、互动控件"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"阅读辅助设置"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"您可以根据自己的需求对此设备进行自定义。以后，您可以在“设置”中更改这些辅助功能设置。"</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"放大字体"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"更改字体大小"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"屏幕阅读器"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"音频和屏幕上的文字"</string>
     <string name="display_category_title" msgid="685461049938269166">"显示"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"要放大"</b>"，在屏幕上快速点按屏幕三次即可。\n"<ul><li>"用双指或多指在屏幕上拖动即可进行滚动"</li>\n<li>"张合双指或多指即可调整缩放级别"</li></ul>\n\n<b>"要暂时性地放大"</b>"，请快速在屏幕上点按三次，并在最后一次点按时按住手指不放。\n"<ul><li>"拖动手指即可在屏幕上四处移动"</li>\n<li>"松开手指即可缩小回原来的状态"</li></ul>\n\n"您不能在键盘和导航栏中使用放大功能。"</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"启用放大功能后，使用屏幕底部的“无障碍”按钮可以快速放大。\n\n"<b>"要放大"</b>"，请点按“无障碍”按钮，然后点按屏幕上的任意位置。\n"<ul><li>"拖动双指或多指即可进行滚动"</li>\n<li>"张合双指或多指即可调整缩放级别"</li></ul>\n\n<b>"要暂时性地放大"</b>"，请点按“无障碍”按钮，然后触摸并按住屏幕上的任意位置。\n"<ul><li>"拖动手指即可在屏幕上四处移动"</li>\n<li>"松开手指即可缩小回原来的状态"</li></ul>\n\n"您不能在键盘和导航栏中使用放大功能。"</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"“无障碍”按钮已设为“<xliff:g id="SERVICE">%1$s</xliff:g>”。要使用放大功能，请触摸并按住“无障碍”按钮，然后选择“放大功能”。"</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"无障碍快捷方式"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"音量键快捷方式"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"快捷方式服务"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"屏幕锁定时也可以用"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"启用这项快捷方式后，同时按下两个音量按钮 3 秒钟即可启动无障碍功能。"</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"启用这项快捷方式后，同时按下两个音量键 3 秒钟即可启动无障碍功能。"</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">"自动更新屏幕放大状态"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"在应用转换时更新屏幕放大状态"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"可能会影响性能"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"指针停止移动后点击"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"点击前延迟"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"开启"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"关闭"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"在“快捷设置”中显示"</string>
@@ -2358,6 +2363,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"管理套餐"</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>
@@ -2443,6 +2449,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"移动网络"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"按流量计费的WLAN网络"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"要选择按流量计费的网络，请开启WLAN网络。"</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"自动"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"按流量计费"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"不按流量计费"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"运营商的流量计算方式可能与您设备的计算方式不同。"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"紧急呼救"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"返回通话"</string>
@@ -2660,7 +2669,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"通话管理器"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"紧急广播"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"紧急警报"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"网络运营商"</string>
     <string name="access_point_names" msgid="1381602020438634481">"接入点名称(APN)"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"增强型4G LTE模式"</string>
@@ -2729,6 +2738,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"首选 SIM 卡"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"每次都询问"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"必须选择"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"SIM 卡选择"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"设置"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">显示 %d 项隐藏内容</item>
@@ -2738,7 +2748,7 @@
     <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"移动网络"</string>
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"流量使用"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"热点"</string>
-    <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"已关联的设备"</string>
+    <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"已连接的设备"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"蓝牙、投射、NFC"</string>
     <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"蓝牙、投射"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"应用和通知"</string>
@@ -2880,18 +2890,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"应用通知"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"通知类别"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"重要程度"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"让应用决定"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"允许发出提示音"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"一律不显示通知"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"不发出提示音，也不在屏幕上弹出通知"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"不发出提示音"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"发出提示音"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"发出提示音并在屏幕上弹出通知"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"在屏幕上弹出"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"低"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"中"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"高"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"紧急"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"允许发出提示音"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"不发出提示音，不振动，也不在当前屏幕上短暂显示这些通知。"</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"允许打扰"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"允许应用发出提示音、振动，以及/或在屏幕上弹出通知"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"重要性：低"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"重要性：中等"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"重要性：高"</string>
@@ -2922,7 +2933,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"画中画, 画中, pip, picture in"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"画中画"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"允许进入画中画模式"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"允许此应用在您打开或离开应用（如继续观看视频）时创建画中画窗口。该窗口会显示在您当前使用的其他应用的上层。"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"允许此应用在您打开应用时或您离开应用后（例如继续观看视频）创建画中画窗口。这类窗口会显示在您当前使用的其他应用的上层。"</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>
@@ -3225,6 +3236,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"传输文件"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"传输照片 (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"以 MIDI 模式使用设备"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"短信镜像"</string>
     <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>
@@ -3367,6 +3379,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="night_display_suggestion_title" msgid="6602129097059325291">"设置“夜间模式”时间安排"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"将屏幕色调调节为琥珀色以帮助您入睡"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"“夜间模式”已开启"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"屏幕已变成琥珀色，这可能有助于您安然入睡。"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"建议"</string>
@@ -3385,6 +3399,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"使用较冷的显示颜色"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"要应用颜色更改，请关闭屏幕"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"要应用电话监控器的变更内容，请重新启动设备"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"相机 HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"要应用对“相机 HAL HDR+”设置所做的更改，请重新启动设备"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"相机激光传感器"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"自动系统更新"</string>
     <string name="usage" msgid="2977875522080448986">"流量消耗"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"移动数据用量"</string>
@@ -3410,7 +3427,7 @@
     <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_2">%2$s</xliff:g>使用了 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g>期间已使用 <xliff:g id="ID_1">%1$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">
@@ -3479,7 +3496,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"清除并转换"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"重置 ShortcutManager 调用频率限制"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"已重置 ShortcutManager 调用频率限制"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"控制屏幕锁定时的通知"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"控制锁定屏幕上显示的信息"</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="8483187649355540109">"支持和提示"</string>
@@ -3487,7 +3504,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"没有任何已安装的应用申请付费短信权限"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"“付费短信”可能会产生费用，而且相关费用将计入您的运营商帐单。如果您为某个应用启用该权限，那么您将能够使用该应用发送付费短信。"</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"付费短信权限"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"其他设备无法检测到"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"关闭"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"已连接到<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"已连接到多部设备"</string>
     <string name="demo_mode" msgid="2798762752209330277">"系统界面演示模式"</string>
@@ -3589,7 +3606,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"免安装应用"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"在应用中打开链接（即使未安装相关应用也无妨）"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"免安装应用"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"免安装应用帐号"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"免安装应用偏好设置"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"已安装的应用"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"您的存储空间目前是由存储空间管理器管理"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g>的帐号"</string>
@@ -3636,7 +3653,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"已在您的个人资料中开启“始终开启的 VPN”"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"已在您的工作资料中开启“始终开启的 VPN”"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"已设置全局 HTTP 代理"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"可信凭据"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"可信凭据"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"您个人资料中的可信凭据"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"您工作资料中的可信凭据"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">至少 <xliff:g id="COUNT_1">%d</xliff:g> 个 CA 证书</item>
       <item quantity="one">至少 <xliff:g id="COUNT_0">%d</xliff:g> 个 CA 证书</item>
@@ -3699,7 +3718,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"运营商配置信息"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"触发运营商配置"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"新增了哪些精彩功能？"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"查看前 5 大热门功能"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"新手机功能导览"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"新平板电脑功能导览"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"新设备功能导览"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"该设备不支持此功能"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS 注册状态"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"已注册"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"未注册"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index a1c7ee6..19b8530 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s 想存取您的訊息，要授予 %2$s 存取權嗎？"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM 卡存取權要求"</string>
     <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="bluetooth_device_name_summary" msgid="4757990010751789977">"向其他裝置顯示為「<xliff:g id="DEVICE_NAME">^1</xliff:g>」"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"向其他裝置顯示為「<xliff:g id="DEVICE_NAME">^1</xliff:g>」"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"您的裝置"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"配對新裝置"</string>
     <string name="date_and_time" msgid="9062980487860757694">"日期和時間"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"下一個畫面"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"要略過指紋設定程序嗎？"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"指紋設定程序只需一至兩分鐘。如果您略過此程序，稍後可以在設定中自行新增您的指紋。"</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"要略過螢幕鎖定設定程序嗎？"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"系統將不會開啟裝置保護功能。如果您的平板電腦遺失、被盜或被重設，您將無法防止他人使用此平板電腦。"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"系統將不會開啟裝置保護功能。如果您的裝置遺失、被盜或被重設，您將無法防止他人使用此裝置。"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"系統將不會開啟裝置保護功能。如果您的手機遺失、被盜或被重設，您將無法防止他人使用此手機。"</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"您加入指紋的數目已達上限"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"無法加入更多指紋"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"確定移除所有指紋？"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"移除「<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>」"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"要刪除這個指紋嗎？"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"您將無法使用指紋解鎖手機、授權購物或登入應用程式"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"您將無法使用指紋解鎖工作設定檔、授權購物，或登入工作應用程式"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"是，請移除"</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"為加強保安，請設定後備螢幕鎖定方式。"</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"為加強安全，請設定後備螢幕鎖定方式。"</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>
@@ -497,37 +502,37 @@
     <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_fingerprint" msgid="8212242533942400457">"如沒有啟用圖案上鎖功能，裝置保護功能將無法運作。<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"移除您的上鎖圖案後，裝置保護功能將無法使用。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>您已儲存的指紋會從此裝置中移除，您將無法透過這些功能為手機解鎖、授權購物或登入應用程式。"</string>
+</xliff:g>您已儲存的指紋也會從此裝置中移除，因此您將無法透過指紋解鎖手機、授權購物或登入應用程式。"</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">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"移除您的 PIN 後，裝置保護功能將無法使用。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>您已儲存的指紋會從此裝置中移除，您將無法透過這些功能為手機解鎖、授權購物或登入應用程式。"</string>
+</xliff:g>您已儲存的指紋也會從此裝置中移除，因此您將無法透過指紋解鎖手機、授權購物或登入應用程式。"</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"移除您的密碼後，裝置保護功能將無法使用。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>您已儲存的指紋會從此裝置中移除，您將無法透過這些功能為手機解鎖、授權購物或登入應用程式。"</string>
+</xliff:g>您已儲存的指紋也會從此裝置中移除，因此您將無法透過指紋解鎖手機、授權購物或登入應用程式。"</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"移除您的螢幕鎖定後，裝置保護功能將無法使用。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>您已儲存的指紋會從此裝置中移除，您將無法透過這些功能為手機解鎖、授權購物或登入應用程式。"</string>
+</xliff:g>您已儲存的指紋也會從此裝置中移除，因此您將無法透過指紋解鎖手機、授權購物或登入應用程式。"</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"如沒有啟用圖案上鎖功能，設定檔保護功能將無法運作。"</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"如沒有啟用圖案上鎖功能，設定檔保護功能將無法運作。<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"移除您的上鎖圖案後，工作設定檔保護功能將無法使用。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>您已儲存的指紋會從此設定檔中移除，您將無法使用這些指紋為設定檔解鎖、授權購物或登入應用程式。」"</string>
+</xliff:g>您已儲存的指紋也會從此工作設定檔中移除，因此您將無法透過指紋解鎖手機、授權購物或登入應用程式。"</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"如沒有啟用 PIN，設定檔保護功能將無法運作。"</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"如沒有啟用 PIN，設定檔保護功能將無法運作。<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"移除您的 PIN 後，工作設定檔保護功能將無法使用。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>您已儲存的指紋會從此設定檔中移除，您將無法使用這些指紋為設定檔解鎖、授權購物或登入應用程式。」"</string>
+</xliff:g>您已儲存的指紋也會從此工作設定檔中移除，因此您將無法透過指紋解鎖手機、授權購物或登入應用程式。"</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"如沒有啟用密碼，設定檔保護功能將無法運作。"</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"如沒有啟用密碼，設定檔保護功能將無法運作。<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"移除您的密碼後，工作設定檔保護功能將無法使用。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>您已儲存的指紋會從此設定檔中移除，您將無法使用這些指紋為設定檔解鎖、授權購物或登入應用程式。」"</string>
+</xliff:g>您已儲存的指紋也會從此工作設定檔中移除，因此您將無法透過指紋解鎖手機、授權購物或登入應用程式。"</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"如沒有啟用螢幕鎖定，設定檔保護功能將無法運作。"</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"如沒有啟用螢幕鎖定，設定檔保護功能將無法運作。<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"移除您的螢幕鎖定後，工作設定檔保護功能將無法使用。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>您已儲存的指紋會從此設定檔中移除，您將無法使用這些指紋為設定檔解鎖、授權購物或登入應用程式。」"</string>
+</xliff:g>您已儲存的指紋也會從此工作設定檔中移除，因此您將無法透過指紋解鎖手機、授權購物或登入應用程式。"</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"是，請移除"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"更改解鎖圖形"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"變更解鎖 PIN"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"不可使用依遞增或遞減順序排列或重複的連續數字"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"確定"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"取消"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"清除"</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>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"有 WPS 可供使用"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (有 WPS 可供使用)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"輸入您的網絡密碼"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"流動網絡供應商 Wi‑Fi 網絡"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"透過 <xliff:g id="NAME">%1%s</xliff:g> 連線"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」要求開啟網絡掃描功能 (即使 Wi-Fi 已關閉)，以提升定位精確度及用於其他用途。\n\n您要允許所有需要掃描的應用程式這項要求嗎？"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"如要關閉這項功能，請在展開式選單中選取 [進階]。"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"允許"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"連線"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"無法連接網絡"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"刪除"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"修改"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"無法刪除網絡"</string>
     <string name="wifi_save" msgid="3331121567988522826">"儲存"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"無法儲存網絡"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"進階 Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC 位址"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP 位址"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"網絡資料"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"子網絡遮罩"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"網域名稱系統 (DNS)"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 位址"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"取消邀請？"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"您要取消連接「<xliff:g id="PEER_NAME">%1$s</xliff:g>」的邀請嗎？"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"刪除這個群組？"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"可攜式 Wi-Fi 熱點"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi 熱點"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"目前沒有與其他裝置分享互聯網或內容"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"正在透過熱點分享此平板電腦的互聯網連線"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"正在透過熱點分享此手機的互聯網連線"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"應用程式正在分享內容。如要分享互聯網連線，請關閉熱點並重新開啟"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi 名稱"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"熱點名稱"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"正在開啟 <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"其他裝置可以連線至 <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi 密碼"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"熱點密碼"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"存取點頻段"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"使用熱點為其他裝置建立 Wi-Fi 網絡。熱點會使用流動數據連線提供互聯網服務。可能需要支付額外流動數據費用。"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"應用程式可以建立熱點，與附近的裝置分享內容。"</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"當開啟 Wi-Fi 通話時，您的手機可根據偏好設定及訊號強弱，選擇使用 Wi-Fi 網絡或流動網絡供應商的網絡安排來電轉駁。開啟此功能前，請向您的流動網絡供應商查詢收費及其他詳情。"</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"更新緊急地址"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"當您使用 Wi-Fi 致電 911 時，緊急服務使用的地址將會作為您的地點"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"當您使用 Wi-Fi 撥打緊急電話時，緊急服務會將該地址視作您所在位置的地址"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"顯示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音效"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"音量"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"搜尋"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"管理搜尋設定和記錄"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"找不到結果"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"清除記錄"</string>
     <string name="display_settings" msgid="7965901687241669598">"顯示"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"自動旋轉螢幕"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"鮮豔顏色"</string>
@@ -1325,8 +1335,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"正在還原預設 APN 設定。"</string>
     <string name="menu_restore" msgid="8260067415075573273">"重設回預設值"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"重設預設 APN 設定已完成。"</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"重設"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"重設網絡設定"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"重設選項"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"網絡、應用程式或裝置可以重設"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"重設 Wi-Fi、流動數據和藍牙"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"此操作會重設所有網絡設定，包括：\n\n"<li>"Wi‑Fi"</li>\n<li>"流動數據"</li>\n<li>"藍牙"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"重設設定"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"您要重設所有的網絡設定嗎？您無法復原這項操作！"</string>
@@ -1334,12 +1345,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"重設？"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"這位使用者無法重設網絡"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"網絡設定已重設"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"恢復原廠設定"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> 個帳戶將會重設</item>
-      <item quantity="one">1 個帳戶將會重設</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"內部儲存空間和所有資料將會重設"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"清除所有資料 (回復原廠設定)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"這會清除您平板電腦"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"這會清除您手機"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"您目前已登入下列帳戶：\n"</string>
@@ -1463,15 +1469,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"安全資訊"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"您沒有數據連線，如要立即查看這項資訊，請使用任何已連接互聯網的電腦前往 %s。"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"載入中…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"選擇密碼"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"設定螢幕鎖定"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"為安全起見，請設定密碼"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"如要使用指紋，請設定密碼"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"選擇圖形"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"如要使用指紋，請設定上鎖圖案"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"選擇 PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"為安全起見，請設定 PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"如要使用指紋，請設定 PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"確認密碼"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"請重新輸入密碼"</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_pin_header" msgid="7744513791910572550">"請重新輸入 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>
@@ -1484,12 +1491,18 @@
     <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 碼即可繼續。必須在裝置重新啟動後輸入 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 碼即可繼續。必須在裝置重新啟動後輸入 PIN 碼。"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"輸入工作密碼即可繼續。必須在裝置重新啟動後輸入密碼。"</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"為提升安全性，請畫出您的裝置上鎖圖案"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"為提升安全性，請輸入您的裝置 PIN"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"為提升安全性，請輸入您的裝置密碼"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"為提升安全性，請畫出您的工作設定檔上鎖圖案"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"為提升安全性，請輸入您的工作設定檔 PIN"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"為提升安全性，請輸入您的工作設定檔密碼"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"您的手機已回復原廠設定。如要使用這部手機，請畫出先前的上鎖圖案。"</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"您的手機已回復原廠設定。如要使用這部手機，請輸入先前的 PIN。"</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"您的手機已回復原廠設定。如要使用這部手機，請輸入先前的密碼。"</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"驗證上鎖圖案"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"驗證 PIN"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"驗證密碼"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN 碼錯誤"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"密碼錯誤"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"圖形不對"</string>
@@ -1792,13 +1805,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"是否要建立小工具並允許存取？"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"建立小工具後，「<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>」便可以存取所顯示的所有資料。"</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"永遠允許「<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>」建立小工具並存取其資料"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> 天 <xliff:g id="HOURS">%2$d</xliff:g> 小時 <xliff:g id="MINUTES">%3$d</xliff:g> 分 <xliff:g id="SECONDS">%4$d</xliff:g> 秒"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> 時 <xliff:g id="MINUTES">%2$d</xliff:g> 分 <xliff:g id="SECONDS">%3$d</xliff:g> 秒"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> 分 <xliff:g id="SECONDS">%2$d</xliff:g> 秒"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> 秒"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"用量統計資料"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"用量統計資料"</string>
     <string name="display_order_text" msgid="8592776965827565271">"排序依據："</string>
@@ -1810,7 +1816,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"螢幕閱讀器、顯示、互動控制項"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"視覺輔助設定"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"您可視乎個人需要自訂此裝置。這些無障礙功能可在 [設定] 中變更。"</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"放大字型"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"變更字型大小"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"螢幕閱讀器"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"音訊和螢幕上的文字"</string>
     <string name="display_category_title" msgid="685461049938269166">"螢幕"</string>
@@ -1831,10 +1837,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"如要縮放"</b>"，請快速輕按螢幕 3 下。\n"<ul><li>"用 2 隻或多隻手指拖曳，即可捲動螢幕"</li>\n<li>"用 2 隻或多隻手指縮放，即可調整縮放程度"</li></ul>\n\n<b>"如要暫時縮放"</b>"，請快速輕按螢幕 3 下 (第 3 下按住螢幕)。\n"<ul><li>"拖曳即可在螢幕上移動"</li>\n<li>"提起手指即可縮小至原大"</li></ul>\n\n"您無法在鍵盤或導覽列上使用放大功能。"</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"開啟放大功能後，使用螢幕底部的「無障礙功能」按鈕即可快速放大螢幕。\n\n"<b>"如要縮放"</b>"，請輕按「無障礙功能」按鈕，再按螢幕任何地方。\n"<ul><li>"用 2 隻或多隻手指拖曳，即可捲動螢幕"</li>\n<li>"用 2 隻或多隻手指縮放，即可調整縮放程度"</li></ul>\n\n<b>"如要暫時縮放"</b>"，請輕按「無障礙功能」按鈕，再按住螢幕任何地方。\n"<ul><li>"拖曳即可在螢幕上移動"</li>\n<li>"提起手指即可縮小至原大"</li></ul>\n\n"您無法在鍵盤或導覽列上使用放大功能。"</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"「無障礙功能」按鈕已設定為「<xliff:g id="SERVICE">%1$s</xliff:g>」。如要使用放大功能，請按住「無障礙功能」按鈕，然後選擇「放大功能」。"</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"無障礙功能捷徑"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"音量快速鍵"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"快速鍵服務"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"允許在鎖定螢幕上使用"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"啟用快速鍵後，同時按下兩個音量按鈕 3 秒即可啟動無障礙功能。"</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"啟用快速鍵後，同時按下兩個音量鍵 3 秒即可啟動無障礙功能。"</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">"自動更新螢幕放大設定"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"在應用程式轉場時更新螢幕放大設定"</string>
@@ -1847,7 +1853,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"可能會影響效能"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"指標停止移動後點擊"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"延誤前點擊"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"開啟"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"關閉"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"在「快速設定」中顯示"</string>
@@ -2361,6 +2366,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"管理計劃"</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>
@@ -2446,6 +2452,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"流動網絡"</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_metered_auto" msgid="1262028400911918865">"自動"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"按用量收費"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"非按用量收費"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"流動網絡供應商的數據計算方式可能與裝置有所不同。"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"緊急電話"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"返回通話"</string>
@@ -2663,7 +2672,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"通話管理員"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"緊急廣播"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"緊急警報"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"網絡供應商"</string>
     <string name="access_point_names" msgid="1381602020438634481">"接入點名稱"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"強化 4G LTE 模式"</string>
@@ -2732,6 +2741,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"首選 SIM 卡用於："</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"每次都詢問"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"請選取偏好設定"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"SIM 卡選擇"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"設定"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">顯示 %d 個隱藏項目</item>
@@ -2883,18 +2893,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"應用程式通知"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"通知類別"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"重要性"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"讓應用程式決定"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"允許發出音效"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"永不顯示通知"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"不發出音效或顯示通知"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"不發出音效"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"發出音效"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"發出音效並在螢幕上彈出通知"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"在螢幕上彈出"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"低"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"中"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"高"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"緊急"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"允許音效"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"禁止這些通知發出音效、震動或不時於目前螢幕上出現。"</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"允許打擾"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"允許應用程式發出音效、震動以及/或在螢幕上彈出通知"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"重要性：低"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"重要性：中"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"重要性：高"</string>
@@ -2925,7 +2936,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip 畫中畫"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"畫中畫"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"允許畫中畫"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"允許此應用程式在開啟時或您離開後 (例如繼續觀看影片) 建立畫中畫視窗。該視窗會在您目前使用的其他應用程式上層顯示。"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"允許此應用程式在開啟時或您離開後 (例如繼續觀看影片) 建立畫中畫視窗。該視窗會在您目前使用的其他應用程式上層顯示。"</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>
@@ -3228,6 +3239,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"正在轉移檔案"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"正在轉移相片 (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"在 MIDI 模式下使用裝置"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"短訊鏡像輸出"</string>
     <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>
@@ -3370,6 +3382,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="night_display_suggestion_title" msgid="6602129097059325291">"設定夜燈模式時間表"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"將螢幕轉成橙黃色有助您入睡"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"「夜燈模式」已開啟"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"螢幕已調校至橙黃色，讓您更易入睡。"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"建議"</string>
@@ -3388,6 +3402,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"使用較冷的顯示器顏色"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"如要套用色溫變更，請先關閉螢幕"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"如要套用「電話監控工具」的變更內容，請重新啟動裝置"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"相機 HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"如要套用「相機 HAL HDR+」的變更內容，請重新啟動裝置"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"相機鐳射感應器"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"自動系統更新"</string>
     <string name="usage" msgid="2977875522080448986">"用量"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"流動數據用量"</string>
@@ -3413,7 +3430,7 @@
     <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_2">%2$s</xliff:g>期間使用了 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g>期間使用了 <xliff:g id="ID_1">%1$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">
@@ -3482,7 +3499,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"清除並轉換"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"重設 ShortcutManager 的速率限制"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"已重設 ShortcutManager 的速率限制"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"控制上鎖畫面通知"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"控制上鎖畫面上顯示的資料"</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="8483187649355540109">"支援和提示"</string>
@@ -3490,7 +3507,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"沒有已安裝的應用程式要求發送付費短訊的權限"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"付費短訊的費用可能高昂，並會增加您流動網絡供應商帳單的款項。如果您為應用程式開放權限，將可以透過該應用程式發送付費短訊。"</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"發送付費短訊的權限"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"其他裝置無法偵測到"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"關閉"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"已連接至 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"已連接多部裝置"</string>
     <string name="demo_mode" msgid="2798762752209330277">"系統使用者介面示範模式"</string>
@@ -3592,7 +3609,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"即時應用程式"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"即使您沒有安裝應用程式，亦可在應用程式內開啟連結"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"即時應用程式"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"即時應用程式帳戶"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"即時應用程式偏好設定"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"已安裝的應用程式"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"您的儲存空間即將由儲存空間管理員管理"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g>的帳戶"</string>
@@ -3639,7 +3656,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"已開啟您個人設定檔中的「永久連線的 VPN」"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"已開啟您工作設定檔中的「永久連線的 VPN」"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"已設定全域 HTTP Proxy"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"信任的憑證"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"信任的憑證"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"您個人設定檔中信任的憑證"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"您工作設定檔中信任的憑證"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">最少 <xliff:g id="COUNT_1">%d</xliff:g> 個 CA 憑證</item>
       <item quantity="one">最少 <xliff:g id="COUNT_0">%d</xliff:g> 個 CA 憑證</item>
@@ -3702,7 +3721,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"流動網絡供應商佈建資料"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"觸發流動網絡供應商佈建程序"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"新增了哪些精彩功能？"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"查看 5 大功能"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"探索您的新手機"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"探索您的新平板電腦"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"探索您的新裝置"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"這部裝置不支援此功能"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS 註冊狀態"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"已註冊"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"未註冊"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 4ba170e..8dedff2 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s 要求存取你的訊息。要將存取權授予 %2$s 嗎？"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM 存取權請求"</string>
     <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="bluetooth_device_name_summary" msgid="4757990010751789977">"向其他裝置顯示為「<xliff:g id="DEVICE_NAME">^1</xliff:g>」"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"向其他裝置顯示為「<xliff:g id="DEVICE_NAME">^1</xliff:g>」"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"你的裝置"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"配對新裝置"</string>
     <string name="date_and_time" msgid="9062980487860757694">"日期和時間"</string>
@@ -372,6 +372,9 @@
     <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="1961957425135180242">"繼續"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"要略過指紋設定程序嗎？"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"指紋設定程序只需一兩分鐘即可完成。如果略過這個程序，稍後可以在設定中自行新增你的指紋。"</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"要略過螢幕鎖定設定程序嗎？"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"裝置保護功能將不會開啟。在這種情況下，你無法在這部平板電腦遺失、遭竊或重設時，防止其他人使用平板電腦。"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"裝置保護功能將不會開啟。在這種情況下，你無法在這個裝置遺失、遭竊或重設時，防止其他人使用裝置。"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"裝置保護功能將不會開啟。在這種情況下，你無法在這支手機遺失、遭竊或重設時，防止其他人使用手機。"</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"你新增的指紋數量已達上限"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"無法新增其他指紋"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"要移除所有指紋嗎？"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"移除「<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>」"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"要刪除這個指紋嗎？"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"你將無法使用指紋將手機解鎖、授權購物交易或登入應用程式。"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"你將無法使用指紋將 Work 設定檔解鎖、授權購買交易，或是登入 Work 應用程式。"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"是，移除"</string>
@@ -455,7 +460,7 @@
     <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="5585650064305600578">"請設定備用螢幕鎖定方式，進一步提升安全性。"</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"為了進一步提升安全性，請設定備用螢幕鎖定方式。"</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>
@@ -497,37 +502,37 @@
     <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_fingerprint" msgid="8212242533942400457">"如果移除你的解鎖圖案，裝置保護功能將無法運作。<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"如果移除你的解鎖圖案，裝置保護功能將無法運作。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>你儲存的指紋會一併從這部裝置中移除，因此你將無法使用指紋解鎖手機、授權購物交易或登入應用程式。"</string>
+</xliff:g>你儲存的指紋會一併從這個裝置中移除，因此你將無法使用指紋解鎖手機、授權購物交易或登入應用程式。"</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">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"如果移除你的 PIN 碼，裝置保護功能將無法運作。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>你儲存的指紋會一併從這部裝置中移除，因此你將無法使用指紋解鎖手機、授權購物交易或登入應用程式。"</string>
+</xliff:g>你儲存的指紋會一併從這個裝置中移除，因此你將無法使用指紋解鎖手機、授權購物交易或登入應用程式。"</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">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"如果移除你的密碼，裝置保護功能將無法運作。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>你儲存的指紋會一併從這部裝置中移除，因此你將無法使用指紋解鎖手機、授權購物交易或登入應用程式。"</string>
+</xliff:g>你儲存的指紋會一併從這個裝置中移除，因此你將無法使用指紋解鎖手機、授權購物交易或登入應用程式。"</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">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"如果移除你的螢幕鎖定，裝置保護功能將無法運作。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>你儲存的指紋會一併從這部裝置中移除，因此你將無法使用指紋解鎖手機、授權購物交易或登入應用程式。"</string>
+</xliff:g>你儲存的指紋會一併從這個裝置中移除，因此你將無法使用指紋解鎖手機、授權購物交易或登入應用程式。"</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"如果你移除解鎖圖案，設定檔保護功能將無法運作。"</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"如果你移除解鎖圖案，設定檔保護功能將無法運作。<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"如果移除你的解鎖圖案，設定檔保護功能將無法運作。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>此外，系統也會將你儲存的指紋從這個設定檔中移除；你將無法使用指紋來解鎖設定檔、授權購物交易，或登入應用程式。"</string>
+</xliff:g>你儲存的指紋會一併從這個設定檔中移除，因此你將無法使用指紋解鎖設定檔、授權購物交易或登入應用程式。"</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"如果你移除 PIN 碼，設定檔保護功能將無法運作。"</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"如果你移除 PIN 碼，設定檔保護功能將無法運作。<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"如果移除你的 PIN 碼，設定檔保護功能將無法運作。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>此外，系統也會將你儲存的指紋從這個設定檔中移除；你將無法使用指紋來解鎖設定檔、授權購物交易，或登入應用程式。"</string>
+</xliff:g>你儲存的指紋會一併從這個設定檔中移除，因此你將無法使用指紋解鎖設定檔、授權購物交易或登入應用程式。"</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"如果你移除密碼，設定檔保護功能將無法運作。"</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"如果你移除密碼，設定檔保護功能將無法運作。<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"如果移除你的密碼，設定檔保護功能將無法運作。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>此外，系統也會將你儲存的指紋從這個設定檔中移除；你將無法使用指紋來解鎖設定檔、授權購物交易，或登入應用程式。"</string>
+</xliff:g>你儲存的指紋會一併從這個設定檔中移除，因此你將無法使用指紋解鎖設定檔、授權購物交易或登入應用程式。"</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"如果你移除螢幕鎖定，設定檔保護功能將無法運作。"</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"如果你移除螢幕鎖定，設定檔保護功能將無法運作。<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"如果移除你的螢幕鎖定，設定檔保護功能將無法運作。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>此外，系統也會將你儲存的指紋從這個設定檔中移除；你將無法使用指紋來解鎖設定檔、授權購物交易，或登入應用程式。"</string>
+</xliff:g>你儲存的指紋會一併從這個設定檔中移除，因此你將無法使用指紋解鎖設定檔、授權購物交易或登入應用程式。"</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"是，移除裝置保護措施"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"變更解鎖圖案"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"變更解鎖 PIN"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"不允許使用依遞增或遞減順序排列或是重複的一串數字"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"確定"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"取消"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"清除"</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>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"可使用 WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (可使用 WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"輸入你的網路密碼"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"電信業者 Wi‑Fi 網路"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"透過「<xliff:g id="NAME">%1%s</xliff:g>」連線"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> 要求開啟網路掃描功能 (即使 Wi-Fi 已關閉)，藉此提升定位精確度及用於其他用途。\n\n你要對所有需要執行掃描的應用程式允許這項要求嗎？"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"如要關閉這項功能，請在溢位選單中選取 [進階]。"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"允許"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"連線"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"無法連線至網路"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"清除"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"修改"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"無法刪除網路"</string>
     <string name="wifi_save" msgid="3331121567988522826">"儲存"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"無法儲存網路"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"進階 Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC 位址"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP 位址"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"網路資訊"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"子網路遮罩"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 位址"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"取消邀請？"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"你要取消 <xliff:g id="PEER_NAME">%1$s</xliff:g> 的連線邀請？"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"刪除這個群組？"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"可攜式 Wi-Fi 無線基地台"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi 無線基地台"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"目前沒有與其他裝置分享網際網路或內容"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"正在透過無線基地台分享這部平板電腦的網際網路連線"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"正在透過無線基地台分享這支手機的網際網路連線"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"應用程式正在分享內容。如要分享網際網路連線，請關閉無線基地台並重新開啟"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi 名稱"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"無線基地台名稱"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"正在開啟 <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"其他裝置可連線至 <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi 密碼"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"無線基地台密碼"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"存取點頻帶"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"使用無線基地台建立 Wi‑Fi 網路供其他裝置使用。無線基地台會使用你的行動數據連線提供網際網路。可能需支付額外的行動數據傳輸費用。"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"應用程式可以建立無線基地台來和鄰近的裝置分享內容。"</string>
@@ -938,7 +947,7 @@
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"開啟 Wi-Fi 通話功能之後，你的手機可依據你的偏好設定，透過 Wi-Fi 網路或你的行動通訊網路通話 (選擇訊號較強者)。開啟這項功能前，請先與你的電信業者詢問費用與其他細節。"</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"更新緊急地址"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"如果你使用 Wi-Fi 撥打 119，緊急服務會判定你位在這個地址"</string>
+    <string name="emergency_address_summary" msgid="3266760199681945746">"如果你使用 Wi-Fi 撥打緊急電話，緊急服務會判定你位在這個地址"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"顯示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音效"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"音量"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"搜尋"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"管理搜尋設定和記錄"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"找不到相符的搜尋結果"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"清除紀錄"</string>
     <string name="display_settings" msgid="7965901687241669598">"顯示"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"自動旋轉螢幕"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"鮮明色彩"</string>
@@ -1324,8 +1334,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"正在還原預設 APN 設定。"</string>
     <string name="menu_restore" msgid="8260067415075573273">"還原為預設狀態"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"重設預設 APN 設定已完成。"</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"重設"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"重設網路設定"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"重設選項"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"網路、應用程式或裝置可以重設"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"重設 Wi-Fi、行動網路和藍牙"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"這項操作會重設所有網路設定，包括：\n\n"<li>"Wi‑Fi"</li>\n<li>"行動數據"</li>\n<li>"藍牙"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"重設設定"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"你要重設所有網路設定嗎？這個動作無法復原！"</string>
@@ -1333,12 +1344,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"你要重設嗎？"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"這個使用者無法重設網路設定"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"已重設網路設定"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"恢復原廠設定"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other">系統將重設 <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> 個帳戶</item>
-      <item quantity="one">系統將重設 1 個帳戶</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"內部儲存空間與所有資料都將重設"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"清除所有資料 (恢復原廠設定)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"這會清除你平板電腦"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"你的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"這會清除你手機"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"你的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"你目前已登入下列帳戶：\n"</string>
@@ -1391,7 +1397,7 @@
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"行動數據傳輸資費方案"</string>
     <string name="sms_application_title" msgid="4903928270533250448">"簡訊應用程式"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"變更簡訊應用程式？"</string>
-    <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"你要改用 <xliff:g id="NEW_APP">%1$s</xliff:g> 而不再使用 <xliff:g id="CURRENT_APP">%2$s</xliff:g> 做為簡訊應用程式嗎？"</string>
+    <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"你要改用「<xliff:g id="NEW_APP">%1$s</xliff:g>」而不再使用「<xliff:g id="CURRENT_APP">%2$s</xliff:g>」做為簡訊應用程式嗎？"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"使用 <xliff:g id="NEW_APP">%s</xliff:g> 做為簡訊應用程式嗎？"</string>
     <string name="network_scorer_picker_title" msgid="6383879578279046456">"網路評分服務供應商"</string>
     <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"無"</string>
@@ -1462,15 +1468,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"安全資訊"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"你沒有數據連線，如要立即查看這項資訊，請使用任何已連上網際網路的電腦前往 %s。"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"載入中…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"選擇密碼"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"設定螢幕鎖定"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"為了安全起見，請設定密碼"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"如要使用指紋，請設定密碼"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"選擇圖案"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"如要使用指紋，請設定解鎖圖案"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"選擇 PIN 碼"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"為了安全起見，請設定 PIN 碼"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"如要使用指紋，請設定 PIN 碼"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"確認密碼"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"請重新輸入你的密碼"</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_pin_header" msgid="7744513791910572550">"請重新輸入你的 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>
@@ -1483,12 +1490,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"請畫出你的 Work 解鎖圖案以繼續作業"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"請輸入你的 Work PIN 碼以繼續作業"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"請輸入你的 Work 密碼以繼續作業"</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 碼即可繼續。必須在裝置重新啟動後輸入 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">"裝置已重新啟動，請畫出你的 Work 解鎖圖案以繼續作業。"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"裝置已重新啟動，請輸入你的 Work PIN 碼以繼續作業。"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"裝置已重新啟動，請輸入你的 Work 密碼以繼續作業。"</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"為了提升安全性，請使用裝置解鎖圖案"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"為了提升安全性，請輸入裝置 PIN 碼"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"為了提升安全性，請輸入裝置密碼"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"為了提升安全性，請使用 Work 解鎖圖案"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"為了提升安全性，請輸入 Work PIN 碼"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"為了提升安全性，請輸入 Work 密碼"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"你的手機已恢復原廠設定。如要使用這支手機，請輸入先前設定的解鎖圖案。"</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"你的手機已恢復原廠設定。如要使用這支手機，請輸入先前設定的 PIN 碼。"</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"你的手機已恢復原廠設定。如要使用這支手機，請輸入先前設定的密碼。"</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"驗證解鎖圖案"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"驗證 PIN 碼"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"驗證密碼"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN 碼錯誤"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"密碼錯誤"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"圖案錯誤"</string>
@@ -1791,13 +1804,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"是否要建立小工具並允許存取？"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"建立小工具後，<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> 即可存取所顯示的所有資料。"</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"一律允許 <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> 建立小工具並存取其資料"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> 天 <xliff:g id="HOURS">%2$d</xliff:g> 小時 <xliff:g id="MINUTES">%3$d</xliff:g> 分 <xliff:g id="SECONDS">%4$d</xliff:g> 秒"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> 小時 <xliff:g id="MINUTES">%2$d</xliff:g> 分 <xliff:g id="SECONDS">%3$d</xliff:g> 秒"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> 分 <xliff:g id="SECONDS">%2$d</xliff:g> 秒"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> 秒"</string>
-    <string name="battery_history_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="usage_stats_label" msgid="5890846333487083609">"使用情形統計資料"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"使用情形統計資料"</string>
     <string name="display_order_text" msgid="8592776965827565271">"排序依據："</string>
@@ -1809,7 +1815,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"螢幕閱讀器、顯示、互動控制項"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"視覺輔助設定"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"你可以根據個人需求自訂這個裝置，日後，你可以前往 [設定] 變更這些無障礙功能。"</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"放大字型"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"變更字型大小"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"螢幕閱讀器"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"音訊和畫面上的文字"</string>
     <string name="display_category_title" msgid="685461049938269166">"螢幕"</string>
@@ -1830,10 +1836,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"如要進行縮放"</b>"，請快速輕觸螢幕三次。\n"<ul><li>"使用兩指或多指在畫面上拖曳以進行捲動"</li>\n<li>"使用兩指或多指撥動以調整縮放大小"</li></ul>\n\n<b>"如要暫時放大畫面"</b>"，請在螢幕上快速輕觸三下，並在第三下時按住。\n"<ul><li>"使用手指拖曳可瀏覽畫面的不同部分"</li>\n<li>"放開手指即可縮小"</li></ul>\n\n"你無法放大鍵盤和導覽列部分。"</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"啟用放大功能之後，使用螢幕下方的 [協助工具] 按鈕即可快速放大。\n\n"<b>"如要進行縮放"</b>"，請輕觸 [協助工具] 按鈕，然後輕觸螢幕任何位置。\n"<ul><li>"使用兩指或多指在畫面上拖曳以進行捲動"</li>\n<li>"使用兩指或多指撥動以調整縮放大小"</li></ul>\n\n<b>"如要暫時放大畫面"</b>"，請輕觸 [協助工具] 按鈕，然後輕觸並按住螢幕任何位置。\n"<ul><li>"使用手指拖曳可瀏覽畫面的不同部分"</li>\n<li>"放開手指即可縮小"</li></ul>\n\n"你無法放大鍵盤和導覽列部分。"</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"[協助工具] 按鈕已設為 <xliff:g id="SERVICE">%1$s</xliff:g>。如要使用放大功能，請輕觸並按住 [協助工具] 按鈕，然後選取 [放大]。"</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"協助工具捷徑"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"音量快速鍵功能"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"快速鍵服務"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"在螢幕鎖定畫面中啟動"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"啟用快速鍵功能之後，同時按下音量調高和調低鍵 3 秒即可啟動無障礙功能。"</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"啟用快速鍵功能之後，同時按下音量調高和調低鍵 3 秒即可啟動無障礙功能。"</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">"自動更新螢幕放大設定"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"更新應用程式轉場後的螢幕放大設定"</string>
@@ -1846,7 +1852,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"可能會影響效能"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"游標停止移動後點擊"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"點擊前延遲"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"開啟"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"關閉"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"在快速設定中顯示"</string>
@@ -2362,6 +2367,7 @@
     <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_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"管理方案"</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>
@@ -2447,6 +2453,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"行動網路"</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_metered_auto" msgid="1262028400911918865">"自動"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"按傳輸量計費"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"非按傳輸量計費"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"電信業者與裝置的數據計算方式可能有所不同。"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"緊急電話"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"返回通話"</string>
@@ -2664,7 +2673,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"通話管理工具"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"緊急廣播"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"緊急警示"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"網路業者"</string>
     <string name="access_point_names" msgid="1381602020438634481">"存取點名稱"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"加強型 4G LTE 模式"</string>
@@ -2733,6 +2742,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"適用於以下用途的偏好 SIM 卡"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"每次都詢問"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"請選取偏好設定"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"SIM 卡選項"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"設定"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="other">顯示 %d 個隱藏項目</item>
@@ -2884,18 +2894,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"應用程式通知"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"通知類別"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"重要性"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"讓應用程式決定"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"開啟音效"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"一律不顯示通知"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"不發出音效或顯示通知"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"不發出音效"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"發出音效"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"發出音效並在畫面上彈出通知"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"在畫面上彈出通知"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"低"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"中"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"高"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"緊急"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"開啟音效"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"不要發出音效、震動，也不要在目前畫面上短暫顯示這類通知。"</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"允許干擾"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"允許應用程式發出音效、震動，以及/或在畫面上彈出通知"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"低重要性"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"中重要性"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"高重要性"</string>
@@ -2926,7 +2937,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"子母畫面"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"子母畫面"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"允許子母畫面"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"允許這個應用程式在開啟時或你離開後 (例如繼續觀看影片) 建立子母畫面視窗。這類視窗會在你目前使用的其他應用程式上層顯示。"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"允許這個應用程式在開啟時或你離開後 (例如繼續觀看影片) 建立子母畫面視窗。這類視窗會在你目前使用的其他應用程式上層顯示。"</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>
@@ -3229,6 +3240,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"傳輸檔案"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"傳輸相片 (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"以 MIDI 模式使用裝置"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"簡訊鏡像"</string>
     <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>
@@ -3371,6 +3383,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="night_display_suggestion_title" msgid="6602129097059325291">"設定夜燈時間表"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"將螢幕調成暖色調幫助入眠"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"夜燈模式已開啟"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"已將螢幕色調改為琥珀色，讓你比較容易入睡。"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"建議"</string>
@@ -3389,6 +3403,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"使用較冷的顯示器色溫"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"如要套用色溫變更設定，請關閉螢幕"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"如要套用 Telephony Monitor 的變更內容，請重新啟動裝置"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"相機 HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"如要套用你對「相機 HAL HDR+」設定所做的變更，請重新啟動裝置"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"相機雷射感應器"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"自動系統更新"</string>
     <string name="usage" msgid="2977875522080448986">"使用情況"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"行動數據用量"</string>
@@ -3414,7 +3431,7 @@
     <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_2">%2$s</xliff:g>這段期間已使用 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_2">%2$s</xliff:g>期間已使用 <xliff:g id="ID_1">%1$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">
@@ -3483,7 +3500,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"清除並轉換"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"重設 ShortcutManager 速率限制"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"已重設 ShortcutManager 速率限制"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"管理螢幕鎖定通知"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"控制鎖定畫面上顯示的資訊"</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="8483187649355540109">"支援和提示"</string>
@@ -3491,7 +3508,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"沒有任何已安裝的應用程式要求「付費簡訊」存取權"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"「付費簡訊」需要額外計費，相關費用會併入你的電信費帳單。如果你為某個應用程式啟用權限，即可利用該應用程式傳送付費簡訊。"</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"付費簡訊存取權"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"其他裝置無法偵測到"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"關閉"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"已連線到「<xliff:g id="ID_1">%1$s</xliff:g>」"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"已連線到多個裝置"</string>
     <string name="demo_mode" msgid="2798762752209330277">"系統 UI 示範模式"</string>
@@ -3593,7 +3610,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"免安裝應用程式"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"即使未安裝應用程式，也能在當中開啟連結"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"免安裝應用程式"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"免安裝應用程式帳戶"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"免安裝應用程式偏好設定"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"已安裝的應用程式"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"你的儲存空間目前是由儲存空間管理員管理"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g>的帳戶"</string>
@@ -3640,7 +3657,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"已開啟你個人設定檔中的「永久連線的 VPN」"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"已開啟你 Work 設定檔中的「永久連線的 VPN」"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"已設定全域 HTTP Proxy"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"信任的憑證"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"信任的憑證"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"你的個人設定檔中安裝的信任的憑證"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"你的 Work 設定檔中安裝的信任的憑證"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">最少有 <xliff:g id="COUNT_1">%d</xliff:g> 個 CA 憑證</item>
       <item quantity="one">最少有 <xliff:g id="COUNT_0">%d</xliff:g> 個 CA 憑證</item>
@@ -3703,7 +3722,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"電信業者佈建資訊"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"觸發電信業者佈建程序"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"有什麼新奇功能？"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"查看前 5 大熱門功能"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"認識你的新手機"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"認識你的新平板電腦"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"認識你的新裝置"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"這個裝置不支援此功能"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"IMS 註冊狀態"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"已註冊"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"未註冊"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 71e956a..6d4380b 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"I-%1$s ifuna ukufinyelela kumilayezo yakho. Nikeza ukufinyelela ku-%2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Isicelo sokufinyelela ku-SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"I-<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ifuna ukufinyelela kukhadi lakho le-SIM. Ukunikeza ukufinyelela kukhadi le-SIM kuzokhubaza ukuxhumeka kwedatha kudivayisi yakho ngesikhathi sokuxhumeka. Nikeza ukufinyelela ku-<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Kubonakala njenge-\'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' kwamanye amadivayisi"</string>
+    <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Kubonakala njenge-\"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" kwamanye amadivayisi"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Amadivayisi akho"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Bhanqa idivayisi entsha"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Idethi nesikhathi"</string>
@@ -372,6 +372,9 @@
     <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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Okulandelayo"</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Yeqa izigxivizo zeminwe?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Ukusethwa kwezigxivizo zeminwe kuthatha iminithi noma amabili kuphela. Uma weqa lokhu, ungangeza izigxivizo zakho zeminwe ngemuva kwesikhathi kuzilungiselelo."</string>
+    <string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Yeqa ukukhiya isikrini?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Izici zokuvikela idivayisi ngeke zivulwe. Ngeke ukwazi ukugwema abanye ukuthi bangasebenzisi le thebhulethi uma ilahlekile, itshontshiwe noma ilele."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Izici zokuvikela idivayisi ngeke zivulwe. Ngeke ukwazi ukugwema abanye ukuthi bangasebenzisi le divayisi uma ilahlekile, itshontshiwe noma ilele."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Izici zokuvikela idivayisi ngeke zivulwe. Ngeke ukwazi ukugwema abanye ukuthi bangasebenzisi le foni uma ilahlekile, itshontshiwe noma ilele."</string>
@@ -411,6 +414,8 @@
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Ungeze inombolo ephezulu yezigxivizo zeminwe"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Ayikwazi ukwengeza izingxovizo zeminwe eziningi"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Susa zonke izigxivizo zeminwe?"</string>
+    <string name="fingerprint_delete_title" msgid="1368196182612202898">"Susa i-\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'"</string>
+    <string name="fingerprint_delete_message" msgid="8597787803567398131">"Uyafuna ukususa lezi zigxivizo zeminwe?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Ngeke uze ukwazi ukusebenzisa izigxivizo zakho zeminwe ukuze uvule ifoni yakho, ugunyaze ukuthenga, noma ungene ngemvume kuzinhlelo zokusebenza ngazo"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Ngeke uze ukwazi ukusebenzisa izigxivizo zakho zeminwe ukuvula iphrofayela yakho yomsebenzi, ugunyaze ukuthenga, noma ungene ngemvume kuzinhlelo zokusebenza zomsebenzi"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Yebo, susa"</string>
@@ -455,7 +460,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Vikela ithebulethi yakho"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Vikela idivayisi yakho"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Vikela ifoni yakho"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Ngokuvikela okungeziwe, setha isikrini sokukhiya."</string>
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5474935724843291107">"Ngokuvikela okungeziwe, setha isikrini sokukhiya."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Vimbela abanye kusukela ekusebenziseni le thebulethi ngaphandle kwemvume yakho ngokwenza kusebenze izici zokuvikela idivayisi. Khetha ukukhiya isikrini ofuna ukusisebenzisa."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Vimbela abanye kusukela ekusebenziseni le divayisi ngaphandle kwemvume yakho ngokwenza kusebenze izici zokuvikela idivayisi. Khetha ukukhiya isikrini ofuna ukukusebenzisa."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Vimbela abanye kusukela ekusebenziseni le foni ngaphandle kwemvume yakho ngokwenza kusebenze izici zokuvikela idivayisi. Khetha ukukhiya isikrini ofuna ukukusebenzisa."</string>
@@ -497,35 +502,35 @@
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Susa ukuvikela idivayisi?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Susa ukuvikelwa kwedatha yephrofayela?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Izici zokuvikela idivayisi ngeke zisebenze ngaphandle kwephethini yakho."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Izici zokuvikela idivayisi ngeke zisebenze ngaphandle kwephethini yakho.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2986105377420905314">"Izici zokuvikela idivayisi ngeke zisebenze ngaphandle kwephethini yakho.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Izigxivizo zakho zeminwe ezilondoloziwe futhi zizosuswa kusuka kule divayisi futhi ngeke ukwazi ukuvula ifoni yakho, ukuthenga okugunyaziwe, noma ukungena ngemvume kuzinhlelo zokusebenza ngazo.\""</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Izici zokuvikela idivayisi ngeke zisebenze ngaphandle kwephinikhodi yakho."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Izici zokuvikela idivayisi ngeke zisebenze ngaphandle kwephinikhodi yakho.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="3370462835533123695">"Izici zokuvikela idivayisi ngeke zisebenze ngaphandle kwephinikhodi yakho.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Izigxivizo zakho zeminwe ezilondoloziwe futhi zizosuswa kusuka kule divayisi futhi ngeke ukwazi ukuvula ifoni yakho, ukuthenga okugunyaziwe, noma ukungena ngemvume kuzinhlelo zokusebenza ngazo.\""</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Izici zokuvikela idivayisi ngeke zisebenze ngaphandle kwephasiwedi yakho."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Izici zokuvikela idivayisi ngeke zisebenze ngaphandle kwephasiwedi yakho.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="3595476296430536798">"Izici zokuvikela idivayisi ngeke zisebenze ngaphandle kwephasiwedi yakho.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Izigxivizo zakho zeminwe ezilondoloziwe futhi zizosuswa kusuka kule divayisi futhi ngeke ukwazi ukuvula ifoni yakho, ukuthenga okugunyaziwe, noma ukungena ngemvume kuzinhlelo zokusebenza ngazo.\""</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Izici zokuvikela idivayisi ngeke zisebenze ngaphandle kokukhiya isikrini sakho."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Izici zokuvikela idivayisi ngeke zisebenze ngaphandle kokukhiya isikrini sakho.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="3679351662094349506">"Izici zokuvikela idivayisi ngeke zisebenze ngaphandle kokukhiya isikrini sakho.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Izigxivizo zakho zeminwe ezilondoloziwe futhi zizosuswa kusuka kule divayisi futhi ngeke ukwazi ukuvula ifoni yakho, ukuthenga okugunyaziwe, noma ukungena ngemvume kuzinhlelo zokusebenza ngazo.\""</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Izici zokuvikela iphrofayela ngeke zize zisebenze ngaphandle kwephethini yakho."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Izici zokuvikela iphrofayela ngeke zize zisebenze ngaphandle kwephethini yakho.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="6718155854303231675">"Izici zokuvikela iphrofayela ngeke zize zisebenze ngaphandle kwephethini yakho.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Izigxivizo zakho zeminwe nazo zizosuswa kusukela kule phrofayela futhi ngeke ukwazi ukuvula iphrofayela yakho, ugunyaze ukuthenga, noma ungene ngemvume kuzinhlelo zakho zokusebenza ngazo.\""</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Izici zokuvikela iphrofayela ngeke zisebenze ngaphandle kwephinikhodi yakho."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Izici zokuvikela iphrofayela ngeke zisebenze ngaphandle kwephinikhodi yakho.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4209564603132870532">"Izici zokuvikela iphrofayela ngeke zisebenze ngaphandle kwephinikhodi yakho.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Izigxivizo zakho zeminwe nazo zizosuswa kusukela kule phrofayela futhi ngeke ukwazi ukuvula iphrofayela yakho, ugunyaze ukuthengwa, noma ungene ngemvume kuzinhlelo zokusebenza ngazo.\""</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Izici zokuvikela iphrofayela ngeke zize zisebenze ngaphandle kwephasiwedi yakho."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Izici zokuvikela iphrofayela ngeke zisebenze ngaphandle kwephasiwedi yakho.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="2994300676764706047">"Izici zokuvikela iphrofayela ngeke zisebenze ngaphandle kwephasiwedi yakho.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Izigxivizo zakho zeminwe nazo zizosuswa kusukela kule phrofayela futhi ngeke uze ukwazi ukuvula iphrofayela yakho, ugunyaze ukuthenga, noma ungene ngemvume kuzinhlelo zakho zokusebenza ngazo.\""</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Izici zokuvikela iphrofayela ngeke zisebenze ngaphandle kokukhiya isikrini kwakho."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Izici zokuvikela iphrofayela ngeke zize zisebenze ngaphandle kokukhiya isikrini kwakho.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="4994062501123299418">"Izici zokuvikela iphrofayela ngeke zize zisebenze ngaphandle kokukhiya isikrini kwakho.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Izigxivizo zakho zeminwe ezilondoloziwe zizophinda zisuswe kusukela kule phrofayela futhi ngeke ukwazi ukuvula iphrofayela yakho ugunyaze ukuthenga, noma ungene ngemvume kuzinhlelo zokusebenza ngazo.\""</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Yebo, susa"</string>
@@ -586,6 +591,7 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Ukwenyuka, ukwehla, noma uchungechunge olwehlayo lamadijithi alivunyewe"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"KULUNGILE"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Khansela"</string>
+    <string name="lockpassword_clear_label" msgid="5724429464960458155">"Sula"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Khansela"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Okulandelayo"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Ukusetha kuphelile."</string>
@@ -816,6 +822,8 @@
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"i-WPS iyatholakala"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (i-WPS iyatholakala)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Faka iphasiwedi yakho yenethiwekhi"</string>
+    <string name="wifi_carrier_connect" msgid="8174696557882299911">"Inethiwekhi ye-Wi-Fi yenkampani yenethiwekhi"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Xhuma nge-<xliff:g id="NAME">%1%s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Ukuze kuthuthukiswe ukufaneleka kwendawo nezinye izinjongo, i-<xliff:g id="APP_NAME">%1$s</xliff:g> ifuna ukuvula ukuskena kwenethiwekhi, noma ngabe i-Wi-Fi ivaliwe.\n\nVumela lokhu ngazo zonke izinhlelo zokusebenza ezifuna ukuskena?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Ukuze uvale lokhu, iya ku-Okuthuthukile kwimenyu yokuningi."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Vumela"</string>
@@ -833,6 +841,7 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Xhuma kwi-inthanethi"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Yehlulekile ukuxhuma kunethiwekhi"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Khohlwa"</string>
+    <string name="wifi_modify" msgid="6100248070440710782">"Lungisa"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Yehlulekile ukukhohlwa inethiwekhi"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Londoloza"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Yehlulekile ukulondoloza inethiwekhi"</string>
@@ -845,6 +854,7 @@
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Ukuxhumana kungenazintambo okuphambili"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Ikheli le-MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Ikheli le-IP"</string>
+    <string name="wifi_details_title" msgid="3471132676909349382">"Ulwazi lwenethiwekhi"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Imaski ye-subnet"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"I-DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Amakheli e-IPv6"</string>
@@ -877,16 +887,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Khansela isimemo?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Ingabe ufuna ukukhansela isimemo ukuze uxhume ne-<xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Khohlwa leli qembu?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Wi-Fi hotspot ephathekayo"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"I-Wi‑Fi hotspot"</string>
     <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Akukho ukwabelana kwe-inthanethi noma okuqukethwe namanye amadivayisi"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Ukwabiwa ukuxhumeka kwe-inthanethi kwale thebulethi nge-hotspot"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Ukwabiwa ukuxhumeka kwe-inthanethi kwale foni nge-hotspot"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Uhlelo lokusebenza labelana ngokuqukethwe. Ukuze wabelane ngoxhumo lwe-inthanethi, vala i-hotspot, bese uyivule"</string>
-    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Igama le-Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"Igama le-Hotspot"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Ivula i-<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Amanye amadivayisi angaxhuma ku-<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Iphasiwedi ye-Wi-Fi"</string>
+    <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"Iphasiwedi ye-Hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"I-AP Band"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Sebenzisa i-hotspot ukudala inethiwekhi ye-Wi‑Fi yamanye amadivayisi akho. I-Hotspot inikezela nge-inthanethi isebenzisa uxhumo lwedatha yakho yeselula. Amashaji edatha yeselula angeziwe angasebenza."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Izinhlelo zokusebenza zingadala i-hotspot ukwabelana ngokuqukethwe namadivayisi aseduze."</string>
@@ -938,7 +947,7 @@
     <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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></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="emergency_address_summary" msgid="3266760199681945746">"Ikheli elisetshenziswa amasevisi esimo esiphuthumayo njengendawo yakho uma wenza ikholi yesimo esiphuthumayo usebenzisa i-Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ukubukeka"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Umsindo"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Amavolumu"</string>
@@ -992,6 +1001,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Sesha"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Phatha izilungiselelo zokusesha nomlando"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Akukho miphumela"</string>
+    <string name="search_clear_history" msgid="4196658962573162457">"Sula umlando"</string>
     <string name="display_settings" msgid="7965901687241669598">"Ukubukeka"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Phendula iskrini ngokuzenzakalela"</string>
     <string name="color_mode_title" msgid="3159275920408338215">"Imibala ekhanya kakhulu"</string>
@@ -1325,8 +1335,9 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Ibuyisela izilungiselelo ezizenzakalelayo ku-APN"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Setha kabusha kube okumisiwe"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Ukuhlela okumisiwe izilungiselelo ze-APN kuqedile."</string>
-    <string name="reset_dashboard_title" msgid="4412694650600342973">"Setha kabusha"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Ukusetha kabusha kwezilungiselelo zenethiwekhi"</string>
+    <string name="reset_dashboard_title" msgid="6254873816990678620">"Izinketho zokusetha kabusha"</string>
+    <string name="reset_dashboard_summary" msgid="4851012632493522755">"Inethiwekhi, izinhlelo zokusebenza, noma idivayisi ingasethwa kabusha"</string>
+    <string name="reset_network_title" msgid="6166025966016873843">"Setha kabusha i-Wi-Fi, iselula ne-Bluetooth"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Lokhu kuzosetha kabusha zonke izilungiselelo zenethiwekhi ezifaka:\n\n"<li>"i-Wi‑Fi"</li>\n<li>"Idatha yeselula"</li>\n<li>"ne-Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Setha kabusha izilungiselelo"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Setha kabusha zonke izilungiselelo zenethiwekhi? Awukwazi ukuhlehlisa lesi senzo!"</string>
@@ -1334,12 +1345,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Setha kabusha?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Ukusetha kabusha inethiwekhi akutholakali kulo msebenzisi"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Izilungiselelo zenethiwekhi zisethwe kabusha"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Ukuhlela kabusha idatha yasembonini"</string>
-    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> ama-akhawunti azosethwa kabusha</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> ama-akhawunti azosethwa kabusha</item>
-    </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"Isitoreji sangaphakathi nayo yonke idatha kuzosethwa kabusha"</string>
+    <string name="master_clear_title" msgid="3531267871084279512">"Sula yonke idatha (ukusethwa kabusha kwasekuqaleni)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Lokhu kuzosusa yonke idatha "<b>"ekwistoreji sangaphakathi kuthebhulethi yakho"</b>", ehlanganisa:\n\n"<li>"I-akhawunti yakho ye-Google"</li>\n<li>"Uhlelo lokusebenza kanye nezilungiselelo"</li>\n<li>"Izinhlelo zokusebenza ezilayishiwe"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Lokhu kuzosusa yonke idatha "<b>"ekwisitoreji sangaphakathi sefoni yakho"</b>", ehlanganisa:\n\n"<li>"I-akhawunti yakho ye-Google"</li>\n<li>"Uhlelo lokusebenza kanye nezilungiselelo"</li>\n<li>"Izinhlelo zokusebenza ezilayishiwe"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n"Okwamanje ungene ngemvume kuma-akhawunti alandelayo:\n\n"</string>
@@ -1463,15 +1469,16 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Ulwazi lokuvikeleka"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Awunalo uxhumano lwedatha. Ukubuka lokhu kwaziswa manje, iya ku-%s kunoma iyiphi ikhompuyutha exhunywe kwi-Inthanethi."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Iyalayisha…"</string>
-    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Khetha iphasiwedi yakho"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="3872462096767152394">"Setha ukukhiya kwesikrini"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="1197569283524841412">"Ngokuphepha, setha iphasiwedi"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Ukuze usebenzise izigxivizo zeminwe, setha iphasiwedi"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Khetha iphathini yakho"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Ukuze usebenzise izigxivizo zeminwe, setha iphethini"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Khetha i-PIN yakho"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="1875420718677275646">"Ngokuphepha, setha i-PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Ukuze usebenzise izigxivizo zeminwe, setha iphinikhodi"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Qinisekisa iphasiwedi yakho"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Faka kabusha iphasiwedi yakho"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Qinisekisa iphathini yakho"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Qinisekisa i-PIN yakho"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Faka kabusha i-PIN yakho"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Amaphasiwedi awafani"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Ama-PIN awafani"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Okukhethwa kukho kokuvula"</string>
@@ -1484,12 +1491,18 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Sebenzisa iphethini yakho yomsebenzi ukuze uqhubeke"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Faka i-PIN yakho yomsebenzi ukuze uqhubeke"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Faka iphasiwedi yakho yomsebenzi ukuze uqhubeke"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"Sebenzisa iphethini yedivayisi yakho ukuze uqhubeke. Idingeka ngemuva kokuthi idivayisi iqale kabusha."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Faka i-PIN yedivayisi yakho ukuze uqhubeke. Iyadingeka ngemuva kokuthi idivayisi iqale kabusha."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Faka iphasiwedi yedivayisi yakho ukuze uqhubeke. Idingeka ngemuva kokuthi idivayisi iqale kabusha."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Sebenzisa iphethini yakho yomsebenzi ukuze uqhubeke. Iyadingeka ngemuva kokuthi idivayisi iqale kabusha."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Faka i-PIN yakho yomsebenzi ukuze uqhubeke. Iyadingeka ngemuva kokuthi idivayisi iqale kabusha."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Faka iphasiwedi yakho yomsebenzi ukuze uqhubeke. Iyadingeka ngemuva kokuthi idivayisi iqale kabusha."</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Ngokuphepha okungeziwe, faka iphethini yedivayisi yakho"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Ngokuphepha okungeziwe, faka i-PIN yedivayisi yakho"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Ngokuphepha okungeziwe, faka iphasiwedi yedivayisi yakho"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="3003781907040522053">"Ngokuphepha okungeziwe, faka iphethini yakho yomsebenzi"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="3367491332598821552">"Ngokuphepha okungeziwe, faka i-PIN yakho yomsebenzi"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="8159775129968582940">"Ngokuphepha okungeziwe, faka iphasiwedi yakho yomsebenzi"</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6757336656791723193">"Ifoni yakho isethwe kabusha yaya kuzilungiselelo zasekuqaleni. Ukuze usebenzise le foni, faka iphethini yangaphambilini."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="826520613445990470">"Ifoni yakho isethwe kabusha yaya kuzilungiselelo zasekuqaleni. Ukuze usebenzise le foni, faka iphinikhodi yakho yangaphambilini."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="8944081074615739040">"Ifoni yakho isethwe kabusha yaya kuzilungiselelo zasekuqaleni. Ukuze usebenzise le foni, sicela ufake iphasiwedi yakho yangaphambilini."</string>
+    <string name="lockpassword_confirm_your_pattern_header_frp" msgid="2898036091609128286">"Qinisekisa iphethini"</string>
+    <string name="lockpassword_confirm_your_pin_header_frp" msgid="4141601774778898803">"Qinisekisa iphinikhodi"</string>
+    <string name="lockpassword_confirm_your_password_header_frp" msgid="3762615419295360480">"Qinisekisa iphasiwedi"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Iphinikhodi engalungile"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Iphasiwedi engalungile"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Iphethini engalungile"</string>
@@ -1792,13 +1805,6 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Yenza iwijethi bese uvumela ukufinyeleleka?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Emva kokuba wenze iwijethi, u-<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> angafinyelela kuyo yonke idatha eyivezayo."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Ivumele njalo u-<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ukuthi enze amawijethi bese efinyelela kwidatha yawo"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>usuku <xliff:g id="HOURS">%2$d</xliff:g>ihora <xliff:g id="MINUTES">%3$d</xliff:g>iminithi <xliff:g id="SECONDS">%4$d</xliff:g>isekhondi"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> ihora <xliff:g id="MINUTES">%2$d</xliff:g> amaminithi <xliff:g id="SECONDS">%3$d</xliff:g> amasekhondi"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>amaminithi <xliff:g id="SECONDS">%2$d</xliff:g>amasekhondi"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>izinsuku <xliff:g id="HOURS">%2$d</xliff:g>amahora <xliff:g id="MINUTES">%3$d</xliff:g>amaminithi"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>amahora <xliff:g id="MINUTES">%2$d</xliff:g>amaminithi"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>amaminithi"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Izibalo zokusetshenziswa"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Izibalo zokusetshenziswa"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Hlunga nge:"</string>
@@ -1810,7 +1816,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Izifundi zesikrini, ukuboniswa nezilawuli zokuzibandakanya"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Izilungiselelo zokubonakala"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Ungenza ngendlela oyifisayo le divayisi ukuze ihlangabezane nezidingo zakho. Lezi zici ezingafinyeleleka zingashintshwa ngemuva kwesikhathi kuzilungiselelo."</string>
-    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Khulisa usayizi wombhalo"</string>
+    <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Shintsha usayizi wefonti"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Izifundi zesikrini"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Umsindo nombhalo okusikrini"</string>
     <string name="display_category_title" msgid="685461049938269166">"Bonisa"</string>
@@ -1831,10 +1837,10 @@
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Ukuze usondeze"</b>", thepha izikhathi ezingu-3 iskikrini.\n"<ul><li>"Hudula iminwe engu-2 noma ngaphezulu ukuze uskrole"</li>\n<li>"Ncinza iminwe engu-2 noma ngaphezulu ukuze ulungise ukusondeza"</li></ul>\n\n<b>"Ukuze usondeze okwesikhashana"</b>", thepha ngokushesha isikrini izikhathi ezingu-3 bese ucindezele ngomunwe wakho ekuthepheni kwesithathu.\n"<ul><li>"Hudula ukuze uhambise esikrinini"</li>\n<li>"Phakamisa umunwe ukuze uhlehlise"</li></ul>\n\n"Awukwazi ukusondeza kukhibhodi nakwibha yokuzula."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Uma ukushintsha kuvuliwe, sebenzisa inkinobho yokufinyelela ezansi kwesikrini ukuze ushintshe ngokushesha.\n\n"<b>"Ukuze usondeze"</b>", thepha inkinobho yokufinyelela, bese uthephe noma yikuphi esikrinini.\n"<ul><li>"Hudula iminwe engu-2 noma ngaphezulu ukuze uskrole"</li>\n<li>"Ncinza iminwe engu-2 noma ngaphezulu ukuze ulungise ukusondeza"</li></ul>\n\n<b>"Ukuze usondeze okwesikhashana"</b>", thepha inkinobho yokufinyelela, bese uthinta futhi ubambe noma yikuphi esikrinini.\n"<ul><li>"Hudula ukuze uhambise esikrinini"</li>\n<li>"Phakamisa umunwe ukuze uhlehlise"</li></ul>\n\n"Awukwazi ukusondeza kukhibhodi noma ibha yokuzula."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Inkinobho yokufinyelela isethelwe ku-<xliff:g id="SERVICE">%1$s</xliff:g>. Ukuze usebenzise ukushintsha, thinta futhi ubambe inkinobho yokufinyelela, bese ukhethe ukushintsha."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Isinqamuleli sokufinyelela"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Isinqamuleli sokhiye wevolumu"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Isevisi yesinqamuleli"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Vumela kusuka esikrini sokukhiya"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Uma isinqamuleli sivulekile, ungacindezela izinkinobho zevolomu amasekhodi angu-3 ukuze uqale isici sokufinyelela."</string>
+    <string name="accessibility_shortcut_description" msgid="1765853731190717372">"Uma isinqamuleli sivuliwe, ungacindezela bobabili okhiye bevolumu amasekhondi angu-3 ukuze uqale isici sokufinyelela."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Umbala okhanya kakhulu"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Buyekeza ngokuzenzakalela isisondezi-skrini"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Buyekeza isisondezi-skrini ekushintshweni kohlelo lokusebenza"</string>
@@ -1847,7 +1853,6 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Ingaphazamisa ukusebenza"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Chofoza ngemuva kokuthi isikhombisi siyeke ukuhamba"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Bambezela ngaphambi kokuchofoza"</string>
-    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"VULIWE"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"VALIWE"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Bonisa Kuzilungiselelo Ezisheshayo"</string>
@@ -2359,6 +2364,7 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"kukhethwe <xliff:g id="NUMBER">%1$d</xliff:g> kokuyi <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> kwayi-<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Khetha konke"</string>
+    <string name="data_plan_usage_manage_plans_button_text" msgid="8997761990902708162">"Phatha izinhlelo"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Ukusebenzisa idatha"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Ukusetshenziswa kwedatha yohlelo lokusebenza"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Ukubalwa kwedatha yenkampani kungahluka kudivayisi yakho."</string>
@@ -2444,6 +2450,9 @@
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Amanethiwekhi eselula"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Amanethiwekhi we-Wi-Fi akaliwe"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Ukuze ukhethe amanethiwekhi akaliwe, vula i-Wi‑Fi."</string>
+    <string name="data_usage_metered_auto" msgid="1262028400911918865">"Okuzenzakalelayo"</string>
+    <string name="data_usage_metered_yes" msgid="9217539611385225894">"Kulinganisiwe"</string>
+    <string name="data_usage_metered_no" msgid="4025232961929071789">"Akulinganisiwe"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Ukubalwa kwedatha yenkampani kungahluka kudivayisi yakho."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Ikholi ephuthmayo"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Buyela ekholini"</string>
@@ -2661,7 +2670,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Isiphathi sekholi"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Ukusakazwa okuphuthumayo"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Izexwayiso zesimo esiphuthumayo"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Imisebenzi yenethiwekhi"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Amagama wephoyinti lokufinyelela"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Imodi ye-4G LTE ethuthukisiwe"</string>
@@ -2730,6 +2739,7 @@
     <string name="sim_pref_divider" msgid="6778907671867621874">"I-SIM ethandekayo ye-"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Buza njalo"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Ukukhetha kuyadingeka"</string>
+    <string name="sim_selection_channel_title" msgid="2760909074892782589">"Ukhetho lwe-SIM"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Izilungiselelo"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
       <item quantity="one">Bonisa izinto ezingu-%d ezifihliwe</item>
@@ -2881,18 +2891,19 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Izaziso zohlelo lokusebenza"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Isigaba sezaziso"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Ukubaluleka"</string>
-    <string name="notification_importance_unspecified" msgid="2196023702875112081">"Vumela uhlelo lokusebenza lunqume"</string>
+    <string name="notification_importance_unspecified" msgid="6622173510486113958">"Vumela umsindo"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Ungalokothi ubonise izaziso"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Awukho umsindo noma ukuphazamiseka okubukwayo"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Awukho umsindo"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Yenza umsindo"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Yenza umsindo ne-pop kusikrini"</string>
+    <string name="notification_importance_high_silent" msgid="2667033773703765252">"I-pop kusikrini"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Okuphansi"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Okumaphakathi"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Okuphezulu"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Okuphuthumayo"</string>
-    <string name="allow_sound" msgid="1820188704793497324">"Vumela umsindo"</string>
-    <string name="show_silently_summary" msgid="7616604629123146565">"Ungenzi umsindo, ukudlidlizela, noma ubheke lezi zaziso kusikrini samanje."</string>
+    <string name="allow_interruption" msgid="7136150018111848721">"Vumela ukuphazamisa"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Vumela uhlelo lokusebenza ukwenza umsindo, ukudlidliza, kanye/noma izaziso ezivela esikrinini"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Ukubaluleka okuphansi"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Ukubaluleka okumaphakathi"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Ukubaluleka okuphezulu"</string>
@@ -2923,7 +2934,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"yenza i-pip kusithombe esiku-"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Isithombe-phakathi-kwesithombe"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Vumela isithombe phakathi kwesithombe"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Vumela lolu hlelo lokusebenza ukuthi ludale iwindi lesithombe ngaphakathi kwesithombe ngenkathi uhlelo lokusebenza luvuliwe noma ngemuva kokuthi ulishiye (isibonelo, ukuze uqhubeke ubuke ividiyo). Leli windi liboniswa ngaphezulu kwezinye izinhlelo zokusebenza ozisebenzisayo."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Vumela lolu hlelo lokusebenza ukuthi ludale iwindi lesithombe ngaphakathi kwesithombe ngenkathi uhlelo lokusebenza luvuliwe noma ngemuva kokuthi ulishiye (isibonelo, ukuze uqhubeke ubuke ividiyo). Leli windi liboniswa ngaphezulu kwezinye izinhlelo zokusebenza ozisebenzisayo."</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Ukufinyelela kokungaphazamisi"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Azikho izinhlelo zokusebenza ezifakiwe ezicele ukufinyelela kokungaphazamisi"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ilayisha izinhlelo zokusebenza..."</string>
@@ -3226,6 +3237,7 @@
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Idlulisela amafayela"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Idlulisela izithombe (i-PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Isebenzisa idivayisi njenge-MIDI"</string>
+    <string name="sms_mirroring_pref" msgid="6475043279147376031">"Ukufanisela i-SMS"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Ukuhlola kwangasemuva"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Ukufinyelela kwangasemuva okuphele"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Sebenzisa umbhalo kusukela kusikrini"</string>
@@ -3368,6 +3380,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="night_display_suggestion_title" msgid="6602129097059325291">"Bona ishejuli yokukhanya kwasebusuku"</string>
+    <string name="night_display_suggestion_summary" msgid="1747638280833631187">"Shintsha i-amber yesikrini ukukusiza ukuthi ulale"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Ukukhanya kwasebusuku kuvuliwe"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Isikrini sefiphazwe nge-amber. Lokhu kungakusiza ukuthi ulale."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Iziphakamiso"</string>
@@ -3386,6 +3400,9 @@
     <string name="color_temperature_desc" msgid="4793729830226404052">"Sebenzisa imibala yesibonisi esipholile"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Ukuze usebenzise ukushintshwa kombala, vala isikrini"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Ukuze usebenzise ushintsho lokuqapha ifoni, qalisa kabusha idivayisi"</string>
+    <string name="camera_hal_hdrplus_switch" msgid="8377365197105267466">"Ikhamera ye-HAL HDR+"</string>
+    <string name="camera_hal_hdrplus_toast" msgid="2063703797270055299">"Ukuze usebenzise ikhamera ye-HAL HDR+ ushintsho, qalisa idivayisi"</string>
+    <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Inzwa ye-Laser yekhamera"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Izibuyekezo zesistimu ezenzakalelayo"</string>
     <string name="usage" msgid="2977875522080448986">"Ukusetshenziswa"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Ukusetshenziswa kwedatha yeselula"</string>
@@ -3411,7 +3428,7 @@
     <string name="data_warning" msgid="209133958008062117">"Isexwayiso sedatha"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Setha umkhawulo wedatha"</string>
     <string name="data_limit" msgid="1885406964934590552">"Umkhawulo wedatha"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> okusetshenziswe phakathi kokungu-<xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="2923744765873163859">"<xliff:g id="ID_1">%1$s</xliff:g> esetsenzisiwe ngomhla ka-<xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Lungiselela"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Ezinye izinhlelo zokusebenza ezifakwe ekusetshenzisweni"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3480,7 +3497,7 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Sula uphinde uguqule"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Setha kabusha ukukhawulela kokulinganisela kwe-ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"Ukukhawulela kokulinganisela kwe-ShortcutManager kusethwe kabusha"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Lawula izaziso zesikrini sokukhiya"</string>
+    <string name="notification_suggestion_title" msgid="387052719462473500">"Lawula ulwazi ekukhiyeni isikrini"</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="8483187649355540109">"Usekelo namathiphu"</string>
@@ -3488,7 +3505,7 @@
     <string name="premium_sms_none" msgid="8268105565738040566">"Azikho izinhlelo zokusebenza ezicele ukufinyelela kwe-Premium SMS"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"I-Premium SMS ingakwenzela izindleko zemali futhi izongeza kumabhili enkampani yenethiwekhi. Uma unika amandla imvume yohlelo lokusebenza, uzokwazi ukuthumela i-premium SMS usebenzisa lolo hlelo lokusebenza."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Ukufinyelela ku-Premium SMS"</string>
-    <string name="bluetooth_disabled" msgid="2456198532288640046">"Akubonakali kwamanye amadivayisi"</string>
+    <string name="bluetooth_disabled" msgid="6244000672828617410">"Valiwe"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Ixhumeke ku-<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Ixhumeke kumadivayisi amaningi"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Imodi yedemo ye-UI yesistimu"</string>
@@ -3590,7 +3607,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Izinhlelo zokusebenza ezisheshayo"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Vula izixhumanisi kuzinhlelo zokusebenza, nanoma zingafakiwe"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Izinhlelo zokusebenza ezisheshayo"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"I-akhawunti yezinhlelo zokusebenza ezisheshayo"</string>
+    <string name="instant_apps_settings" msgid="8827777916518348213">"Okuncamelayo kwezinhlelo zokusebenza ezisheshayo"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Izinhlelo zokusebenza ezifakiwe"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Isitoreji sakho manje siphethwe umphathi wesitoreji"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Ama-akhawunti e-<xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3637,7 +3654,9 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"I-VPN ehlala ivuliwe ivuliwe kuphrofayela yakho yomuntu siqu"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"I-VPN ehlala ivuliwe ivuliwe kuphrofayela yakho yomsebenzi"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Ummeleli we-Global HTTP usethiwe"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Ukuqinisekisa okuthenjwayo"</string>
+    <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"Izifakazeli ezithenjwayo"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"Ukuqinisekisa okwethembekile kuphrofayela yomuntu siqu"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"Ukuqinisekisa okwethembekile kuphrofayela yakho yomsebenzi"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">Izitifiketi ze-CA ezingu-<xliff:g id="COUNT_1">%d</xliff:g></item>
       <item quantity="other">Izitifiketi ze-CA ezingu-<xliff:g id="COUNT_1">%d</xliff:g></item>
@@ -3700,7 +3719,10 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Ulwazi lokuhlinzeka lenkampani yenethiwekhi"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Cupha ukunikezwa kwenkampani yenethiwekhi"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Yini okusha nokujabulisayo?"</string>
-    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Hlola izici ezingu-5 eziphezulu"</string>
+    <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Thatha uhambo lwefoni yakho entsha"</string>
+    <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Thatha uhambo kuthebulethi yakho entsha"</string>
+    <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Thatha uhambo lwedivayisi yakho entsha"</string>
+    <string name="disabled_low_ram_device" msgid="3751578499721173344">"Lesi sici asitholakali kule divayisi"</string>
     <string name="ims_reg_title" msgid="7609782759207241443">"Isimo sokubhaliswa se-IMS"</string>
     <string name="ims_reg_status_registered" msgid="933003316932739188">"Kubhalisiwe"</string>
     <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Akubhalisiwe"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 5e1a468..3984c21 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -316,6 +316,24 @@
         <item>Never time out</item>
     </string-array>
 
+    <!-- Bluetooth developer settings: Titles for maximum number of connected audio devices -->
+    <string-array name="bluetooth_max_connected_audio_devices">
+        <item>1 (Default)</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+    </string-array>
+
+    <!-- Bluetooth developer settings: Values for maximum number of connected audio devices -->
+    <string-array name="bluetooth_max_connected_audio_devices_values">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+    </string-array>
+
     <!-- Match this with drawable.wifi_signal. --> <skip />
     <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
     <string-array name="wifi_signal">
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index acb6ec3..cc677a2 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -15,10 +15,6 @@
 -->
 
 <resources>
-    <declare-styleable name="IconPreferenceScreen">
-        <attr name="icon" />
-    </declare-styleable>
-
     <declare-styleable name="BatteryHistoryChart">
         <!-- Base text color, typeface, size, and style. -->
         <attr name="android:textAppearance" />
@@ -142,12 +138,6 @@
         <attr name="allowDividerBelow" format="boolean" />
     </declare-styleable>
 
-    <!-- For GesturePreference -->
-    <declare-styleable name="GesturePreference">
-        <attr name="animation" format="reference" />
-        <attr name="preview" format="reference" />
-    </declare-styleable>
-
     <declare-styleable name="VideoPreference">
         <attr name="animation" format="reference" />
         <attr name="preview" format="reference" />
@@ -171,4 +161,12 @@
         <attr name="android:gravity" />
     </declare-styleable>
 
+    <!-- For DonutView -->
+    <declare-styleable name="DonutView">
+        <attr name="meterBackgroundColor" format="color" />
+        <attr name="meterConsumedColor" format="color" />
+        <attr name="applyColorAccent" format="boolean" />
+        <attr name="showPercentString" format="boolean" />
+        <attr name="thickness" format="dimension" />
+    </declare-styleable>
 </resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index f1d6923..f964d5e 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -41,6 +41,12 @@
     <!-- Whether to show TelphonyMonitor switch in Developer Options -->
     <bool name="config_show_telephony_monitor">false</bool>
 
+    <!-- Whether to show Camera HAL HDR+ switch in Developer Options -->
+    <bool name="config_show_camera_hal_hdrplus">false</bool>
+
+    <!-- Whether to show Camera laser sensor switch in Developer Options -->
+    <bool name="config_show_camera_laser_sensor">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>
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index af20217..fdb9c32 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -96,12 +96,6 @@
     <!-- Dashboard category panel elevation -->
     <dimen name="dashboard_category_elevation">2dp</dimen>
 
-    <!-- Dashboard category layout height -->
-    <dimen name="dashboard_category_height">48dp</dimen>
-
-    <!-- Dashboard category title margin start -->
-    <dimen name="dashboard_category_title_margin_start">16dp</dimen>
-
     <!-- Dashboard tile minimum height -->
     <dimen name="dashboard_tile_minimum_height">72dp</dimen>
 
@@ -119,26 +113,6 @@
     <dimen name="switchbar_subsettings_margin_start">72dp</dimen>
     <dimen name="switchbar_subsettings_margin_end">16dp</dimen>
 
-    <!-- Search Panel elevation -->
-    <dimen name="search_panel_elevation">4dp</dimen>
-
-    <!-- Search title (recent / results) padding start -->
-    <dimen name="search_title_padding_start">12dp</dimen>
-
-    <!-- Result item image size -->
-    <dimen name="search_result_item_image_size">24dp</dimen>
-
-    <!-- Result item image margin start / end -->
-    <dimen name="search_result_item_image_margin_start">12dp</dimen>
-    <dimen name="search_result_item_image_margin_end">32dp</dimen>
-
-    <!-- Suggestion item image size -->
-    <dimen name="search_suggestion_item_image_size">24dp</dimen>
-
-    <!-- Suggestion item image margin start / end -->
-    <dimen name="search_suggestion_item_image_margin_start">32dp</dimen>
-    <dimen name="search_suggestion_item_image_margin_end">32dp</dimen>
-
     <!-- The following two margins need to match, with the caveat that
          the second should be negative. The second one ensures that the icons and text
          align despite the additional padding caused by the search bar's card background. -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c1c872e..8a685e6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -387,7 +387,7 @@
     <string name="bluetooth_sap_acceptance_dialog_text"><xliff:g id="device_name">%1$s</xliff:g> wants to access your SIM card. Granting access to the SIM card will disable data connectivity on your device for the duration of the connection. Give access to <xliff:g id="device_name">%2$s?</xliff:g></string>
 
     <!-- Description for bluetooth device name summary [CHAR LIMIT=none] -->
-    <string name="bluetooth_device_name_summary">Visible as \'<xliff:g id="device_name">^1</xliff:g>\' to other devices</string>
+    <string name="bluetooth_device_name_summary">Visible as \u201C<xliff:g id="device_name">^1</xliff:g>\u201D to other devices</string>
 
     <!-- Title for paired device group [CHAR LIMIT=none] -->
     <string name="bluetooth_paired_device_title">Your devices</string>
@@ -462,6 +462,8 @@
     <string name="radio_info_roaming_label">Roaming:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_imei_label">IMEI:</string>
+    <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, DO NOT TRANSLATE. -->
+    <string name="radio_info_imsi_label">IMSI:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_call_redirect_label">Call Redirect:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
@@ -832,6 +834,12 @@
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup">Skip</string>
     <!-- Button text to continue to the next screen from the introduction (this string variant is used while in setup wizard) [CHAR LIMIT=22] -->
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup">Next</string>
+    <!-- Title of dialog shown when the user tries to skip setting up fingerprint after adding lock screen during initial setup. [CHAR LIMIT=30] -->
+    <string name="setup_fingerprint_enroll_skip_title">Skip fingerprint?</string>
+    <!-- Body text of dialog shown when the user tries to skip setting up fingerprint after adding lock screen during initial setup [CHAR LIMIT=NONE] -->
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text">Fingerprint setup only takes a minute or two. If you skip this, you can add your fingerprint later in settings.</string>
+    <!-- Title of dialog shown when the user tries to skip setting up a screen lock, warning them of potential consequences of not doing so [CHAR LIMIT=30]-->
+    <string name="lock_screen_intro_skip_title">Skip screen lock?</string>
     <!-- Dialog text shown when the user tries to skip setting up a screen lock, warning them of potential consequences of not doing so, including loss of factory reset protection. (tablet) [CHAR LIMIT=NONE] -->
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet">Device protection features won\u2019t be turned on. You won\u2019t be able to prevent others from using this tablet if it\u2019s lost, stolen or reset.</string>
     <!-- Dialog text shown when the user tries to skip setting up a screen lock, warning them of potential consequences of not doing so, including loss of factory reset protection. (device) [CHAR LIMIT=NONE] -->
@@ -918,6 +926,12 @@
     <!-- Title shown in a dialog which asks the user to confirm when the last fingerprint gets deleted by him. [CHAR LIMIT=50]-->
     <string name="fingerprint_last_delete_title">Remove all fingerprints?</string>
 
+    <!-- Title shown in a dialog which asks the user to confirm when a single fingerprint gets deleted. [CHAR LIMIT=50]-->
+    <string name="fingerprint_delete_title">Remove \'<xliff:g id="fingerprint_id" example="Fingerprint 2">%1$s</xliff:g>\'</string>
+
+    <!-- Message shown in a dialog which asks the user to confirm when a single fingerprint gets deleted. [CHAR LIMIT=NONE]-->
+    <string name="fingerprint_delete_message">Do you want to delete this fingerprint?</string>
+
     <!-- Message shown in a dialog which asks the user to confirm when the last fingerprint gets deleted by him. [CHAR LIMIT=NONE]-->
     <string name="fingerprint_last_delete_message">You won\'t be able to use your fingerprints to
         unlock your phone, authorize purchases, or sign in to apps with them</string>
@@ -1091,8 +1105,8 @@
     <!--  Title for security picker in setup wizard to choose the unlock method: None/Pattern/PIN/Password (phone) [CHAR LIMIT=22] -->
     <string name="setup_lock_settings_picker_title" product="default">Protect your phone</string>
 
-    <!-- Title for screen in setup wizard, prompting user to choose the their backup screen lock method [CHAR LIMIT=NONE] -->
-    <string name="setup_lock_settings_picker_fingerprint_message">For added security, set up a backup screen lock.</string>
+    <!-- Message shown when setting up screen lock, prompting user to choose the their backup screen lock method [CHAR LIMIT=NONE] -->
+    <string name="lock_settings_picker_fingerprint_added_security_message">For added security, set up a backup screen lock.</string>
 
     <!-- Description text for screen in setup wizard asking user to set up screen lock, explaining to the user how setting up a screen lock protect them from losing data. (tablet) [CHAR LIMIT=NONE] -->
     <string name="setup_lock_settings_picker_message" product="tablet">Prevent others from using this tablet without your permission by activating device protection features. Choose the screen lock you want to use.</string>
@@ -1210,36 +1224,36 @@
     <!-- Content of the dialog shown when the user removes the device lock pattern [CHAR LIMIT=NONE] -->
     <string name="unlock_disable_frp_warning_content_pattern">"Device protection features will not work without your pattern."</string>
     <!-- Content of the dialog shown when the user removes the device lock pattern and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint">"Device protection features will not work without your pattern.<xliff:g id="empty_line">\n\n</xliff:g>Your saved fingerprints will also be removed from this device and you won't be able to unlock your phone, authorize purchases, or sign in to apps with them."</string>
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint">"Device protection features will not work without your pattern.<xliff:g id="empty_line">\n\n</xliff:g>Your saved fingerprints will also be removed from this device and you won\'t be able to unlock your phone, authorize purchases, or sign in to apps with them."</string>
     <!-- Content of the dialog shown when the user removes the device lock PIN [CHAR LIMIT=NONE] -->
     <string name="unlock_disable_frp_warning_content_pin">"Device protection features will not work without your PIN."</string>
     <!-- Content of the dialog shown when the user removes the device lock PIN and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint">"Device protection features will not work without your PIN.<xliff:g id="empty_line">\n\n</xliff:g>Your saved fingerprints will also be removed from this device and you won't be able to unlock your phone, authorize purchases, or sign in to apps with them."</string>
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint">"Device protection features will not work without your PIN.<xliff:g id="empty_line">\n\n</xliff:g>Your saved fingerprints will also be removed from this device and you won\'t be able to unlock your phone, authorize purchases, or sign in to apps with them."</string>
     <!-- Content of the dialog shown when the user removes the device lock password [CHAR LIMIT=NONE] -->
     <string name="unlock_disable_frp_warning_content_password">"Device protection features will not work without your password."</string>
     <!-- Content of the dialog shown when the user removes the device lock password and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
-    <string name="unlock_disable_frp_warning_content_password_fingerprint">"Device protection features will not work without your password.<xliff:g id="empty_line">\n\n</xliff:g>Your saved fingerprints will also be removed from this device and you won't be able to unlock your phone, authorize purchases, or sign in to apps with them."</string>
+    <string name="unlock_disable_frp_warning_content_password_fingerprint">"Device protection features will not work without your password.<xliff:g id="empty_line">\n\n</xliff:g>Your saved fingerprints will also be removed from this device and you won\'t be able to unlock your phone, authorize purchases, or sign in to apps with them."</string>
     <!-- Content of the dialog shown when the user removes the device lock of unknown type [CHAR LIMIT=NONE] -->
     <string name="unlock_disable_frp_warning_content_unknown">"Device protection features will not work without your screen lock."</string>
     <!-- Content of the dialog shown when the user removes the device lock of unknown type and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint">"Device protection features will not work without your screen lock.<xliff:g id="empty_line">\n\n</xliff:g>Your saved fingerprints will also be removed from this device and you won't be able to unlock your phone, authorize purchases, or sign in to apps with them."</string>
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint">"Device protection features will not work without your screen lock.<xliff:g id="empty_line">\n\n</xliff:g>Your saved fingerprints will also be removed from this device and you won\'t be able to unlock your phone, authorize purchases, or sign in to apps with them."</string>
 
     <!-- Content of the dialog shown when the user removes the profile lock pattern [CHAR LIMIT=NONE] -->
     <string name="unlock_disable_frp_warning_content_pattern_profile">"Profile protection features will not work without your pattern."</string>
     <!-- Content of the dialog shown when the user removes the profile lock pattern and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile">"Profile protection features will not work without your pattern.<xliff:g id="empty_line">\n\n</xliff:g>Your saved fingerprints will also be removed from this profile and you won't be able to unlock your profile, authorize purchases, or sign in to apps with them."</string>
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile">"Profile protection features will not work without your pattern.<xliff:g id="empty_line">\n\n</xliff:g>Your saved fingerprints will also be removed from this profile and you won\'t be able to unlock your profile, authorize purchases, or sign in to apps with them."</string>
     <!-- Content of the dialog shown when the user removes the profile lock PIN [CHAR LIMIT=NONE] -->
     <string name="unlock_disable_frp_warning_content_pin_profile">"Profile protection features will not work without your PIN."</string>
     <!-- Content of the dialog shown when the user removes the profile lock PIN and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile">"Profile protection features will not work without your PIN.<xliff:g id="empty_line">\n\n</xliff:g>Your saved fingerprints will also be removed from this profile and you won't be able to unlock your profile, authorize purchases, or sign in to apps with them."</string>
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile">"Profile protection features will not work without your PIN.<xliff:g id="empty_line">\n\n</xliff:g>Your saved fingerprints will also be removed from this profile and you won\'t be able to unlock your profile, authorize purchases, or sign in to apps with them."</string>
     <!-- Content of the dialog shown when the user removes the profile lock password [CHAR LIMIT=NONE] -->
     <string name="unlock_disable_frp_warning_content_password_profile">"Profile protection features will not work without your password."</string>
     <!-- Content of the dialog shown when the user removes the profile lock password and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile">"Profile protection features will not work without your password.<xliff:g id="empty_line">\n\n</xliff:g>Your saved fingerprints will also be removed from this profile and you won't be able to unlock your profile, authorize purchases, or sign in to apps with them."</string>
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile">"Profile protection features will not work without your password.<xliff:g id="empty_line">\n\n</xliff:g>Your saved fingerprints will also be removed from this profile and you won\'t be able to unlock your profile, authorize purchases, or sign in to apps with them."</string>
     <!-- Content of the dialog shown when the user removes the profile lock of unknown type [CHAR LIMIT=NONE] -->
     <string name="unlock_disable_frp_warning_content_unknown_profile">"Profile protection features will not work without your screen lock."</string>
     <!-- Content of the dialog shown when the user removes the profile lock of unknown type and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile">"Profile protection features will not work without your screen lock.<xliff:g id="empty_line">\n\n</xliff:g>Your saved fingerprints will also be removed from this profile and you won't be able to unlock your profile, authorize purchases, or sign in to apps with them."</string>
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile">"Profile protection features will not work without your screen lock.<xliff:g id="empty_line">\n\n</xliff:g>Your saved fingerprints will also be removed from this profile and you won\'t be able to unlock your profile, authorize purchases, or sign in to apps with them."</string>
 
     <!-- Affirmative action of the dialog shown when the user removes the device lock [CHAR LIMIT=25] -->
     <string name="unlock_disable_frp_warning_ok">Yes, remove</string>
@@ -1367,6 +1381,9 @@
     <!-- Label for ChoosePassword/PIN OK button -->
     <string name="lockpassword_cancel_label">Cancel</string>
 
+    <!-- Label for ChoosePassword/PIN Clear button that clears all text entered by the user so far. -->
+    <string name="lockpassword_clear_label">Clear</string>
+
     <!-- Label for LockPatternTutorial Cancel button -->
     <string name="lockpattern_tutorial_cancel_label">Cancel</string>
 
@@ -1584,6 +1601,16 @@
     <!-- Bluetooth settings.  Dock Setting Dialog - Remember setting and don't ask user again -->
     <string name="bluetooth_dock_settings_remember">Remember settings</string>
 
+    <!-- Setting Checkbox title for disabling Bluetooth inband ringing in Development Settings -->
+    <string name="bluetooth_disable_inband_ringing">Disable in-band ringing</string>
+    <!-- Summary of checkbox for disabling Bluetooth inband ringing in Development Settings -->
+    <string name="bluetooth_disable_inband_ringing_summary">Don’t play custom phone ringtones on Bluetooth headsets</string>
+
+    <!-- Bluetooth developer settings: Maximum number of connected audio devices -->
+    <string name="bluetooth_max_connected_audio_devices_string">Maximum number of connected Bluetooth audio devices</string>
+    <!-- Bluetooth developer settings: Maximum number of connected audio devices -->
+    <string name="bluetooth_max_connected_audio_devices_dialog_title">Select maximum number of connected Bluetooth audio devices</string>
+
     <!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->
     <string name="wifi_display_settings_title">Cast</string>
     <!-- Wifi Display settings. The title of a menu item to enable wireless display [CHAR LIMIT=40] -->
@@ -1824,11 +1851,11 @@
     <string name="wifi_wps_failed_generic">WPS failed. Please try again in a few minutes.</string>
     <!-- Text displayed when WPS fails due to WEP [CHAR LIMIT=150] -->
     <string name="wifi_wps_failed_wep">The wireless router security setting (WEP) is not supported</string>
-     <!-- Text displayed when WPS fails to TKIP [CHAR LIMIT=150] -->
+    <!-- Text displayed when WPS fails to TKIP [CHAR LIMIT=150] -->
     <string name="wifi_wps_failed_tkip">The wireless router security setting (TKIP) is not supported</string>
-     <!-- Text displayed when WPS fails due to authentication issues [CHAR LIMIT=150] -->
+    <!-- Text displayed when WPS fails due to authentication issues [CHAR LIMIT=150] -->
     <string name="wifi_wps_failed_auth">Authentication failure. Please try again.</string>
-     <!-- Text displayed when WPS fails due to another session [CHAR LIMIT=150] -->
+    <!-- Text displayed when WPS fails due to another session [CHAR LIMIT=150] -->
     <string name="wifi_wps_failed_overlap">Another WPS session was detected. Please try again in a few minutes.</string>
     <!-- Text displayed when WPS fails due to wifi disconnected [CHAR LIMIT=150] -->
     <string name="wifi_wps_failed_wifi_disconnected">Wi\u2011Fi disconnected. WPS setup canceled.</string>
@@ -1908,6 +1935,11 @@
     <!-- Message in WriteWifiConfigToNfcDialog when prompted to enter network password [CHAR_LIMIT=40] -->
     <string name="wifi_wps_nfc_enter_password">Enter your network password</string>
 
+    <!-- Message in dialog when the user tries to connect to a carrier network[CHAR_LIMIT=40] -->
+    <string name="wifi_carrier_connect">Carrier Wi\u2011Fi network</string>
+    <!-- Message in dialog when the user tries to connect to a carrier network[CHAR_LIMIT=60] -->
+    <string name="wifi_carrier_content">Connect via <xliff:g id="name">%1$s</xliff:g></string>
+
     <string name="wifi_scan_always_turnon_message">To improve location accuracy and for other purposes, <xliff:g id="app_name">%1$s</xliff:g> wants to turn on network scanning, even when Wi-Fi is off.\n\nAllow this for all apps that want to scan?</string>
     <!-- Message informing the user how to turn off  [CHAR LIMIT=200] -->
     <string name="wifi_scan_always_turnoff_message">To turn this off, go to Advanced in the overflow menu.</string>
@@ -1939,6 +1971,8 @@
     <string name="wifi_failed_connect_message">Failed to connect to network</string>
     <!-- Button label to delete a Wi-Fi network -->
     <string name="wifi_forget">Forget</string>
+    <!-- Button label to modify a Wi-Fi network -->
+    <string name="wifi_modify">Modify</string>
     <!-- Failured notification for forget -->
     <string name="wifi_failed_forget_message">Failed to forget network</string>
     <!-- Button label to save a Wi-Fi network configuration -->
@@ -1965,6 +1999,8 @@
     <string name="wifi_advanced_ip_address_title">IP address</string>
 
     <!-- Wifi Network Details -->
+    <!-- Wifi details title-->
+    <string name="wifi_details_title">Network info</string>
     <!-- Wifi details preference title to display router IP subnet mask -->
     <string name="wifi_details_subnet_mask">Subnet mask</string>
     <!-- Wifi details preference title to display router DNS info -->
@@ -2032,8 +2068,6 @@
     <string name="wifi_p2p_delete_group_message">Forget this group?</string>
 
     <!-- Wifi AP settings-->
-    <!-- Label for Wifi tether checkbox. Toggles Access Point on/off -->
-    <string name="wifi_tether_checkbox_text">Portable Wi\u2011Fi hotspot</string>
     <!-- Label for Wifi tether checkbox. Toggles Access Point on/off  [CHAR LIMIT=30] -->
     <string name="wifi_hotspot_checkbox_text">Wi\u2011Fi hotspot</string>
     <!-- Summary text when turning hotspot off -->
@@ -2047,13 +2081,13 @@
 
     <!-- Wifi hotspot settings -->
     <!-- Label for Wifi hotspot name. -->
-    <string name="wifi_hotspot_name_title">Wi\u2011Fi name</string>
+    <string name="wifi_hotspot_name_title">Hotspot name</string>
     <!-- Summary for Wifi hotspot name when connection is in progress. -->
     <string name="wifi_hotspot_name_summary_connecting">Turning on <xliff:g id="wifi_hotspot_name">%1$s</xliff:g>...</string>
     <!-- Summary for Wifi hotspot name when connected. -->
     <string name="wifi_hotspot_name_summary_connected">Other devices can connect to <xliff:g id="wifi_hotspot_name">%1$s</xliff:g></string>
     <!-- Label for Wifi hotspot password. -->
-    <string name="wifi_hotspot_password_title">Wi\u2011Fi password</string>
+    <string name="wifi_hotspot_password_title">Hotspot password</string>
     <!-- Label for Wifi hotspot AP Band. -->
     <string name="wifi_hotspot_ap_band_title">AP Band</string>
     <!-- Wifi hotspot footer info for regular hotspot [CHAR LIMIT=NONE]-->
@@ -2213,7 +2247,7 @@
     <!-- Title of a preference for updating emergency address [CHAR LIMIT=40] -->
     <string name="emergency_address_title">Update Emergency Address</string>
     <!-- Summary of Update Emergency Address preference, explaining usage of emergency address [CHAR LIMIT=NONE] -->
-    <string name="emergency_address_summary">Address used by emergency services as your location if you make a 911 call using WiFi</string>
+    <string name="emergency_address_summary">Address used by emergency services as your location if you make an emergency call using Wi\u2011Fi</string>
 
 
     <!-- Sound and alerts settings -->
@@ -2337,6 +2371,9 @@
     <!-- There are no search results for the user's search [CHAR LIMIT=NONE]-->
     <string name="search_settings_no_results">No results</string>
 
+    <!-- Button to clear all search history in Settings [CHAR LIMIT=40]-->
+    <string name="search_clear_history">Clear history</string>
+
     <!-- Display settings --><skip/>
     <!-- Sound & display settings screen, section header for settings related to display -->
     <string name="display_settings">Display</string>
@@ -3101,11 +3138,14 @@
 
 
     <!-- Title for a screen containing all device reset options [CHAR LIMIT=50] -->
-    <string name="reset_dashboard_title">Reset</string>
+    <string name="reset_dashboard_title">Reset options</string>
+
+    <!-- Summary text for a screen containing all device reset options [CHAR LIMIT=None] -->
+    <string name="reset_dashboard_summary">Network, apps, or device can be reset</string>
 
     <!-- Reset Network -->
-    <!-- SD card & phone storage settings screen, setting option name under Backup & Restore heading -->
-    <string name="reset_network_title">Network settings reset</string>
+    <!-- Button title to reset Wi-Fi settings, Mobile data setting, bluetooth settings -->
+    <string name="reset_network_title">Reset Wi-Fi, mobile &amp; Bluetooth</string>
     <!-- SD card & phone storage settings screen, message on screen after user selects Reset network settings [CHAR LIMIT=NONE] -->
     <string name="reset_network_desc">This will reset all network settings, including:\n\n<li>Wi\u2011Fi</li>\n<li>Mobile data</li>\n<li>Bluetooth</li>"</string>
     <!-- SD card & phone storage settings screen, button on screen after user selects Reset network settings -->
@@ -3122,14 +3162,8 @@
     <string name="reset_network_complete_toast">Network settings have been reset</string>
 
     <!-- Master Clear -->
-    <!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading -->
-    <string name="master_clear_title">Factory data reset</string>
-    <!-- Summary text for factory data reset describing what will be reset [CHAR_LIMIT=NONE]-->
-    <plurals name="master_clear_with_account_summary">
-        <item quantity="one">1 account will be reset</item>
-        <item quantity="other"><xliff:g id="account_count">%1$d</xliff:g> accounts will be reset</item>
-    </plurals>
-    <string name="master_clear_summary">Internal storage &amp; all data will be reset</string>
+    <!-- Button title to factory data reset the entire device -->
+    <string name="master_clear_title">Erase all data (factory reset)</string>
     <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
     <string name="master_clear_desc" product="tablet">"This will erase all data from your tablet\u2019s <b>internal storage</b>, including:\n\n<li>Your Google account</li>\n<li>System and app data and settings</li>\n<li>Downloaded apps</li>"</string>
     <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
@@ -3405,24 +3439,26 @@
     <string name="settings_safetylegal_activity_loading">Loading\u2026</string>
 
     <!-- Lock Pattern settings -->
-    <!-- Header on first screen of choose password/PIN flow [CHAR LIMIT=30] -->
-    <string name="lockpassword_choose_your_password_header">Choose your password</string>
+    <!-- Header on first screen of choose password/PIN flow [CHAR LIMIT=40] -->
+    <string name="lockpassword_choose_your_screen_lock_header">Set a screen lock</string>
+    <!-- Message on first screen of choose password flow [CHAR LIMIT=NONE] -->
+    <string name="lockpassword_choose_your_password_message">For security, set a password</string>
     <!-- Header on first screen of choose password/PIN as backup for fingerprint flow [CHAR LIMIT=30] -->
     <string name="lockpassword_choose_your_password_header_for_fingerprint">To use fingerprint, set password</string>
     <!-- Header on first screen of choose pattern flow [CHAR LIMIT=30] -->
     <string name="lockpassword_choose_your_pattern_header">Choose your pattern</string>
     <!-- Header on first screen of choose pattern as backup for fingerprint flow [CHAR LIMIT=30] -->
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint">To use fingerprint, set pattern</string>
-    <!-- Header on first screen of choose password/PIN flow [CHAR LIMIT=30] -->
-    <string name="lockpassword_choose_your_pin_header">Choose your PIN</string>
+    <!-- Message on first screen of choose PIN flow [CHAR LIMIT=NONE] -->
+    <string name="lockpassword_choose_your_pin_message">For security, set a PIN</string>
     <!-- Header on first screen of choose password/PIN as backup for fingerprint flow [CHAR LIMIT=30] -->
     <string name="lockpassword_choose_your_pin_header_for_fingerprint">To use fingerprint, set PIN</string>
-    <!-- Header on password confirm screen [CHAR LIMIT=30] -->
-    <string name="lockpassword_confirm_your_password_header">Confirm your password</string>
+    <!-- Header on password confirm screen [CHAR LIMIT=40] -->
+    <string name="lockpassword_confirm_your_password_header">Re-enter your password</string>
     <!-- Header on pattern confirm screen [CHAR LIMIT=30] -->
     <string name="lockpassword_confirm_your_pattern_header">Confirm your pattern</string>
-    <!-- Header on password confirm screen [CHAR LIMIT=30] -->
-    <string name="lockpassword_confirm_your_pin_header">Confirm your PIN</string>
+    <!-- Header on password confirm screen [CHAR LIMIT=40] -->
+    <string name="lockpassword_confirm_your_pin_header">Re-enter your PIN</string>
     <!-- Header on password confirm screen if second password doesn't match the first. [CHAR LIMIT=30] -->
     <string name="lockpassword_confirm_passwords_dont_match">Passwords don\u2019t match</string>
     <!-- Header on pin confirm screen if second pin doesn't match the first. [CHAR LIMIT=30]-->
@@ -3455,19 +3491,48 @@
          particular operation. [CHAR LIMIT=70]-->
     <string name="lockpassword_confirm_your_password_generic_profile">Enter your work password to continue</string>
 
-    <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=100] -->
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern">Use your device pattern to continue. Required after device restarts.</string>
-    <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=100] -->
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin">Enter your device PIN to continue. Required after device restarts.</string>
-    <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=100] -->
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password">Enter your device password to continue. Required after device restarts.</string>
+    <!-- This string shows up on a screen where a user can enter a pattern that
+         unlocks their device. This is an extra security measure that's required for them to
+         continue. [CHAR LIMIT=100] -->
+    <string name="lockpassword_strong_auth_required_device_pattern">For added security, use your device pattern</string>
+    <!-- This string shows up on a screen where a user can enter a PIN that unlocks their device.
+         This is an extra security measure that's required for them to continue. [CHAR LIMIT=100]
+         -->
+    <string name="lockpassword_strong_auth_required_device_pin">For added security, enter your device PIN</string>
+    <!-- This string shows up on a screen where a user can enter a password that unlocks their
+         device. This is an extra security measure that's required for them to continue. [CHAR
+         LIMIT=100] -->
+    <string name="lockpassword_strong_auth_required_device_password">For added security, enter your device password</string>
 
-    <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=100] -->
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern">Use your work pattern to continue. Required after device restarts.</string>
-    <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=100] -->
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin">Enter your work PIN to continue. Required after device restarts.</string>
-    <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=100] -->
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password">Enter your work password to continue. Required after device restarts.</string>
+    <!-- This string shows up on a screen where a user can enter a pattern that lets them access
+         their work profile, which is a part of their device that's specifically for work apps and
+         managed by their employer. This is an extra security measure that's required for them to
+         continue. [CHAR LIMIT=100] -->
+    <string name="lockpassword_strong_auth_required_work_pattern">For added security, use your work pattern</string>
+    <!-- This string shows up on a screen where a user can enter a PIN that lets them access their
+         work profile, which is a part of their device that's specifically for work apps and managed
+         by their employer. This is an extra security measure that's required for them to continue.
+         [CHAR LIMIT=100] -->
+    <string name="lockpassword_strong_auth_required_work_pin">For added security, enter your work PIN</string>
+    <!-- This string shows up on a screen where a user can enter a password that lets them access
+         their work profile, which is a part of their device that's specifically for work apps and
+         managed by their employer. This is an extra security measure that's required for them to
+         continue. [CHAR LIMIT=100] -->
+    <string name="lockpassword_strong_auth_required_work_password">For added security, enter your work password</string>
+
+    <!-- An explanation text that the pattern needs to be solved because the device was factory reset. [CHAR LIMIT=100] -->
+    <string name="lockpassword_confirm_your_pattern_details_frp">Your phone was reset to factory settings. To use this phone, enter your previous pattern.</string>
+    <!-- An explanation text that the pin needs to be solved because the device was factory reset. [CHAR LIMIT=100] -->
+    <string name="lockpassword_confirm_your_pin_details_frp">Your phone was reset to factory settings. To use this phone, enter your previous PIN.</string>
+    <!-- An explanation text that the password needs to be solved because the device was factory reset. [CHAR LIMIT=100] -->
+    <string name="lockpassword_confirm_your_password_details_frp">Your phone was reset to factory settings. To use this phone, enter your previous password.</string>
+
+    <!-- Header shown when pattern needs to be solved because the device was factory reset. [CHAR LIMIT=100] -->
+    <string name="lockpassword_confirm_your_pattern_header_frp">Verify pattern</string>
+    <!-- Header shown when the pin needs to be solved because the device was factory reset. [CHAR LIMIT=100] -->
+    <string name="lockpassword_confirm_your_pin_header_frp">Verify PIN</string>
+    <!-- Header shown when the password needs to be solved because the device was factory reset. [CHAR LIMIT=100] -->
+    <string name="lockpassword_confirm_your_password_header_frp">Verify password</string>
 
     <!-- Security & location settings screen, change security method screen instruction if user
          enters incorrect PIN [CHAR LIMIT=30] -->
@@ -3903,7 +3968,7 @@
     <!-- Descriptive text of a running process: singular process, plural service. -->
     <string name="running_processes_item_description_s_p"><xliff:g id="numprocess">%1$d</xliff:g>
         process and <xliff:g id="numservices">%2$d</xliff:g> services</string>
-     <!-- Descriptive text of a running process: plural process, singular service. -->
+    <!-- Descriptive text of a running process: plural process, singular service. -->
     <string name="running_processes_item_description_p_s"><xliff:g id="numprocess">%1$d</xliff:g>
         processes and <xliff:g id="numservices">%2$d</xliff:g> service</string>
     <!-- Descriptive text of a running process: plural process, plural service. -->
@@ -4178,27 +4243,6 @@
     <!-- Text for checkbox that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
     <string name="allow_bind_app_widget_activity_always_allow_bind">Always allow <xliff:g id="widget_host_name">%1$s</xliff:g> to create widgets and access their data</string>
 
-    <!-- Used to show an amount of time in the form "d days, h hours, m minutes, s seconds" in BatteryHistory -->
-    <string name="battery_history_days"><xliff:g id="days">%1$d</xliff:g>d <xliff:g id="hours">%2$d</xliff:g>h <xliff:g id="minutes">%3$d</xliff:g>m <xliff:g id="seconds">%4$d</xliff:g>s</string>
-
-    <!-- Used to show an amount of time in the form "h hours, m minutes, s seconds" in BatteryHistory -->
-    <string name="battery_history_hours"><xliff:g id="hours">%1$d</xliff:g>h <xliff:g id="minutes">%2$d</xliff:g>m <xliff:g id="seconds">%3$d</xliff:g>s</string>
-
-    <!-- Used to show an amount of time in the form "m minutes, s seconds" in BatteryHistory -->
-    <string name="battery_history_minutes"><xliff:g id="minutes">%1$d</xliff:g>m <xliff:g id="seconds">%2$d</xliff:g>s</string>
-
-    <!-- Used to show an amount of time in the form "s seconds" in BatteryHistory -->
-    <string name="battery_history_seconds"><xliff:g id="seconds">%1$d</xliff:g>s</string>
-
-    <!-- Used to show an amount of time in the form "d days, h hours, m minutes, s seconds" in BatteryHistory -->
-    <string name="battery_history_days_no_seconds"><xliff:g id="days">%1$d</xliff:g>d <xliff:g id="hours">%2$d</xliff:g>h <xliff:g id="minutes">%3$d</xliff:g>m</string>
-
-    <!-- Used to show an amount of time in the form "h hours, m minutes, s seconds" in BatteryHistory -->
-    <string name="battery_history_hours_no_seconds"><xliff:g id="hours">%1$d</xliff:g>h <xliff:g id="minutes">%2$d</xliff:g>m</string>
-
-    <!-- Used to show an amount of time in the form "m minutes, s seconds" in BatteryHistory -->
-    <string name="battery_history_minutes_no_seconds"><xliff:g id="minutes">%1$d</xliff:g>m</string>
-
     <!-- XXX remove? Strings used for displaying usage statistics -->
     <string name="usage_stats_label">Usage statistics</string>
 
@@ -4227,7 +4271,7 @@
     <!-- Settings description for a brief version of Vision-Related Accessibility Settings. Tells the user that they can adjust these settings now to help them through the remainder of the Setup Wizard and that they can later be changed in Settings. Displayed in Setup Wizard only. [CHAR LIMIT=none] -->
     <string name="vision_settings_description">You can customize this device to fit your needs. These accessibility features can be changed later in Settings.</string>
     <!-- Label for suggested action which will allow the user to change the font size and other accessibility settings. [CHAR LIMIT=40] -->
-    <string name="vision_settings_suggestion_title">Increase font size</string>
+    <string name="vision_settings_suggestion_title">Change font size</string>
     <!-- Title for the accessibility preference category of screen reader services and settings. [CHAR LIMIT=50] -->
     <string name="screen_reader_category_title">Screen readers</string>
     <!-- Title for the accessibility preference category of audio services and settings. [CHAR LIMIT=50] -->
@@ -4268,14 +4312,14 @@
     <string name="accessibility_screen_magnification_navbar_summary">When magnification is turned on, use the Accessibility button at the bottom of the screen to quickly magnify.\n\n<b>To zoom</b>, tap the Accessibility button, then tap anywhere on the screen.\n<ul><li>Drag 2 or more fingers to scroll</li>\n<li>Pinch 2 or more fingers to adjust zoom</li></ul>\n\n<b>To zoom temporarily</b>, tap the Accessibility button, then touch &amp; hold anywhere on the screen.\n<ul><li>Drag to move around the screen</li>\n<li>Lift finger to zoom out</li></ul>\n\nYou can’t zoom in on the keyboard or navigation bar.</string>
     <!-- Summary text appearing on the accessibility preference screen to enable screen magnification from the nav bar when the feature is enabled, but the accessibility button is not configured correctly for the feature to be used [CHAR LIMIT=none] -->
     <string name="accessibility_screen_magnification_navbar_configuration_warning">The Accessibility button is set to <xliff:g id="service" example="Select to Speak">%1$s</xliff:g>. To use magnification, touch &amp; hold the Accessibility button, then select magnification.</string>
-    <!-- Title for the preference to configure the accessibility shortcut. [CHAR LIMIT=35] -->
-    <string name="accessibility_global_gesture_preference_title">Accessibility shortcut</string>
+    <!-- Title for the preference to configure the accessibility shortcut, which uses the volume keys. [CHAR LIMIT=35] -->
+    <string name="accessibility_global_gesture_preference_title">Volume key shortcut</string>
     <!-- Title for the preference to choose the service that is turned on and off by the accessibility shortcut. [CHAR LIMIT=35] -->
     <string name="accessibility_shortcut_service_title">Shortcut service</string>
     <!-- Title for the switch preference that controls whether or not the accessibility shortcut works on the lock screen. [CHAR LIMIT=35] -->
     <string name="accessibility_shortcut_service_on_lock_screen_title">Allow from lock screen</string>
     <!-- Description of accessibility shortcut. [CHAR LIMIT=NONE] -->
-    <string name="accessibility_shortcut_description">When the shortcut is on, you can press both volume buttons for 3 seconds to start an accessibility feature.</string>
+    <string name="accessibility_shortcut_description">When the shortcut is on, you can press both volume keys for 3 seconds to start an accessibility feature.</string>
     <!-- Title for the accessibility preference to high contrast text. [CHAR LIMIT=35] -->
     <string name="accessibility_toggle_high_text_contrast_preference_title">High contrast text</string>
     <!-- Title for the accessibility preference to auto update screen magnification. [CHAR LIMIT=35] -->
@@ -4303,8 +4347,6 @@
     <!-- Title for accessibility preference for configuring amount of time that has to pass after pointer stops moving before click action can be performed (if automatic click after pointer stops moving feature is enabled). [CHAR LIMIT=NONE] -->
     <string name="accessibility_autoclick_delay_preference_title">Delay before click</string>
 
-    <!-- Summary text for accessibility service preferences, or preferences including a short description (eg. "ON / High accuracy mode"). -->
-    <string name="accessibility_summary_default_combination"><xliff:g id="state" example="ON">%1$s</xliff:g> / <xliff:g id="description" example="High accuracy mode">%2$s</xliff:g></string>
     <!-- Preference's state when enabled. Note: UPPERCASE -->
     <string name="accessibility_summary_state_enabled">ON</string>
     <!-- Preference's state when disabled. Note: UPPERCASE -->
@@ -4475,7 +4517,7 @@
     <!-- Accessibility settings: button for lauching settings for an accessibility service -->
     <string name="settings_button">Settings</string>
 
-     <!-- Printing settings -->
+    <!-- Printing settings -->
     <skip />
 
     <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
@@ -5530,6 +5572,9 @@
     <!--  action to select all [CHAR LIMIT=30] -->
     <string name="select_all">Select all</string>
 
+    <!-- A button that gets displayed in data plan usage preference in settings page to manage data plans [CHAR LIMIT=25] -->
+    <string name="data_plan_usage_manage_plans_button_text">Manage plans</string>
+
     <!-- Activity title for network data usage summary. [CHAR LIMIT=25] -->
     <string name="data_usage_summary_title">Data usage</string>
     <!-- Activity title for Appk data usage summary. [CHAR LIMIT=25] -->
@@ -5719,6 +5764,13 @@
     <!-- Body text prompting user to enable Wi-Fi to configure metered networks. [CHAR LIMIT=64] -->
     <string name="data_usage_metered_wifi_disabled">To select metered networks, turn Wi\u2011Fi on.</string>
 
+    <!-- Option for indicating that a network being metered (expensive) should be determined automatically. [CHAR LIMIT=32] -->
+    <string name="data_usage_metered_auto">Automatic</string>
+    <!-- Option for indicating that a network is metered (expensive). [CHAR LIMIT=32] -->
+    <string name="data_usage_metered_yes">Metered</string>
+    <!-- Option for indicating that a network is not metered (inexpensive). [CHAR LIMIT=32] -->
+    <string name="data_usage_metered_no">Not metered</string>
+
     <!-- Disclaimer string for data usage measured by device. [CHAR LIMIT=80] -->
     <string name="data_usage_disclaimer">Carrier data accounting may differ from your device.</string>
 
@@ -6795,8 +6847,8 @@
     <!-- [CHAR LIMIT=100] Notification importance screen title -->
     <string name="notification_importance_title">Importance</string>
 
-    <!-- [CHAR LIMIT=100] Notification Importance: unspecified importance level description -->
-    <string name="notification_importance_unspecified">Let the app decide</string>
+    <!-- [CHAR LIMIT=100 BACKUP_MESSAGE_ID=1820188704793497324] Notification Importance: unspecified importance level description -->
+    <string name="notification_importance_unspecified">Allow sound</string>
 
     <!-- [CHAR LIMIT=100] Notification Importance: blocked importance level description -->
     <string name="notification_importance_blocked">Never show notifications</string>
@@ -6819,6 +6871,10 @@
     <!-- [CHAR LIMIT=100] Notification Importance: high importance level description -->
     <string name="notification_importance_high">Make sound and pop on screen</string>
 
+    <!-- [CHAR LIMIT=100] Notification Importance: high importance level description,
+     when the user has picked high importance but disabled sound for it -->
+    <string name="notification_importance_high_silent">Pop on screen</string>
+
     <!-- Importance title strings for the Importance page. Also the first part of the importance
      summary on the channel page-->
 
@@ -6834,11 +6890,11 @@
     <!-- [CHAR LIMIT=100] Notification Importance title: high importance level title -->
     <string name="notification_importance_high_title">Urgent</string>
 
-    <!-- [CHAR LIMIT=40 BACKUP_MESSAGE_ID:6585849855452076626] Notification importance title -->
-    <string name="allow_sound">Allow sound</string>
+    <!-- [CHAR LIMIT=40] Notification importance title. This setting controls how notifications in older apps may alert the user (eg, sound, visual, vibrate). -->
+    <string name="allow_interruption">Allow interruptions</string>
 
-    <!-- [CHAR LIMIT=180] Notification importance summary -->
-    <string name="show_silently_summary">Don\'t make sound, vibrate, or peek these notifications into view on the current screen.</string>
+    <!-- [CHAR LIMIT=180] Notification importance description. More details from allow_interruption string - specifics of how notifications may interrupt. -->
+    <string name="allow_interruption_summary">Let the app make sound, vibrate, and/or pop notifications on screen</string>
 
     <!-- Channel summaries for the app notification page -->
 
@@ -6938,7 +6994,7 @@
     <string name="picture_in_picture_app_detail_switch">Allow picture-in-picture</string>
 
     <!-- Apps > App Details > Picture-in-picture > Description. [CHAR LIMIT=NONE] -->
-    <string name="picture_in_picture_app_detail_summary">Allow this app to create a picture-in-picture window while the app is open or after you leave it (for example, to continue watching a video).  This window displays on top of other apps you're using.</string>
+    <string name="picture_in_picture_app_detail_summary">Allow this app to create a picture-in-picture window while the app is open or after you leave it (for example, to continue watching a video).  This window displays on top of other apps you\'re using.</string>
 
     <!-- Sound & notification > Advanced section: Title for managing Do Not Disturb access option. [CHAR LIMIT=40] -->
     <string name="manage_zen_access_title">Do Not Disturb access</string>
@@ -7267,8 +7323,8 @@
     <string name="notification_app_settings_button">Notification settings</string>
 
 
-   <!-- [CHAR LIMIT=35] Feedback on the device -->
-   <string name="device_feedback">Send feedback about this device</string>
+    <!-- [CHAR LIMIT=35] Feedback on the device -->
+    <string name="device_feedback">Send feedback about this device</string>
 
     <!-- Full package name of OEM preferred device feedback reporter [DO NOT TRANSLATE] -->
     <string name="oem_preferred_feedback_reporter" translatable="false"></string>
@@ -7335,66 +7391,66 @@
     <!-- Button label to say no to the question of whether to require PIN/password/pattern to start your device. [CHAR LIMIT=20] -->
     <string name="encryption_interstitial_no">No</string>
 
-   <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
-   <string name="encrypt_talkback_dialog_require_pin">Require PIN?</string>
+    <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
+    <string name="encrypt_talkback_dialog_require_pin">Require PIN?</string>
 
-   <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
-   <string name="encrypt_talkback_dialog_require_pattern">Require pattern?</string>
+    <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
+    <string name="encrypt_talkback_dialog_require_pattern">Require pattern?</string>
 
-   <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
-   <string name="encrypt_talkback_dialog_require_password">Require password?</string>
+    <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
+    <string name="encrypt_talkback_dialog_require_password">Require password?</string>
 
-   <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
-   <string name="encrypt_talkback_dialog_message_pin">When you enter your PIN to start this device, accessibility services like <xliff:g id="service" example="TalkBack">%1$s</xliff:g> won\u2019t yet be available.</string>
+    <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
+    <string name="encrypt_talkback_dialog_message_pin">When you enter your PIN to start this device, accessibility services like <xliff:g id="service" example="TalkBack">%1$s</xliff:g> won\u2019t yet be available.</string>
 
-   <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
-   <string name="encrypt_talkback_dialog_message_pattern">When you enter your pattern to start this device, accessibility services like <xliff:g id="service" example="TalkBack">%1$s</xliff:g> won\u2019t yet be available.</string>
+    <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
+    <string name="encrypt_talkback_dialog_message_pattern">When you enter your pattern to start this device, accessibility services like <xliff:g id="service" example="TalkBack">%1$s</xliff:g> won\u2019t yet be available.</string>
 
-   <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
-   <string name="encrypt_talkback_dialog_message_password">When you enter your password to start this device, accessibility services like <xliff:g id="service" example="TalkBack">%1$s</xliff:g> won\u2019t yet be available.</string>
+    <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
+    <string name="encrypt_talkback_dialog_message_password">When you enter your password to start this device, accessibility services like <xliff:g id="service" example="TalkBack">%1$s</xliff:g> won\u2019t yet be available.</string>
 
-   <!-- [CHAR LIMIT=NONE] Dialog body explaining that the app just selected by the user will not work after a reboot until until after the user enters their credentials, such as a PIN or password. -->
-   <string name="direct_boot_unaware_dialog_message">Note: After a reboot, this app can\'t start until you unlock your phone</string>
+    <!-- [CHAR LIMIT=NONE] Dialog body explaining that the app just selected by the user will not work after a reboot until until after the user enters their credentials, such as a PIN or password. -->
+    <string name="direct_boot_unaware_dialog_message">Note: After a reboot, this app can\'t start until you unlock your phone</string>
 
-   <!-- Title and summary for SIM Status -->
-   <string name="imei_information_title">IMEI information</string>
-   <string name="imei_information_summary">IMEI relative information</string>
-   <string name="slot_number">(Slot<xliff:g id="slot_num">%1$d</xliff:g>)</string>
+    <!-- Title and summary for SIM Status -->
+    <string name="imei_information_title">IMEI information</string>
+    <string name="imei_information_summary">IMEI relative information</string>
+    <string name="slot_number">(Slot<xliff:g id="slot_num">%1$d</xliff:g>)</string>
 
-   <!-- New strings needed for App Info 2 -->
-   <!-- Preference label for app default launch settings [CHAR LIMIT=35]-->
-   <string name="launch_by_default">Open by default</string>
+    <!-- New strings needed for App Info 2 -->
+    <!-- Preference label for app default launch settings [CHAR LIMIT=35]-->
+    <string name="launch_by_default">Open by default</string>
 
-   <!-- Category name for App Launch -->
-   <string name="app_launch_domain_links_title">Opening links</string>
-   <string name="app_launch_open_domain_urls_title">Open supported links</string>
-   <string name="app_launch_open_domain_urls_summary">Open without asking</string>
-   <string name="app_launch_supported_domain_urls_title">Supported links</string>
-   <string name="app_launch_other_defaults_title">Other defaults</string>
+    <!-- Category name for App Launch -->
+    <string name="app_launch_domain_links_title">Opening links</string>
+    <string name="app_launch_open_domain_urls_title">Open supported links</string>
+    <string name="app_launch_open_domain_urls_summary">Open without asking</string>
+    <string name="app_launch_supported_domain_urls_title">Supported links</string>
+    <string name="app_launch_other_defaults_title">Other defaults</string>
 
-   <!-- Summary for app storage preference -->
-   <string name="storage_summary_format"><xliff:g id="size" example="30.00MB">%1$s</xliff:g> used in <xliff:g id="storage_type" example="internal memory">%2$s</xliff:g></string>
-   <!-- Summary describing internal storage for applications [CHAR LIMIT=25] -->
-   <string name="storage_type_internal">Internal storage</string>
-   <!-- Summary describing external storage for applications [CHAR LIMIT=25] -->
-   <string name="storage_type_external">External storage</string>
+    <!-- Summary for app storage preference -->
+    <string name="storage_summary_format"><xliff:g id="size" example="30.00MB">%1$s</xliff:g> used in <xliff:g id="storage_type" example="internal memory">%2$s</xliff:g></string>
+    <!-- Summary describing internal storage for applications [CHAR LIMIT=25] -->
+    <string name="storage_type_internal">Internal storage</string>
+    <!-- Summary describing external storage for applications [CHAR LIMIT=25] -->
+    <string name="storage_type_external">External storage</string>
 
-   <!-- Title for data usage screen when entered from app info [CHAR LIMIT=30] -->
-   <string name="app_data_usage">App data usage</string>
-   <!-- Summary for data usage preference [CHAR LIMIT=15] -->
-   <string name="data_summary_format"><xliff:g id="size" example="30.00MB">%1$s</xliff:g> used since <xliff:g id="date" example="Jan 12">%2$s</xliff:g></string>
+    <!-- Title for data usage screen when entered from app info [CHAR LIMIT=30] -->
+    <string name="app_data_usage">App data usage</string>
+    <!-- Summary for data usage preference [CHAR LIMIT=15] -->
+    <string name="data_summary_format"><xliff:g id="size" example="30.00MB">%1$s</xliff:g> used since <xliff:g id="date" example="Jan 12">%2$s</xliff:g></string>
 
-   <!-- Title of storage preference to control where app is stored -->
-   <string name="storage_used">Storage used</string>
+    <!-- Title of storage preference to control where app is stored -->
+    <string name="storage_used">Storage used</string>
 
-   <!-- Title of button to change storage [CHAR LIMIT=25] -->
-   <string name="change">Change</string>
+    <!-- Title of button to change storage [CHAR LIMIT=25] -->
+    <string name="change">Change</string>
 
-   <!-- Title of dialog to change storage [CHAR LIMIT=25] -->
-   <string name="change_storage">Change storage</string>
+    <!-- Title of dialog to change storage [CHAR LIMIT=25] -->
+    <string name="change_storage">Change storage</string>
 
-   <!-- Label for notification settings for an specific app [CHAR LIMIT=40] -->
-     <string name="notifications_label">App notifications</string>
+    <!-- Label for notification settings for an specific app [CHAR LIMIT=40] -->
+    <string name="notifications_label">App notifications</string>
     <!-- App notification summary with notifications enabled [CHAR LIMIT=40] -->
     <string name="notifications_enabled">On</string>
     <!-- Label for showing apps with blocked notifications in list [CHAR LIMIT=30] -->
@@ -7417,17 +7473,17 @@
     <string name="notification_summary_channel"><xliff:g id="channel_name">%1$s</xliff:g> \u2022 <xliff:g id="group_name">%2$s</xliff:g></string>
 
 
-   <!-- Permissions preference summary [CHAR LIMIT=40] -->
+    <!-- Permissions preference summary [CHAR LIMIT=40] -->
     <plurals name="permissions_summary">
-       <item quantity="one"><xliff:g id="count" example="1">%d</xliff:g> permission granted</item>
-       <item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> permissions granted</item>
+        <item quantity="one"><xliff:g id="count" example="1">%d</xliff:g> permission granted</item>
+        <item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> permissions granted</item>
     </plurals>
 
-   <!-- Runtime permissions preference summary [CHAR LIMIT=40] -->
-   <plurals name="runtime_permissions_summary">
-       <item quantity="one"><xliff:g id="count" example="1">%d</xliff:g> of <xliff:g id="count" example="1">%d</xliff:g> permission granted</item>
-       <item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> of <xliff:g id="count" example="10">%d</xliff:g> permissions granted</item>
-   </plurals>
+    <!-- Runtime permissions preference summary [CHAR LIMIT=40] -->
+    <plurals name="runtime_permissions_summary">
+        <item quantity="one"><xliff:g id="count" example="1">%d</xliff:g> of <xliff:g id="count" example="1">%d</xliff:g> permission granted</item>
+        <item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> of <xliff:g id="count" example="10">%d</xliff:g> permissions granted</item>
+    </plurals>
 
     <!-- Runtime permissions preference summary.  Number of additional permissions granted. [CHAR LIMIT=40] -->
     <plurals name="runtime_permissions_additional_count">
@@ -7471,19 +7527,19 @@
     <!-- Title for application configuration settings [CHAR LIMIT=30] -->
     <string name="configure_apps">Configure apps</string>
 
-   <!-- Warning toast shown when data usage screen can't find specified app -->
-   <string name="unknown_app">Unknown app</string>
+    <!-- Warning toast shown when data usage screen can't find specified app -->
+    <string name="unknown_app">Unknown app</string>
 
-   <!-- Label for list that shows all permissions -->
-   <string name="app_permissions">App permissions</string>
-   <!-- Summary of permissions currently granted to apps [CHAR LIMIT=60] -->
-   <string name="app_permissions_summary">Apps using <xliff:g id="apps" example="location">%1$s</xliff:g></string>
+    <!-- Label for list that shows all permissions -->
+    <string name="app_permissions">App permissions</string>
+    <!-- Summary of permissions currently granted to apps [CHAR LIMIT=60] -->
+    <string name="app_permissions_summary">Apps using <xliff:g id="apps" example="location">%1$s</xliff:g></string>
 
-   <!-- Label for tap to wake setting [CHAR LIMIT=30] -->
-   <string name="tap_to_wake">Tap to wake</string>
+    <!-- Label for tap to wake setting [CHAR LIMIT=30] -->
+    <string name="tap_to_wake">Tap to wake</string>
 
-   <!-- Summary for take to wake setting [CHAR LIMIT=90] -->
-   <string name="tap_to_wake_summary">Double-tap anywhere on the screen to wake device</string>
+    <!-- Summary for take to wake setting [CHAR LIMIT=90] -->
+    <string name="tap_to_wake_summary">Double-tap anywhere on the screen to wake device</string>
 
     <!-- Title of a preference item that will show the user's preferences for this app's priority for opening links to websites that it claims to support [CHAR LIMIT=30] -->
     <string name="domain_urls_title">Opening links</string>
@@ -7758,6 +7814,9 @@
     <!-- Settings item summary for USB preference when set to entering MIDI mode [CHAR LIMIT=NONE] -->
     <string name="usb_summary_MIDI">Using device as MIDI</string>
 
+    <!-- Settings item title for SMS Mirroring preference [CHAR LIMIT=35] -->
+    <string name="sms_mirroring_pref">SMS Mirroring</string>
+
     <!-- Settings item title for background check prefs [CHAR LIMIT=35] -->
     <string name="background_check_pref">Background check</string>
 
@@ -8134,6 +8193,12 @@
     <!-- Summary of condition that work mode is off [CHAR LIMIT=NONE] -->
     <string name="condition_work_summary">Apps, background sync, and other features related to your work profile are turned off.</string>
 
+    <!--  Night display: Title for the night display option Suggestion (renamed "Night Light" with title caps). [CHAR LIMIT=30] -->
+    <string name="night_display_suggestion_title">Set Night Light schedule</string>
+
+    <!--  Night display: Summary for the night display option Suggestion (renamed "Night Light" with title caps). [CHAR LIMIT=NONE] -->
+    <string name="night_display_suggestion_summary">Tint screen amber to help you fall asleep</string>
+
     <!-- Title of condition that night display is on (renamed "Night Light" with title caps). [CHAR LIMIT=30] -->
     <string name="condition_night_display_title">Night Light is on</string>
 
@@ -8179,6 +8244,15 @@
     <!-- Toast message letting the user know the how to trigger telephony monitor -->
     <string name="telephony_monitor_toast">To apply telephony monitor change, reboot device</string>
 
+    <!-- Title for Camera HAL HDR+ switch [CHAR LIMIT=50] -->
+    <string name="camera_hal_hdrplus_switch">Camera HAL HDR+</string>
+
+    <!-- Toast message letting the user know how to enable Camera HAL HDR+ -->
+    <string name="camera_hal_hdrplus_toast">To apply Camera HAL HDR+ change, reboot device</string>
+
+    <!-- Title for Camera laser sensor switch [CHAR LIMIT=NONE] -->
+    <string name="camera_laser_sensor_switch">Camera Laser Sensor</string>
+
     <!-- Name of the setting to disable the automatic update -->
     <string name="ota_disable_automatic_update">Automatic system updates</string>
 
@@ -8249,7 +8323,7 @@
     <string name="data_limit">Data limit</string>
 
     <!-- Summary about how much data has been used in a date range [CHAR LIMIT=NONE] -->
-    <string name="data_usage_template"><xliff:g name="amount" example="200 MB">%1$s</xliff:g> used between <xliff:g name="date_range" example="Jan 1 -- Feb 2">%2$s</xliff:g></string>
+    <string name="data_usage_template"><xliff:g name="amount" example="200 MB">%1$s</xliff:g> used <xliff:g name="date_range" example="Jan 1 -- Feb 2">%2$s</xliff:g></string>
 
     <!-- Accessibility label for button that leads to screen with more configuration options [CHAR LIMIT=NONE] -->
     <string name="configure">Configure</string>
@@ -8327,11 +8401,6 @@
     <!-- Text for the setting on whether you can type text into notifications without unlocking the device. -->
     <string name="lockscreen_remote_input">If device is locked, prevent typing replies or other text in notifications</string>
 
-    <string-array name="bytes_picker_sizes" translatable="false">
-        <item>@*android:string/megabyteShort</item>
-        <item>@*android:string/gigabyteShort</item>
-    </string-array>
-
     <!-- [CHAR LIMIT=30] Label for setting to control the default spell checker -->
     <string name="default_spell_checker">Default spell checker</string>
 
@@ -8424,7 +8493,7 @@
     <string name="reset_shortcut_manager_throttling_complete">ShortcutManager rate-limiting has been reset</string>
 
     <!-- Title of notification suggestion during optional steps of setup. [CHAR_LIMIT=60] -->
-    <string name="notification_suggestion_title">Control lock screen notifications</string>
+    <string name="notification_suggestion_title">Control info on lock screen</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] -->
@@ -8448,7 +8517,7 @@
     <string name="premium_sms_access">Premium SMS access</string>
 
     <!-- Summary for Bluetooth when disabled. [CHAR LIMIT=NONE] -->
-    <string name="bluetooth_disabled">Not visible to other devices</string>
+    <string name="bluetooth_disabled">Off</string>
 
     <!-- Summary for Bluetooth when connected to one device. [CHAR LIMIT=NONE] -->
     <string name="bluetooth_connected_summary">Connected to <xliff:g name="device">%1$s</xliff:g></string>
@@ -8730,8 +8799,8 @@
     <!-- Section title for the Web Action preference [CHAR LIMIT=60] -->
     <string name="web_action_section_title">Instant apps</string>
 
-    <!-- Preference label for an tappable preference that will open the account chooser for instant apps. [CHAR LIMIT=60] -->
-    <string name="instant_apps_account">Instant apps account</string>
+    <!-- Preference label for an tappable preference that will open the instant apps settings. [CHAR LIMIT=60] -->
+    <string name="instant_apps_settings">Instant Apps preferences</string>
 
     <!-- Section title for the Domain URL app preference list [CHAR LIMIT=60]-->
     <string name="domain_url_section_title">Installed apps</string>
@@ -8826,8 +8895,12 @@
     <string name="enterprise_privacy_always_on_vpn_work">Always-on VPN turned on in your work profile</string>
     <!-- Label explaining that a global HTTP proxy was set by the admin. [CHAR LIMIT=NONE] -->
     <string name="enterprise_privacy_global_http_proxy">Global HTTP proxy set</string>
-    <!-- Label explaining that the admin installed trusted CA certificates. [CHAR LIMIT=NONE] -->
-    <string name="enterprise_privacy_ca_certs">Trusted credentials</string>
+    <!-- Label explaining that the admin installed trusted CA certificates for the entire device. [CHAR LIMIT=NONE] -->
+    <string name="enterprise_privacy_ca_certs_device">Trusted credentials</string>
+    <!-- Label explaining that the admin installed trusted CA certificates in personal profile. [CHAR LIMIT=NONE] -->
+    <string name="enterprise_privacy_ca_certs_personal">Trusted credentials in your personal profile</string>
+    <!-- Label explaining that the admin installed trusted CA certificates in work profile. [CHAR LIMIT=NONE] -->
+    <string name="enterprise_privacy_ca_certs_work">Trusted credentials in your work profile</string>
     <!-- Summary indicating the number of trusted CA certificates installed by the admin. The number shown is a minimum as there may be additional CA certificates we do not know about. [CHAR LIMIT=NONE] -->
     <plurals name="enterprise_privacy_number_ca_certs">
         <item quantity="one">Minimum <xliff:g id="count">%d</xliff:g> CA certificate</item>
@@ -8979,11 +9052,20 @@
     <string name="new_device_suggestion_title">What\'s new and exciting?</string>
 
     <!-- Summary label for new device suggestion, which is displayed in Settings homepage [CHAR LIMIT=100] -->
-    <string name="new_device_suggestion_summary">Check out the top 5 features</string>
+    <string name="new_device_suggestion_summary" product="default">Take a tour of your new phone</string>
+
+    <!-- Summary label for new device suggestion, which is displayed in Settings homepage [CHAR LIMIT=100] -->
+    <string name="new_device_suggestion_summary" product="tablet">Take a tour of your new tablet</string>
+
+    <!-- Summary label for new device suggestion, which is displayed in Settings homepage [CHAR LIMIT=100] -->
+    <string name="new_device_suggestion_summary" product="device">Take a tour of your new device</string>
 
     <!-- The divider symbol between different parts of the notification header including spaces. not translatable [CHAR LIMIT=3] -->
     <string name="notification_header_divider_symbol_with_spaces" translatable="false">" • "</string>
 
+    <!-- Note displayed when certain features are not available on low ram devices. [CHAR LIMIT=NONE] -->
+    <string name="disabled_low_ram_device">This feature is not available on this device</string>
+
     <!--Label of IMS registration header -->
     <string name="ims_reg_title">"IMS registration state"</string>
     <!--Used when IMS registration state is registered -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index fee7c74..f3e16bf 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -425,6 +425,16 @@
 
     <style name="DreamStartButton" parent="android:Widget.Material.Button" />
 
+    <style name="LockPatternContainerStyle">
+        <item name="android:maxHeight">400dp</item>
+        <item name="android:maxWidth">420dp</item>
+        <item name="android:minHeight">0dp</item>
+        <item name="android:minWidth">0dp</item>
+        <item name="android:paddingBottom">0dp</item>
+        <item name="android:paddingHorizontal">44dp</item>
+        <item name="android:paddingTop">0dp</item>
+    </style>
+
     <style name="LockPatternStyle">
         <item name="*android:regularColor">@color/lock_pattern_view_regular_color</item>
         <item name="*android:successColor">@color/lock_pattern_view_success_color</item>
diff --git a/res/values/styles_preference.xml b/res/values/styles_preference.xml
index 8b5e7d3..056d55a 100644
--- a/res/values/styles_preference.xml
+++ b/res/values/styles_preference.xml
@@ -19,64 +19,21 @@
 <!-- Things unrelated to preference framework UI customization should go to other styles files -->
 <resources>
 
-    <dimen name="preference_no_icon_padding_start">72dp</dimen>
-
     <!-- Fragment style -->
-    <style name="PreferenceFragmentStyle" parent="@*android:style/PreferenceFragment.Material">
+    <style name="SettingsPreferenceFragmentStyle" parent="@style/PreferenceFragmentStyle.SettingsBase">
         <item name="android:layout">@layout/preference_list_fragment</item>
-        <item name="allowDividerAfterLastItem">false</item>
     </style>
 
-    <!-- Preferences -->
-    <style name="SettingsPreference" parent="@style/Preference.Material">
-        <item name="allowDividerAbove">false</item>
-        <item name="allowDividerBelow">true</item>
-        <item name="singleLineTitle">false</item>
-        <item name="iconSpaceReserved">true</item>
-    </style>
-
-    <style name="ApnPreference" parent="SettingsPreference">
+    <style name="ApnPreference" parent="Preference.SettingsBase">
         <item name="android:layout">@layout/apn_preference_layout</item>
     </style>
 
-    <style name="FooterPreference" parent="SettingsPreference">
-        <item name="android:layout">@layout/preference_footer</item>
-        <item name="allowDividerAbove">true</item>
-    </style>
-
-    <style name="EditTextPreference"
-           parent="@style/Preference.DialogPreference.EditTextPreference.Material">
-        <item name="allowDividerAbove">false</item>
-        <item name="allowDividerBelow">true</item>
-        <item name="iconSpaceReserved">true</item>
-        <item name="singleLineTitle">false</item>
-        <item name="android:dialogLayout">@layout/preference_dialog_edittext</item>
-    </style>
-
-    <style name="SettingsDropdownPreference" parent="SettingsPreference">
-        <item name="android:layout">@layout/preference_dropdown_material_settings</item>
-    </style>
-
-    <style name="SettingsDialogPreference" parent="SettingsPreference" />
-
-    <style name="SettingsPreferenceCategory" parent="@style/Preference.Category.Material">
-        <item name="allowDividerAbove">true</item>
-        <item name="allowDividerBelow">true</item>
-        <item name="android:layout">@layout/preference_category_material_settings</item>
-    </style>
-
-    <style name="SettingsSeekBarPreference" parent="SettingsPreference">
+    <style name="SettingsSeekBarPreference" parent="Preference.SettingsBase">
         <item name="android:layout">@layout/preference_widget_seekbar_settings</item>
     </style>
 
-    <style name="SettingsSwitchPreference" parent="@style/Preference.SwitchPreference.Material">
-        <item name="allowDividerAbove">false</item>
-        <item name="allowDividerBelow">true</item>
-        <item name="iconSpaceReserved">true</item>
-        <item name="singleLineTitle">false</item>
-    </style>
-
-    <style name="SyncSwitchPreference" parent="SettingsPreference">
+    <style name="SyncSwitchPreference" parent="Preference.SettingsBase">
         <item name="android:widgetLayout">@layout/preference_widget_sync_toggle</item>
     </style>
+
 </resources>
\ No newline at end of file
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 0b883e4..2610e08 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -25,7 +25,6 @@
     <style name="GlifTheme" 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:windowBackground">?android:attr/colorBackground</item>
         <item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
         <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
@@ -46,7 +45,6 @@
     <style name="GlifTheme.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:windowBackground">?android:attr/colorBackground</item>
         <item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
         <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
@@ -66,7 +64,6 @@
     <style name="GlifV2Theme" parent="SuwThemeGlifV2">
         <!-- 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:windowBackground">?android:attr/colorBackground</item>
         <item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
         <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
@@ -87,7 +84,6 @@
     <style name="GlifV2Theme.Light" parent="SuwThemeGlifV2.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:windowBackground">?android:attr/colorBackground</item>
         <item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
         <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
@@ -122,19 +118,10 @@
         <item name="android:windowAnimationStyle">@android:style/Animation.Activity</item>
     </style>
 
-    <style name="PreferenceTheme" parent="@style/PreferenceThemeOverlay.v14.Material">
-        <!-- Parent path frameworks/support/v14/preference/res/values/themes.xml -->
-        <item name="android:scrollbars">vertical</item>
+    <style name="PreferenceTheme" parent="@style/PreferenceThemeOverlay.SettingsBase">
+        <item name="preferenceFragmentStyle">@style/SettingsPreferenceFragmentStyle</item>
         <item name="apnPreferenceStyle">@style/ApnPreference</item>
-        <item name="footerPreferenceStyle">@style/FooterPreference</item>
-        <item name="dialogPreferenceStyle">@style/SettingsDialogPreference</item>
-        <item name="dropdownPreferenceStyle">@style/SettingsDropdownPreference</item>
-        <item name="editTextPreferenceStyle">@style/EditTextPreference</item>
-        <item name="preferenceCategoryStyle">@style/SettingsPreferenceCategory</item>
-        <item name="preferenceFragmentStyle">@style/PreferenceFragmentStyle</item>
-        <item name="preferenceStyle">@style/SettingsPreference</item>
         <item name="seekBarPreferenceStyle">@style/SettingsSeekBarPreference</item>
-        <item name="switchPreferenceStyle">@style/SettingsSwitchPreference</item>
     </style>
 
     <style name="PreferenceTheme.SetupWizard" parent="PreferenceTheme">
diff --git a/res/xml/account_type_settings.xml b/res/xml/account_type_settings.xml
index 7f57ed0..31f3f69 100644
--- a/res/xml/account_type_settings.xml
+++ b/res/xml/account_type_settings.xml
@@ -25,15 +25,15 @@
         android:selectable="false"
         android:order="-10000"/>
 
+    <PreferenceCategory
+      android:key="dashboard_tile_placeholder"
+      android:order="100"/>
+
     <Preference
         android:key="account_sync"
         android:title="@string/account_sync_title"
         android:icon="@drawable/ic_sync"
-        android:order="-9999"/>
-
-    <PreferenceCategory
-      android:key="dashboard_tile_placeholder"
-      android:order="-9998"/>
+        android:order="200"/>
 
     <com.android.settings.applications.LayoutPreference
       android:key="remove_account"
diff --git a/res/xml/apn_editor.xml b/res/xml/apn_editor.xml
index eac78e9..b1e332b 100644
--- a/res/xml/apn_editor.xml
+++ b/res/xml/apn_editor.xml
@@ -22,6 +22,7 @@
         android:key="apn_name"
         android:singleLine="true"
         android:inputType="text"
+        android:persistent="false"
         />
     <EditTextPreference
         android:title="@string/apn_apn"
@@ -29,6 +30,7 @@
         android:key="apn_apn"
         android:singleLine="true"
         android:inputType="textEmailAddress"
+        android:persistent="false"
         />
     <EditTextPreference
         android:title="@string/apn_http_proxy"
@@ -36,6 +38,7 @@
         android:key="apn_http_proxy"
         android:singleLine="true"
         android:inputType="textUri"
+        android:persistent="false"
         />
     <EditTextPreference
         android:title="@string/apn_http_port"
@@ -43,6 +46,7 @@
         android:key="apn_http_port"
         android:singleLine="true"
         android:inputType="number"
+        android:persistent="false"
         />
     <EditTextPreference
         android:title="@string/apn_user"
@@ -50,6 +54,7 @@
         android:key="apn_user"
         android:singleLine="true"
         android:inputType="textEmailAddress"
+        android:persistent="false"
         />
     <EditTextPreference
         android:title="@string/apn_password"
@@ -57,6 +62,7 @@
         android:key="apn_password"
         android:singleLine="true"
         android:inputType="textPassword"
+        android:persistent="false"
         />
     <EditTextPreference
         android:title="@string/apn_server"
@@ -64,6 +70,7 @@
         android:key="apn_server"
         android:singleLine="true"
         android:inputType="textUri"
+        android:persistent="false"
         />
     <EditTextPreference
         android:title="@string/apn_mmsc"
@@ -71,6 +78,7 @@
         android:key="apn_mmsc"
         android:singleLine="true"
         android:inputType="textUri"
+        android:persistent="false"
         />
     <EditTextPreference
         android:title="@string/apn_mms_proxy"
@@ -78,6 +86,7 @@
         android:key="apn_mms_proxy"
         android:singleLine="true"
         android:inputType="textUri"
+        android:persistent="false"
         />
     <EditTextPreference
         android:title="@string/apn_mms_port"
@@ -85,6 +94,7 @@
         android:key="apn_mms_port"
         android:singleLine="true"
         android:inputType="number"
+        android:persistent="false"
         />
     <EditTextPreference
         android:title="@string/apn_mcc"
@@ -92,6 +102,7 @@
         android:key="apn_mcc"
         android:singleLine="true"
         android:inputType="number"
+        android:persistent="false"
         />
     <EditTextPreference
         android:title="@string/apn_mnc"
@@ -99,12 +110,14 @@
         android:key="apn_mnc"
         android:singleLine="true"
         android:inputType="number"
+        android:persistent="false"
         />
     <ListPreference
         android:title="@string/apn_auth_type"
         android:key="auth_type"
         android:entries="@array/apn_auth_entries"
         android:entryValues="@array/apn_auth_values"
+        android:persistent="false"
         />
     <EditTextPreference
         android:title="@string/apn_type"
@@ -112,6 +125,7 @@
         android:key="apn_type"
         android:singleLine="true"
         android:inputType="textNoSuggestions"
+        android:persistent="false"
         />
     <ListPreference
         android:title="@string/apn_protocol"
@@ -119,6 +133,7 @@
         android:key="apn_protocol"
         android:entries="@array/apn_protocol_entries"
         android:entryValues="@array/apn_protocol_values"
+        android:persistent="false"
         />
     <ListPreference
         android:title="@string/apn_roaming_protocol"
@@ -126,6 +141,7 @@
         android:key="apn_roaming_protocol"
         android:entries="@array/apn_protocol_entries"
         android:entryValues="@array/apn_protocol_values"
+        android:persistent="false"
         />
     <SwitchPreference
         android:title="@string/carrier_enabled"
@@ -133,18 +149,21 @@
         android:enabled="false"
         android:summaryOn="@string/carrier_enabled_summaryOn"
         android:summaryOff="@@string/carrier_enabled_summaryOff"
+        android:persistent="false"
         />
     <MultiSelectListPreference
         android:title="@string/bearer"
         android:key="bearer_multi"
         android:entries="@array/bearer_entries"
         android:entryValues="@array/bearer_values"
+        android:persistent="false"
         />
     <ListPreference
         android:title="@string/mvno_type"
         android:key="mvno_type"
         android:entries="@array/mvno_type_entries"
         android:entryValues="@array/mvno_type_values"
+        android:persistent="false"
         />
     <EditTextPreference
         android:title="@string/mvno_match_data"
@@ -152,5 +171,6 @@
         android:key="mvno_match_data"
         android:singleLine="true"
         android:inputType="text"
+        android:persistent="false"
         />
 </PreferenceScreen>
diff --git a/res/xml/app_and_notification.xml b/res/xml/app_and_notification.xml
index 4a5ee1d..15048c7 100644
--- a/res/xml/app_and_notification.xml
+++ b/res/xml/app_and_notification.xml
@@ -70,8 +70,12 @@
 
     <Preference
         android:key="special_access"
-        android:fragment="com.android.settings.applications.SpecialAccessSettings"
         android:title="@string/special_access"
-        android:order="20" />
+        android:order="20" >
+        <intent
+            android:action="android.intent.action.MAIN"
+            android:targetPackage="com.android.settings"
+            android:targetClass="com.android.settings.Settings$SpecialAccessSettingsActivity" />
+    </Preference>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/app_default_settings.xml b/res/xml/app_default_settings.xml
index 11acb24..196ed9f 100644
--- a/res/xml/app_default_settings.xml
+++ b/res/xml/app_default_settings.xml
@@ -23,56 +23,56 @@
     <Preference
         android:key="assist_and_voice_input"
         android:title="@string/assist_and_voice_input_title"
-        android:fragment="com.android.settings.applications.assist.ManageAssist"
-        android:order="-20"/>
+        android:fragment="com.android.settings.applications.assist.ManageAssist" />
 
     <Preference
         android:key="default_browser"
         android:title="@string/default_browser_title"
-        android:fragment="com.android.settings.applications.defaultapps.DefaultBrowserPicker"
-        android:order="-19">
-        <extra android:name="for_work" android:value="false"/>
+        android:fragment="com.android.settings.applications.defaultapps.DefaultBrowserPicker">
+        <extra android:name="for_work" android:value="false" />
     </Preference>
 
     <Preference
         android:key="default_home"
         android:title="@string/home_app"
         android:fragment="com.android.settings.applications.defaultapps.DefaultHomePicker"
-        settings:keywords="@string/keywords_home"
-        android:order="-18"/>
+        settings:keywords="@string/keywords_home" />
 
     <Preference
         android:key="default_phone_app"
         android:title="@string/default_phone_title"
         android:fragment="com.android.settings.applications.defaultapps.DefaultPhonePicker"
-        settings:keywords="@string/keywords_default_phone_app"
-        android:order="-17"/>
+        settings:keywords="@string/keywords_default_phone_app" />
 
     <Preference
         android:key="default_sms_app"
         android:title="@string/sms_application_title"
         android:fragment="com.android.settings.applications.defaultapps.DefaultSmsPicker"
-        settings:keywords="@string/keywords_more_default_sms_app"
-        android:order="-16"/>
+        settings:keywords="@string/keywords_more_default_sms_app" />
+
+    <Preference
+        android:key="default_payment_app"
+        android:title="@string/nfc_payment_settings_title"
+        android:summary="@string/summary_placeholder"
+        android:fragment="com.android.settings.nfc.PaymentSettings" />
 
     <Preference
         android:key="default_emergency_app"
         android:title="@string/default_emergency_app"
-        settings:keywords="@string/keywords_emergency_app"
-        android:order="-15"/>
+        settings:keywords="@string/keywords_emergency_app" />
 
     <!--
     <Preference
         android:key="default_notification_asst_app"
         android:title="@string/default_notification_assistant"
         android:fragment="com.android.settings.applications.defaultapps.DefaultNotificationAssistantPicker"
-        android:order="-13"/>
+        />
      -->
 
     <Preference
         android:key="domain_urls"
         android:title="@string/domain_urls_title"
-        android:fragment="com.android.settings.applications.ManageDomainUrls"/>
+        android:fragment="com.android.settings.applications.ManageDomainUrls" />
 
     <com.android.settings.WorkOnlyCategory
         android:key="work_defaults"
@@ -82,7 +82,7 @@
             android:key="work_default_browser"
             android:title="@string/default_browser_title"
             android:fragment="com.android.settings.applications.defaultapps.DefaultBrowserPicker">
-            <extra android:name="for_work" android:value="true"/>
+            <extra android:name="for_work" android:value="true" />
         </Preference>
 
         <Preference
@@ -90,7 +90,7 @@
             android:title="@string/default_phone_title"
             android:fragment="com.android.settings.applications.defaultapps.DefaultPhonePicker"
             settings:keywords="@string/keywords_default_phone_app">
-            <extra android:name="for_work" android:value="true"/>
+            <extra android:name="for_work" android:value="true" />
         </Preference>
 
     </com.android.settings.WorkOnlyCategory>
diff --git a/res/xml/assist_gesture_settings.xml b/res/xml/assist_gesture_settings.xml
index 4455655..53b6526 100644
--- a/res/xml/assist_gesture_settings.xml
+++ b/res/xml/assist_gesture_settings.xml
@@ -15,10 +15,11 @@
   limitations under the License.
   -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:app="http://schemas.android.com/apk/res-auto"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-                  android:title="@string/assist_gesture_title">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:key="gesture_assist_settings_page"
+    android:title="@string/assist_gesture_title">
 
     <com.android.settings.widget.VideoPreference
         android:key="gesture_assist_video"
@@ -28,6 +29,6 @@
     <SwitchPreference
         android:key="gesture_assist"
         android:title="@string/assist_gesture_title"
-        app:keywords="@string/keywords_assist_gesture_launch"/>
+        app:keywords="@string/keywords_assist_gesture_launch" />
 
 </PreferenceScreen>
diff --git a/res/xml/available_virtual_keyboard.xml b/res/xml/available_virtual_keyboard.xml
new file mode 100644
index 0000000..9a0b3c6
--- /dev/null
+++ b/res/xml/available_virtual_keyboard.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="available_virtual_keyboard_page"
+    android:title="@string/add_virtual_keyboard">
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/configure_notification_settings.xml b/res/xml/configure_notification_settings.xml
index 718bb23..21904e6 100644
--- a/res/xml/configure_notification_settings.xml
+++ b/res/xml/configure_notification_settings.xml
@@ -22,6 +22,12 @@
         android:key="dashboard_tile_placeholder"
         android:order="1"/>
 
+    <!-- When device is locked -->
+    <com.android.settings.notification.RestrictedDropDownPreference
+        android:key="lock_screen_notifications"
+        android:title="@string/lock_screen_notifications_title"
+        android:summary="@string/summary_placeholder"/>
+
     <!-- Notification badging -->
     <SwitchPreference
         android:key="notification_badging"
@@ -32,16 +38,18 @@
         android:key="notification_pulse"
         android:title="@string/notification_pulse_title"/>
 
-    <!-- When device is locked -->
-    <com.android.settings.notification.RestrictedDropDownPreference
-        android:key="lock_screen_notifications"
-        android:title="@string/lock_screen_notifications_title"
-        android:summary="@string/summary_placeholder"/>
+    <!-- Default notification ringtone -->
+    <com.android.settings.DefaultRingtonePreference
+        android:key="notification_default_ringtone"
+        android:title="@string/notification_ringtone_title"
+        android:dialogTitle="@string/notification_ringtone_title"
+        android:summary="@string/summary_placeholder"
+        android:ringtoneType="notification" />
 
-    <SwitchPreference
+    <Preference
         android:key="gesture_swipe_down_fingerprint_notifications"
         android:title="@string/fingerprint_swipe_for_notifications_title"
-        android:summary="@string/fingerprint_swipe_for_notifications_summary"/>
+        android:fragment="com.android.settings.gestures.SwipeToNotificationSettings" />
 
     <PreferenceCategory
         android:key="lock_screen_notifications_profile_header"
@@ -53,5 +61,4 @@
             android:summary="@string/summary_placeholder"/>
 
     </PreferenceCategory>
-
 </PreferenceScreen>
diff --git a/res/xml/connected_devices.xml b/res/xml/connected_devices.xml
index ecbcbd1..1099672 100644
--- a/res/xml/connected_devices.xml
+++ b/res/xml/connected_devices.xml
@@ -39,10 +39,17 @@
         android:order="-4"/>
 
     <Preference
+        android:key="sms_mirroring"
+        android:title="@string/sms_mirroring_pref"
+        android:icon="@drawable/ic_sms_mirroring_24dp"
+        android:summary="@string/summary_placeholder"
+        android:order="-3"/>
+
+    <Preference
         android:key="usb_mode"
         android:title="@string/usb_pref"
         android:icon="@drawable/ic_usb"
-        android:order="-3">
+        android:order="-2">
         <intent android:action="android.intent.action.MAIN"
                 android:targetPackage="com.android.settings"
                 android:targetClass="com.android.settings.deviceinfo.UsbModeChooserActivity"/>
@@ -52,4 +59,4 @@
         android:key="dashboard_tile_placeholder"
         android:order="50"/>
 
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
diff --git a/res/xml/data_plan_usage.xml b/res/xml/data_plan_usage.xml
new file mode 100644
index 0000000..4691198
--- /dev/null
+++ b/res/xml/data_plan_usage.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/data_usage_summary_title">
+
+    <PreferenceCategory
+            android:key="data_plan_usage"
+            android:title="@string/usage">
+
+    </PreferenceCategory>
+</PreferenceScreen>
diff --git a/res/xml/data_plan_usage_cell_data_preference_screen.xml b/res/xml/data_plan_usage_cell_data_preference_screen.xml
new file mode 100644
index 0000000..08f21c5
--- /dev/null
+++ b/res/xml/data_plan_usage_cell_data_preference_screen.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/data_usage_summary_title">
+
+    <com.android.settings.datausage.TemplatePreferenceCategory
+            android:key="data_usage_mobile_category"
+            android:title="@string/data_usage_tab_mobile">
+
+        <com.android.settings.datausage.CellDataPreference
+                android:key="data_usage_enable"
+                android:title="@string/data_usage_enable_mobile" />
+    </com.android.settings.datausage.TemplatePreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/date_time_prefs.xml b/res/xml/date_time_prefs.xml
index 7859119..c9ad0dd 100644
--- a/res/xml/date_time_prefs.xml
+++ b/res/xml/date_time_prefs.xml
@@ -14,44 +14,44 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-        android:title="@string/date_and_time"
-        settings:keywords="@string/keywords_date_and_time">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:title="@string/date_and_time"
+    settings:keywords="@string/keywords_date_and_time">
 
-    <com.android.settingslib.RestrictedSwitchPreference android:key="auto_time"
+    <com.android.settingslib.RestrictedSwitchPreference
+        android:key="auto_time"
         android:title="@string/date_time_auto"
         android:summaryOn="@string/date_time_auto_summaryOn"
         android:summaryOff="@string/date_time_auto_summaryOff"
         settings:useAdditionalSummary="true"
-        settings:restrictedSwitchSummary="@string/enabled_by_admin"
-        />
+        settings:restrictedSwitchSummary="@string/enabled_by_admin" />
 
-    <SwitchPreference android:key="auto_zone"
+    <SwitchPreference
+        android:key="auto_zone"
         android:title="@string/zone_auto"
         android:summaryOn="@string/zone_auto_summaryOn"
-        android:summaryOff="@string/zone_auto_summaryOff"
-        />
+        android:summaryOff="@string/zone_auto_summaryOff" />
 
-    <Preference android:key="date"
+    <Preference
+        android:key="date"
         android:title="@string/date_time_set_date"
-        android:summary="03/10/2008"
-        />
+        android:summary="@string/summary_placeholder" />
 
-    <Preference android:key="time"
+    <Preference
+        android:key="time"
         android:title="@string/date_time_set_time"
-        android:summary="12:00am"
-        />
+        android:summary="@string/summary_placeholder" />
 
     <Preference
         android:fragment="com.android.settings.datetime.ZonePicker"
         android:key="timezone"
         android:title="@string/date_time_set_timezone"
-        android:summary="GMT-8:00"
-        />
+        android:summary="GMT-8:00" />
 
-    <SwitchPreference android:key="24 hour"
-        android:title="@string/date_time_24hour"
-        />
+    <SwitchPreference
+        android:key="24 hour"
+        android:title="@string/date_time_24hour" />
 
 </PreferenceScreen>
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 2b4a85a..fb73ec4 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -163,6 +163,14 @@
             android:title="@string/telephony_monitor_switch"
             android:summary="@string/telephony_monitor_switch_summary"/>
 
+        <SwitchPreference
+            android:key="camera_laser_sensor_switch"
+            android:title="@string/camera_laser_sensor_switch" />
+
+        <SwitchPreference
+            android:key="camera_hal_hdrplus_switch"
+            android:title="@string/camera_hal_hdrplus_switch" />
+
     </PreferenceCategory>
 
     <PreferenceCategory android:key="debug_networking_category"
@@ -206,14 +214,19 @@
             android:entryValues="@array/usb_configuration_values" />
 
         <SwitchPreference
+            android:key="bluetooth_show_devices_without_names"
+            android:title="@string/bluetooth_show_devices_without_names"
+            android:summary="@string/bluetooth_show_devices_without_names_summary"/>
+
+        <SwitchPreference
             android:key="bluetooth_disable_absolute_volume"
             android:title="@string/bluetooth_disable_absolute_volume"
             android:summary="@string/bluetooth_disable_absolute_volume_summary"/>
 
         <SwitchPreference
-            android:key="bluetooth_enable_inband_ringing"
-            android:title="@string/bluetooth_enable_inband_ringing"
-            android:summary="@string/bluetooth_enable_inband_ringing_summary"/>
+            android:key="bluetooth_disable_inband_ringing"
+            android:title="@string/bluetooth_disable_inband_ringing"
+            android:summary="@string/bluetooth_disable_inband_ringing_summary"/>
 
         <ListPreference
             android:key="bluetooth_select_avrcp_version"
@@ -257,6 +270,13 @@
             android:entries="@array/bluetooth_a2dp_codec_ldac_playback_quality_titles"
             android:entryValues="@array/bluetooth_a2dp_codec_ldac_playback_quality_values" />
 
+        <ListPreference
+            android:key="bluetooth_max_connected_audio_devices"
+            android:title="@string/bluetooth_max_connected_audio_devices_string"
+            android:dialogTitle="@string/bluetooth_max_connected_audio_devices_dialog_title"
+            android:entries="@array/bluetooth_max_connected_audio_devices"
+            android:entryValues="@array/bluetooth_max_connected_audio_devices_values" />
+
         <com.android.settings.development.PrivateDnsModeDialogPreference
             android:key="select_private_dns_configuration"
             android:title="@string/select_private_dns_configuration_title"
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 7482031..b094175 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -64,17 +64,17 @@
         <Preference
                 android:key="device_model"
                 android:title="@string/model_info"
-                android:summary="@string/device_info_default"/>
+                android:summary="@string/summary_placeholder"/>
 
         <!-- Device firmware version -->
         <Preference android:key="firmware_version"
                 android:title="@string/firmware_version"
-                android:summary="@string/device_info_default"/>
+                android:summary="@string/summary_placeholder"/>
 
         <!-- Security patch level -->
         <Preference android:key="security_patch"
                 android:title="@string/security_patch"
-                android:summary="@string/device_info_default">
+                android:summary="@string/summary_placeholder">
                 <intent android:action="android.intent.action.VIEW"
                         android:data="https://source.android.com/security/bulletin/" />
         </Preference>
@@ -83,25 +83,25 @@
         <Preference
                 android:key="fcc_equipment_id"
                 android:title="@string/fcc_equipment_id"
-                android:summary="@string/device_info_default"/>
+                android:summary="@string/summary_placeholder"/>
 
         <!-- Device Baseband version -->
         <Preference
                 android:key="baseband_version"
                 android:title="@string/baseband_version"
-                android:summary="@string/device_info_default"/>
+                android:summary="@string/summary_placeholder"/>
 
         <!-- Device Kernel version -->
         <Preference
                 android:key="kernel_version"
                 android:title="@string/kernel_version"
-                android:summary="@string/device_info_default"/>
+                android:summary="@string/summary_placeholder"/>
 
         <!-- Detailed build version -->
         <Preference
                 android:key="build_number"
                 android:title="@string/build_number"
-                android:summary="@string/device_info_default"/>
+                android:summary="@string/summary_placeholder"/>
 
         <!-- SELinux status information -->
         <Preference
diff --git a/res/xml/device_info_status.xml b/res/xml/device_info_status.xml
index 6fe43ec..3456f91 100644
--- a/res/xml/device_info_status.xml
+++ b/res/xml/device_info_status.xml
@@ -23,13 +23,13 @@
         android:enabled="false"
         android:shouldDisableView="false"
         android:title="@string/battery_status_title"
-        android:summary="@string/device_info_not_available" />
+        android:summary="@string/summary_placeholder" />
     <Preference
         android:key="battery_level"
         android:enabled="false"
         android:shouldDisableView="false"
         android:title="@string/battery_level_title"
-        android:summary="@string/device_info_not_available"
+        android:summary="@string/summary_placeholder"
         android:persistent="false" />
     <Preference
         android:key="sim_status"
@@ -52,42 +52,42 @@
         android:enabled="false"
         android:shouldDisableView="false"
         android:title="@string/wifi_advanced_ip_address_title"
-        android:summary="@string/device_info_not_available"
+        android:summary="@string/summary_placeholder"
         android:persistent="false" />
     <Preference
         android:key="wifi_mac_address"
         android:enabled="false"
         android:shouldDisableView="false"
         android:title="@string/status_wifi_mac_address"
-        android:summary="@string/device_info_not_available"
+        android:summary="@string/summary_placeholder"
         android:persistent="false" />
     <Preference
         android:key="bt_address"
         android:enabled="false"
         android:shouldDisableView="false"
         android:title="@string/status_bt_address"
-        android:summary="@string/device_info_not_available"
+        android:summary="@string/summary_placeholder"
         android:persistent="false" />
     <Preference
         android:key="serial_number"
         android:enabled="false"
         android:shouldDisableView="false"
         android:title="@string/status_serial_number"
-        android:summary="@string/device_info_not_available"
+        android:summary="@string/summary_placeholder"
         android:persistent="false" />
     <Preference
         android:key="up_time"
         android:enabled="false"
         android:shouldDisableView="false"
         android:title="@string/status_up_time"
-        android:summary="@string/device_info_not_available"
+        android:summary="@string/summary_placeholder"
         android:persistent="false" />
     <Preference
         android:key="wimax_mac_address"
         android:enabled="false"
         android:shouldDisableView="false"
         android:title="@string/status_wimax_mac_address"
-        android:summary="@string/device_info_not_available"
+        android:summary="@string/summary_placeholder"
         android:persistent="false" />
     <Preference
         android:key="ims_reg_state"
diff --git a/res/xml/enterprise_privacy_settings.xml b/res/xml/enterprise_privacy_settings.xml
index 13f7b8e..ffdf630 100644
--- a/res/xml/enterprise_privacy_settings.xml
+++ b/res/xml/enterprise_privacy_settings.xml
@@ -77,8 +77,11 @@
         <Preference android:key="global_http_proxy"
                     android:title="@string/enterprise_privacy_global_http_proxy"
                     android:selectable="false"/>
-        <Preference android:key="ca_certs"
-                    android:title="@string/enterprise_privacy_ca_certs"
+        <Preference android:key="ca_certs_current_user"
+                    android:title="@string/enterprise_privacy_ca_certs_personal"
+                    android:selectable="false"/>
+        <Preference android:key="ca_certs_managed_profile"
+                    android:title="@string/enterprise_privacy_ca_certs_work"
                     android:selectable="false"/>
     </PreferenceCategory>
 
diff --git a/res/xml/gestures.xml b/res/xml/gestures.xml
new file mode 100644
index 0000000..7f8df1b
--- /dev/null
+++ b/res/xml/gestures.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/gesture_preference_title" >
+
+    <Preference
+        android:key="gesture_assist_input_summary"
+        android:title="@string/assist_gesture_title"
+        android:fragment="com.android.settings.gestures.AssistGestureSettings" />
+
+    <Preference
+        android:key="gesture_swipe_down_fingerprint_input_summary"
+        android:title="@string/fingerprint_swipe_for_notifications_title"
+        android:fragment="com.android.settings.gestures.SwipeToNotificationSettings" />
+
+    <Preference
+        android:key="gesture_double_tap_power_input_summary"
+        android:title="@string/double_tap_power_for_camera_title"
+        android:fragment="com.android.settings.gestures.DoubleTapPowerSettings" />
+
+    <Preference
+        android:key="gesture_double_twist_input_summary"
+        android:title="@string/double_twist_for_camera_mode_title"
+        android:fragment="com.android.settings.gestures.DoubleTwistGestureSettings" />
+
+    <Preference
+        android:key="gesture_double_tap_screen_input_summary"
+        android:title="@string/ambient_display_title"
+        android:fragment="com.android.settings.gestures.DoubleTapScreenSettings" />
+
+    <Preference
+        android:key="gesture_pick_up_input_summary"
+        android:title="@string/ambient_display_pickup_title"
+        android:fragment="com.android.settings.gestures.PickupGestureSettings" />
+
+</PreferenceScreen>
diff --git a/res/drawable/ic_cross_grey_24dp.xml b/res/xml/inapp_notification_settings.xml
similarity index 61%
rename from res/drawable/ic_cross_grey_24dp.xml
rename to res/xml/inapp_notification_settings.xml
index 312c034..7547f3c 100644
--- a/res/drawable/ic_cross_grey_24dp.xml
+++ b/res/xml/inapp_notification_settings.xml
@@ -1,3 +1,4 @@
+<?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");
@@ -13,12 +14,13 @@
      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:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"
-        android:fillColor="#757575"/>
-</vector>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto">
+
+    <Preference
+        android:key="app_link"
+        android:title="@string/app_settings_link"
+        android:order="500"
+        settings:allowDividerAbove="true"/>
+
+</PreferenceScreen>
diff --git a/res/xml/language_and_input.xml b/res/xml/language_and_input.xml
index 2996c78..e9c9737 100644
--- a/res/xml/language_and_input.xml
+++ b/res/xml/language_and_input.xml
@@ -18,7 +18,7 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-    android:title="@string/language_input_gesture_title" >
+    android:title="@string/language_settings" >
 
     <Preference
         android:key="phone_language"
@@ -62,43 +62,6 @@
             android:title="@string/user_dict_settings_title"/>
     </PreferenceCategory>
 
-    <PreferenceCategory
-        android:key="gesture_settings_category"
-        android:title="@string/gesture_preference_title"
-        settings:keywords="@string/keywords_gesture">
-
-        <Preference
-            android:key="gesture_assist_input_summary"
-            android:title="@string/assist_gesture_title"
-            android:fragment="com.android.settings.gestures.AssistGestureSettings" />
-
-        <Preference
-            android:key="gesture_swipe_down_fingerprint_input_summary"
-            android:title="@string/fingerprint_swipe_for_notifications_title"
-            android:fragment="com.android.settings.gestures.SwipeToNotificationSettings" />
-
-        <Preference
-            android:key="gesture_double_tap_screen_input_summary"
-            android:title="@string/ambient_display_title"
-            android:fragment="com.android.settings.gestures.DoubleTapScreenSettings" />
-
-        <Preference
-            android:key="gesture_pick_up_input_summary"
-            android:title="@string/ambient_display_pickup_title"
-            android:fragment="com.android.settings.gestures.PickupGestureSettings" />
-
-        <Preference
-            android:key="gesture_double_tap_power_input_summary"
-            android:title="@string/double_tap_power_for_camera_title"
-            android:fragment="com.android.settings.gestures.DoubleTapPowerSettings" />
-
-        <Preference
-            android:key="gesture_double_twist_input_summary"
-            android:title="@string/double_twist_for_camera_mode_title"
-            android:fragment="com.android.settings.gestures.DoubleTwistGestureSettings" />
-
-    </PreferenceCategory>
-
     <PreferenceCategory>
 
         <com.android.settings.PointerSpeedPreference
@@ -120,8 +83,7 @@
         <SwitchPreference
             android:key="vibrate_input_devices"
             android:title="@string/vibrate_input_devices"
-            android:summaryOn="@string/vibrate_input_devices_summary"
-            android:summaryOff="@string/vibrate_input_devices_summary"/>
+            android:summary="@string/vibrate_input_devices_summary" />
 
     </PreferenceCategory>
 
diff --git a/res/xml/legacy_channel_notification_settings.xml b/res/xml/legacy_channel_notification_settings.xml
index e271705..519bf5d 100644
--- a/res/xml/legacy_channel_notification_settings.xml
+++ b/res/xml/legacy_channel_notification_settings.xml
@@ -27,7 +27,8 @@
     <!-- Importance toggle -->
     <com.android.settingslib.RestrictedSwitchPreference
         android:key="allow_sound"
-        android:title="@string/allow_sound" />
+        android:title="@string/allow_interruption"
+	android:summary="@string/allow_interruption_summary"/>
 
     <!-- Visibility Override -->
     <com.android.settings.notification.RestrictedDropDownPreference
diff --git a/res/xml/reset_dashboard_fragment.xml b/res/xml/reset_dashboard_fragment.xml
index 1fd45db..2761496 100644
--- a/res/xml/reset_dashboard_fragment.xml
+++ b/res/xml/reset_dashboard_fragment.xml
@@ -38,7 +38,6 @@
     <com.android.settingslib.RestrictedPreference
         android:key="factory_reset"
         android:title="@string/master_clear_title"
-        android:summary="@string/master_clear_summary"
         settings:keywords="@string/keywords_factory_data_reset"
         settings:userRestriction="no_factory_reset"
         settings:useAdminDisabledSummary="true"
diff --git a/res/xml/security_settings_password_sub.xml b/res/xml/security_settings_password_sub.xml
index 46c4999..c0287c0 100644
--- a/res/xml/security_settings_password_sub.xml
+++ b/res/xml/security_settings_password_sub.xml
@@ -22,7 +22,7 @@
     <com.android.settings.TimeoutListPreference
         android:key="lock_after_timeout"
         android:title="@string/lock_after_timeout"
-        android:summary="@string/lock_after_timeout_summary"
+        android:summary="@string/summary_placeholder"
         android:entries="@array/lock_after_timeout_entries"
         android:entryValues="@array/lock_after_timeout_values" />
 
@@ -32,7 +32,6 @@
 
     <com.android.settingslib.RestrictedPreference
         android:key="owner_info_settings"
-        android:title="@string/owner_info_settings_title"
-        android:summary="@string/owner_info_settings_summary" />
+        android:title="@string/owner_info_settings_title" />
 
 </PreferenceScreen>
diff --git a/res/xml/security_settings_pattern_sub.xml b/res/xml/security_settings_pattern_sub.xml
index f0a7c9b..7de2ba2 100644
--- a/res/xml/security_settings_pattern_sub.xml
+++ b/res/xml/security_settings_pattern_sub.xml
@@ -26,7 +26,7 @@
     <com.android.settings.TimeoutListPreference
         android:key="lock_after_timeout"
         android:title="@string/lock_after_timeout"
-        android:summary="@string/lock_after_timeout_summary"
+        android:summary="@string/summary_placeholder"
         android:entries="@array/lock_after_timeout_entries"
         android:entryValues="@array/lock_after_timeout_values" />
 
@@ -36,7 +36,6 @@
 
     <com.android.settingslib.RestrictedPreference
         android:key="owner_info_settings"
-        android:title="@string/owner_info_settings_title"
-        android:summary="@string/owner_info_settings_summary" />
+        android:title="@string/owner_info_settings_title" />
 
 </PreferenceScreen>
diff --git a/res/xml/security_settings_pin_sub.xml b/res/xml/security_settings_pin_sub.xml
index 46c4999..c0287c0 100644
--- a/res/xml/security_settings_pin_sub.xml
+++ b/res/xml/security_settings_pin_sub.xml
@@ -22,7 +22,7 @@
     <com.android.settings.TimeoutListPreference
         android:key="lock_after_timeout"
         android:title="@string/lock_after_timeout"
-        android:summary="@string/lock_after_timeout_summary"
+        android:summary="@string/summary_placeholder"
         android:entries="@array/lock_after_timeout_entries"
         android:entryValues="@array/lock_after_timeout_values" />
 
@@ -32,7 +32,6 @@
 
     <com.android.settingslib.RestrictedPreference
         android:key="owner_info_settings"
-        android:title="@string/owner_info_settings_title"
-        android:summary="@string/owner_info_settings_summary" />
+        android:title="@string/owner_info_settings_title" />
 
 </PreferenceScreen>
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index d288a9d..a764d7a 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -14,12 +14,15 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-          android:title="@string/sound_settings"
-          android:key="sound_settings"
-          settings:keywords="@string/keywords_sounds">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:title="@string/sound_settings"
+    android:key="sound_settings"
+    settings:keywords="@string/keywords_sounds">
 
+    <PreferenceCategory
+        android:order="-100">
         <!-- Media volume -->
         <com.android.settings.notification.VolumeSeekBarPreference
                 android:key="media_volume"
@@ -49,7 +52,6 @@
                 android:key="vibrate_when_ringing"
                 android:title="@string/vibrate_when_ringing_title" />
 
-
         <!-- Interruptions -->
         <com.android.settingslib.RestrictedPreference
                 android:key="zen_mode"
@@ -68,27 +70,31 @@
             android:ringtoneType="ringtone"
             settings:allowDividerAbove="true" />
 
-        <!-- Default notification ringtone -->
-        <com.android.settings.DefaultRingtonePreference
-            android:key="notification_ringtone"
-            android:title="@string/notification_ringtone_title"
-            android:dialogTitle="@string/notification_ringtone_title"
-            android:summary="@string/summary_placeholder"
-            android:ringtoneType="notification" />
+    </PreferenceCategory>
 
-        <!-- Default alarm ringtone -->
-        <com.android.settings.DefaultRingtonePreference
-            android:key="alarm_ringtone"
-            android:title="@string/alarm_ringtone_title"
-            android:dialogTitle="@string/alarm_ringtone_title"
-            android:summary="@string/summary_placeholder"
-            android:persistent="false"
-            android:ringtoneType="alarm" />
+    <!-- Default notification ringtone -->
+    <com.android.settings.DefaultRingtonePreference
+        android:key="notification_ringtone"
+        android:title="@string/notification_ringtone_title"
+        android:dialogTitle="@string/notification_ringtone_title"
+        android:summary="@string/summary_placeholder"
+        android:ringtoneType="notification"
+        android:order="-99"/>
 
-        <!-- Other sounds -->
-        <PreferenceCategory
-          android:key="other_sound_preferecence_category"
-          android:title="@string/other_sound_category_preference_title" />
+    <!-- Default alarm ringtone -->
+    <com.android.settings.DefaultRingtonePreference
+        android:key="alarm_ringtone"
+        android:title="@string/alarm_ringtone_title"
+        android:dialogTitle="@string/alarm_ringtone_title"
+        android:summary="@string/summary_placeholder"
+        android:persistent="false"
+        android:ringtoneType="alarm"
+        android:order="-98"/>
+
+    <!-- Other sounds -->
+    <PreferenceCategory
+          android:title="@string/other_sound_category_preference_title"
+          android:order="-50">
 
         <!-- Dial pad tones -->
         <SwitchPreference
@@ -136,21 +142,24 @@
           android:key="emergency_tone"
           android:title="@string/emergency_tone_title"
           android:summary="%s" />
+    </PreferenceCategory>
 
-        <com.android.settingslib.RestrictedPreference
-          android:key="cell_broadcast_settings"
-          android:title="@string/cell_broadcast_settings"
-          settings:useAdminDisabledSummary="true"
-          settings:allowDividerAbove="true" >
-                <intent
-                  android:action="android.intent.action.MAIN"
-                  android:targetPackage="com.android.cellbroadcastreceiver"
-                  android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings" />
-        </com.android.settingslib.RestrictedPreference>
+    <com.android.settingslib.RestrictedPreference
+      android:key="cell_broadcast_settings"
+      android:title="@string/cell_broadcast_settings"
+      settings:useAdminDisabledSummary="true"
+      settings:allowDividerAbove="true"
+      android:order="-1">
+            <intent
+              android:action="android.intent.action.MAIN"
+              android:targetPackage="com.android.cellbroadcastreceiver"
+              android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings" />
+    </com.android.settingslib.RestrictedPreference>
 
-        <com.android.settings.WorkOnlyCategory
-            android:key="sound_work_settings_section"
-            android:title="@string/sound_work_settings">
+    <com.android.settings.WorkOnlyCategory
+        android:key="sound_work_settings_section"
+        android:title="@string/sound_work_settings"
+        android:order="100">
 
                 <!-- Use the same sounds of the work profile -->
                 <SwitchPreference
@@ -184,5 +193,5 @@
                     android:ringtoneType="alarm"
                     android:dependency="work_use_personal_sounds" />
 
-        </com.android.settings.WorkOnlyCategory>
+    </com.android.settings.WorkOnlyCategory>
 </PreferenceScreen>
diff --git a/res/xml/system_dashboard_fragment.xml b/res/xml/system_dashboard_fragment.xml
index b50d2fd..a71c7585 100644
--- a/res/xml/system_dashboard_fragment.xml
+++ b/res/xml/system_dashboard_fragment.xml
@@ -18,6 +18,13 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/header_category_system">
 
+    <Preference
+        android:key="gesture_settings"
+        android:title="@string/gesture_preference_title"
+        android:icon="@drawable/ic_settings_gestures"
+        android:order="-250"
+        android:fragment="com.android.settings.gestures.GestureSettings" />
+
     <!-- Backup -->
     <Preference
         android:key="backup_settings"
@@ -50,6 +57,7 @@
     <Preference
         android:key="reset_dashboard"
         android:title="@string/reset_dashboard_title"
+        android:summary="@string/reset_dashboard_summary"
         android:icon="@drawable/ic_restore"
         android:order="-20"
         android:fragment="com.android.settings.system.ResetDashboardFragment" />
diff --git a/res/xml/tether_prefs.xml b/res/xml/tether_prefs.xml
index a506291..144cb41 100644
--- a/res/xml/tether_prefs.xml
+++ b/res/xml/tether_prefs.xml
@@ -17,14 +17,20 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   xmlns:settings="http://schemas.android.com/apk/res-auto">
 
+    <com.android.settings.widget.MasterSwitchPreference
+        android:key="wifi_tether"
+        android:title="@string/wifi_hotspot_checkbox_text"
+        android:summary="@string/summary_two_lines_placeholder"
+        android:fragment="com.android.settings.wifi.tether.WifiTetherSettings" />
+
     <SwitchPreference
         android:key="usb_tether_settings"
         android:title="@string/usb_tethering_button_text"
-        android:summary="@string/usb_tethering_subtext"/>
+        android:summary="@string/usb_tethering_subtext" />
 
     <SwitchPreference
         android:key="enable_wifi_ap"
-        android:title="@string/wifi_tether_checkbox_text"
+        android:title="@string/wifi_hotspot_checkbox_text"
         android:summary="@string/summary_two_lines_placeholder" />
 
     <Preference
@@ -35,7 +41,7 @@
     <SwitchPreference
         android:key="enable_bluetooth_tethering"
         android:title="@string/bluetooth_tether_checkbox_text"
-        android:summary="@string/bluetooth_tethering_subtext"/>
+        android:summary="@string/bluetooth_tethering_subtext" />
 
     <Preference
         android:key="disabled_on_data_saver"
diff --git a/res/xml/upgraded_channel_notification_settings.xml b/res/xml/upgraded_channel_notification_settings.xml
index c274abe..ee23435 100644
--- a/res/xml/upgraded_channel_notification_settings.xml
+++ b/res/xml/upgraded_channel_notification_settings.xml
@@ -38,14 +38,13 @@
         settings:useAdditionalSummary="true" />
 
     <PreferenceCategory
+        android:key="advanced"
         android:title="@string/advanced_apps">
 
-        <!-- Show badge -->
-        <com.android.settingslib.RestrictedSwitchPreference
-            android:key="badge"
-            android:title="@string/notification_channel_badge_title"
-            settings:useAdditionalSummary="true"
-            settings:restrictedSwitchSummary="@string/enabled_by_admin" />
+        <!-- Visibility Override -->
+        <com.android.settings.notification.RestrictedDropDownPreference
+            android:key="visibility_override"
+            android:title="@string/app_notification_visibility_override_title" />
 
         <!-- Lights -->
         <com.android.settingslib.RestrictedSwitchPreference
@@ -53,10 +52,12 @@
             android:title="@string/notification_show_lights_title"
             settings:useAdditionalSummary="true" />
 
-        <!-- Visibility Override -->
-        <com.android.settings.notification.RestrictedDropDownPreference
-            android:key="visibility_override"
-            android:title="@string/app_notification_visibility_override_title" />
+        <!-- Show badge -->
+        <com.android.settingslib.RestrictedSwitchPreference
+            android:key="badge"
+            android:title="@string/notification_channel_badge_title"
+            settings:useAdditionalSummary="true"
+            settings:restrictedSwitchSummary="@string/enabled_by_admin" />
 
         <!-- Bypass DND -->
         <com.android.settingslib.RestrictedSwitchPreference
diff --git a/res/xml/user_and_accounts_settings.xml b/res/xml/user_and_accounts_settings.xml
index 63a5b10..a62b839 100644
--- a/res/xml/user_and_accounts_settings.xml
+++ b/res/xml/user_and_accounts_settings.xml
@@ -48,6 +48,7 @@
     <com.android.settingslib.RestrictedSwitchPreference
         android:key="add_users_when_locked"
         android:title="@string/user_add_on_lockscreen_menu"
+        android:singleLineTitle="false"
         android:order="105"/>
 
     <PreferenceCategory
diff --git a/res/xml/wifi_display_saved_access_points.xml b/res/xml/wifi_display_saved_access_points.xml
index 2be31d2..81fb701 100644
--- a/res/xml/wifi_display_saved_access_points.xml
+++ b/res/xml/wifi_display_saved_access_points.xml
@@ -15,6 +15,6 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/wifi_display_settings_title">
+    android:title="@string/wifi_saved_access_points_titlebar">
 
 </PreferenceScreen>
diff --git a/res/xml/wifi_network_details_fragment.xml b/res/xml/wifi_network_details_fragment.xml
index 64e61b1..443cb88 100644
--- a/res/xml/wifi_network_details_fragment.xml
+++ b/res/xml/wifi_network_details_fragment.xml
@@ -14,9 +14,7 @@
      limitations under the License.
 -->
 
-<PreferenceScreen
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" >
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <com.android.settings.applications.LayoutPreference
         android:key="connection_header"
diff --git a/res/xml/wifi_tether_settings.xml b/res/xml/wifi_tether_settings.xml
new file mode 100644
index 0000000..feed268
--- /dev/null
+++ b/res/xml/wifi_tether_settings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <com.android.settings.widget.ValidatedEditTextPreference
+        android:key="wifi_tether_network_name"
+        android:title="@string/wifi_hotspot_name_title"
+        android:summary="@string/summary_placeholder" />
+
+    <com.android.settings.widget.ValidatedEditTextPreference
+        android:key="wifi_tether_network_password"
+        android:title="@string/wifi_hotspot_password_title" />
+
+    <ListPreference
+        android:key="wifi_tether_network_ap_band"
+        android:title="@string/wifi_hotspot_ap_band_title"
+        android:summary="@string/summary_placeholder" />
+</PreferenceScreen>
\ No newline at end of file
diff --git a/src/com/android/settings/ActivityPicker.java b/src/com/android/settings/ActivityPicker.java
index 2c3436f..ae61944 100644
--- a/src/com/android/settings/ActivityPicker.java
+++ b/src/com/android/settings/ActivityPicker.java
@@ -78,6 +78,10 @@
         Parcelable parcel = intent.getParcelableExtra(Intent.EXTRA_INTENT);
         if (parcel instanceof Intent) {
             mBaseIntent = (Intent) parcel;
+            mBaseIntent.setFlags(mBaseIntent.getFlags() & ~(Intent.FLAG_GRANT_READ_URI_PERMISSION
+                    | Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+                    | Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION
+                    | Intent.FLAG_GRANT_PREFIX_URI_PERMISSION));
         } else {
             mBaseIntent = new Intent(Intent.ACTION_MAIN, null);
             mBaseIntent.addCategory(Intent.CATEGORY_DEFAULT);
diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index e61f959..edf241d 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -249,7 +249,9 @@
                     finish();
                     return;
                 }
-                mUri = getContentResolver().insert(uri, new ContentValues());
+                ContentValues contentValues = new ContentValues();
+                contentValues.put(Telephony.Carriers.EDITED, Telephony.Carriers.USER_EDITED);
+                mUri = getContentResolver().insert(uri, contentValues);
             } else {
                 mUri = ContentUris.withAppendedId(Telephony.Carriers.CONTENT_URI,
                         icicle.getInt(SAVED_POS));
@@ -297,6 +299,11 @@
             getPreferenceScreen().getPreference(i).setOnPreferenceChangeListener(this);
         }
 
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
         fillUi();
     }
 
@@ -459,7 +466,9 @@
         if (mUri == null && mNewApn) {
             // The URI could have been deleted when activity is paused,
             // therefore, it needs to be restored.
-            mUri = getContentResolver().insert(getIntent().getData(), new ContentValues());
+            ContentValues contentValues = new ContentValues();
+            contentValues.put(Telephony.Carriers.EDITED, Telephony.Carriers.USER_EDITED);
+            mUri = getContentResolver().insert(getIntent().getData(), contentValues);
             if (mUri == null) {
                 Log.w(TAG, "Failed to insert new telephony provider into "
                         + getIntent().getData());
@@ -1039,6 +1048,8 @@
                 callUpdate,
                 CARRIER_ENABLED_INDEX);
 
+        values.put(Telephony.Carriers.EDITED, Telephony.Carriers.USER_EDITED);
+
         if (callUpdate) {
             getContentResolver().update(mUri, values, null, null);
         } else {
diff --git a/src/com/android/settings/AppHeader.java b/src/com/android/settings/AppHeader.java
deleted file mode 100644
index 45902d8..0000000
--- a/src/com/android/settings/AppHeader.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import android.app.Fragment;
-import android.content.Intent;
-import android.os.Bundle;
-
-public class AppHeader {
-
-    public static final String EXTRA_HIDE_INFO_BUTTON = "hideInfoButton";
-    // constant value that can be used to check return code from sub activity.
-    private static final int INSTALLED_APP_DETAILS = 1;
-
-    public static boolean includeAppInfo(final Fragment fragment) {
-        Bundle args = fragment.getArguments();
-        boolean showInfo = true;
-        if (args != null && args.getBoolean(EXTRA_HIDE_INFO_BUTTON, false)) {
-            showInfo = false;
-        }
-        Intent intent = fragment.getActivity().getIntent();
-        if (intent != null && intent.getBooleanExtra(EXTRA_HIDE_INFO_BUTTON, false)) {
-            showInfo = false;
-        }
-        return showInfo;
-    }
-}
diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java
index 326f200..2afbdb2 100644
--- a/src/com/android/settings/DateTimeSettings.java
+++ b/src/com/android/settings/DateTimeSettings.java
@@ -24,7 +24,6 @@
 import android.provider.SearchIndexableResource;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.datetime.AutoTimePreferenceController;
@@ -36,6 +35,7 @@
 import com.android.settings.datetime.TimeZonePreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.datetime.ZoneGetter;
 
 import java.util.ArrayList;
@@ -72,8 +72,8 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
-        final List<PreferenceController> controllers = new ArrayList<>();
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         final Activity activity = getActivity();
         final Intent intent = activity.getIntent();
         final boolean isFromSUW = intent.getBooleanExtra(EXTRA_IS_FROM_SUW, false);
diff --git a/src/com/android/settings/DeviceAdminAdd.java b/src/com/android/settings/DeviceAdminAdd.java
index 5978f5e..0ad882d 100644
--- a/src/com/android/settings/DeviceAdminAdd.java
+++ b/src/com/android/settings/DeviceAdminAdd.java
@@ -36,7 +36,6 @@
 import android.content.pm.ResolveInfo;
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
-import android.net.Uri;
 import android.os.Binder;
 import android.os.Bundle;
 import android.os.Handler;
@@ -60,17 +59,17 @@
 import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.R;
 import com.android.settings.users.UserDialogs;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 public class DeviceAdminAdd extends Activity {
     static final String TAG = "DeviceAdminAdd";
@@ -147,18 +146,14 @@
                 DevicePolicyManager.EXTRA_DEVICE_ADMIN);
         if (who == null) {
             String packageName = getIntent().getStringExtra(EXTRA_DEVICE_ADMIN_PACKAGE_NAME);
-            for (ComponentName component : mDPM.getActiveAdmins()) {
-                if (component.getPackageName().equals(packageName)) {
-                    who = component;
-                    mUninstalling = true;
-                    break;
-                }
-            }
-            if (who == null) {
+            Optional<ComponentName> installedAdmin = findAdminWithPackageName(packageName);
+            if (!installedAdmin.isPresent()) {
                 Log.w(TAG, "No component specified in " + action);
                 finish();
                 return;
             }
+            who = installedAdmin.get();
+            mUninstalling = true;
         }
 
         if (action != null && action.equals(DevicePolicyManager.ACTION_SET_PROFILE_OWNER)) {
@@ -353,23 +348,13 @@
         restrictedAction.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 if (!mActionButton.isEnabled()) {
+                    showPolicyTransparencyDialogIfRequired();
                     return;
                 }
                 if (mAdding) {
                     addAndFinish();
                 } else if (isManagedProfile(mDeviceAdmin)
                         && mDeviceAdmin.getComponent().equals(mDPM.getProfileOwner())) {
-                    if (hasBaseCantRemoveProfileRestriction()) {
-                        // If DISALLOW_REMOVE_MANAGED_PROFILE is set by the system, there's no
-                        // point showing a dialog saying it's disabled by an admin.
-                        return;
-                    }
-                    EnforcedAdmin enforcedAdmin = getAdminEnforcingCantRemoveProfile();
-                    if (enforcedAdmin != null) {
-                        RestrictedLockUtils.sendShowAdminSupportDetailsIntent(DeviceAdminAdd.this,
-                                enforcedAdmin);
-                        return;
-                    }
                     final int userId = UserHandle.myUserId();
                     UserDialogs.createRemoveDialog(DeviceAdminAdd.this, userId,
                             new DialogInterface.OnClickListener() {
@@ -380,7 +365,7 @@
                                     finish();
                                 }
                             }
-                            ).show();
+                    ).show();
                 } else if (mUninstalling) {
                     mDPM.uninstallPackageWithActiveAdmins(mDeviceAdmin.getPackageName());
                     finish();
@@ -414,6 +399,26 @@
         });
     }
 
+    /**
+     * Shows a dialog to explain why the button is disabled if required.
+     */
+    private void showPolicyTransparencyDialogIfRequired() {
+        if (isManagedProfile(mDeviceAdmin)
+                && mDeviceAdmin.getComponent().equals(mDPM.getProfileOwner())) {
+            if (hasBaseCantRemoveProfileRestriction()) {
+                // If DISALLOW_REMOVE_MANAGED_PROFILE is set by the system, there's no
+                // point showing a dialog saying it's disabled by an admin.
+                return;
+            }
+            EnforcedAdmin enforcedAdmin = getAdminEnforcingCantRemoveProfile();
+            if (enforcedAdmin != null) {
+                RestrictedLockUtils.sendShowAdminSupportDetailsIntent(
+                        DeviceAdminAdd.this,
+                        enforcedAdmin);
+            }
+        }
+    }
+
     void addAndFinish() {
         try {
             logSpecialPermissionChange(true, mDeviceAdmin.getComponent().getPackageName());
@@ -684,6 +689,18 @@
         return info != null ? info.isManagedProfile() : false;
     }
 
+    /**
+     * @return an {@link Optional} containing the admin with a given package name, if it exists,
+     *         or {@link Optional#empty()} otherwise.
+     */
+    private Optional<ComponentName> findAdminWithPackageName(String packageName) {
+        List<ComponentName> admins = mDPM.getActiveAdmins();
+        if (admins == null) {
+            return Optional.empty();
+        }
+        return admins.stream().filter(i -> i.getPackageName().equals(packageName)).findAny();
+    }
+
     private boolean isAdminUninstallable() {
         // System apps can't be uninstalled.
         return !mDeviceAdmin.getActivityInfo().applicationInfo.isSystemApp();
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 0805e4b..7ca52e2 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -23,7 +23,6 @@
 import android.provider.SearchIndexableResource;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.deviceinfo.AdditionalSystemUpdatePreferenceController;
@@ -41,6 +40,7 @@
 import com.android.settings.deviceinfo.SecurityPatchPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
@@ -84,7 +84,7 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
         return buildPreferenceControllers(context, getActivity(), this /* fragment */,
                 getLifecycle());
     }
@@ -114,9 +114,9 @@
         }
     };
 
-    private static List<PreferenceController> buildPreferenceControllers(Context context,
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
             Activity activity, Fragment fragment, Lifecycle lifecycle) {
-        final List<PreferenceController> controllers = new ArrayList<>();
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(
                 new BuildNumberPreferenceController(context, activity, fragment, lifecycle));
         controllers.add(new AdditionalSystemUpdatePreferenceController(context));
@@ -149,7 +149,7 @@
                 }
 
                 @Override
-                public List<PreferenceController> getPreferenceControllers(Context context) {
+                public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
                     return buildPreferenceControllers(context, null /*activity */,
                             null /* fragment */, null /* lifecycle */);
                 }
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 15818e2..86c3da1 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -21,7 +21,6 @@
 
 import com.android.internal.hardware.AmbientDisplayConfiguration;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.display.AmbientDisplayPreferenceController;
 import com.android.settings.display.AutoBrightnessPreferenceController;
@@ -41,6 +40,7 @@
 import com.android.settings.display.WallpaperPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
@@ -77,7 +77,7 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
         return buildPreferenceControllers(context, getLifecycle());
     }
 
@@ -86,9 +86,9 @@
         return R.string.help_uri_display;
     }
 
-    private static List<PreferenceController> buildPreferenceControllers(
+    private static List<AbstractPreferenceController> buildPreferenceControllers(
             Context context, Lifecycle lifecycle) {
-        final List<PreferenceController> controllers = new ArrayList<>();
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new AutoBrightnessPreferenceController(context, KEY_AUTO_BRIGHTNESS));
         controllers.add(new AutoRotatePreferenceController(context, lifecycle));
         controllers.add(new CameraGesturePreferenceController(context));
@@ -134,7 +134,7 @@
                 }
 
                 @Override
-                public List<PreferenceController> getPreferenceControllers(Context context) {
+                public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
                     return buildPreferenceControllers(context, null);
                 }
             };
diff --git a/src/com/android/settings/DividerPreference.java b/src/com/android/settings/DividerPreference.java
index a971091..aec7d44 100644
--- a/src/com/android/settings/DividerPreference.java
+++ b/src/com/android/settings/DividerPreference.java
@@ -19,8 +19,8 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
-import android.widget.TextView;
 
+@Deprecated
 public class DividerPreference extends Preference {
 
     private Boolean mAllowAbove;
@@ -35,10 +35,11 @@
         if (a.hasValue(R.styleable.DividerPreference_allowDividerBelow)) {
             mAllowBelow = a.getBoolean(R.styleable.DividerPreference_allowDividerBelow, false);
         }
+        a.recycle();
     }
 
     public DividerPreference(Context context) {
-        this(context, null);
+        this(context, null /* attrs */);
     }
 
     public void setDividerAllowedAbove(boolean allowed) {
diff --git a/src/com/android/settings/EditPinPreference.java b/src/com/android/settings/EditPinPreference.java
index 2da4541..3f992e9 100644
--- a/src/com/android/settings/EditPinPreference.java
+++ b/src/com/android/settings/EditPinPreference.java
@@ -33,9 +33,9 @@
     interface OnPinEnteredListener {
         void onPinEntered(EditPinPreference preference, boolean positiveResult);
     }
-
+    
     private OnPinEnteredListener mPinListener;
-
+    
     public EditPinPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
@@ -43,7 +43,7 @@
     public EditPinPreference(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
     }
-
+    
     public void setOnPinEnteredListener(OnPinEnteredListener listener) {
         mPinListener = listener;
     }
diff --git a/src/com/android/settings/HelpTrampoline.java b/src/com/android/settings/HelpTrampoline.java
index 0de15e3..7d3d91e 100644
--- a/src/com/android/settings/HelpTrampoline.java
+++ b/src/com/android/settings/HelpTrampoline.java
@@ -21,6 +21,7 @@
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.settingslib.HelpUtils;
@@ -34,6 +35,11 @@
 
         try {
             final String name = getIntent().getStringExtra(Intent.EXTRA_TEXT);
+            if (TextUtils.isEmpty(name)) {
+                finishAndRemoveTask();
+                return;
+            }
+
             final int id = getResources().getIdentifier(name, "string", getPackageName());
             final String value = getResources().getString(id);
 
diff --git a/src/com/android/settings/IconPreferenceScreen.java b/src/com/android/settings/IconPreferenceScreen.java
deleted file mode 100644
index 5d4c0e3..0000000
--- a/src/com/android/settings/IconPreferenceScreen.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.drawable.Drawable;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.util.AttributeSet;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-public class IconPreferenceScreen extends Preference {
-
-    private Drawable mIcon;
-
-    // Whether or not the text and icon should be highlighted (as selected)
-    private boolean mHighlight;
-
-    public IconPreferenceScreen(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public IconPreferenceScreen(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        setLayoutResource(R.layout.preference_icon);
-        TypedArray a = context.obtainStyledAttributes(attrs,
-                R.styleable.IconPreferenceScreen, defStyle, 0);
-        mIcon = a.getDrawable(R.styleable.IconPreferenceScreen_icon);
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder view) {
-        super.onBindViewHolder(view);
-        ImageView imageView = (ImageView) view.findViewById(R.id.icon);
-        if (imageView != null && mIcon != null) {
-            imageView.setImageDrawable(mIcon);
-        }
-        TextView textView = (TextView) view.findViewById(android.R.id.title);
-    }
-
-    /**
-     * Sets the icon for this Preference with a Drawable.
-     *
-     * @param icon The icon for this Preference
-     */
-    public void setIcon(Drawable icon) {
-        if ((icon == null && mIcon != null) || (icon != null && !icon.equals(mIcon))) {
-            mIcon = icon;
-            notifyChanged();
-        }
-    }
-
-    /**
-     * Returns the icon of this Preference.
-     *
-     * @return The icon.
-     * @see #setIcon(Drawable)
-     */
-    public Drawable getIcon() {
-        return mIcon;
-    }
-
-    public void setHighlighted(boolean highlight) {
-        mHighlight = highlight;
-        notifyChanged();
-    }
-}
diff --git a/src/com/android/settings/MultiLinePreference.java b/src/com/android/settings/MultiLinePreference.java
deleted file mode 100644
index fff6b24..0000000
--- a/src/com/android/settings/MultiLinePreference.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.TextView;
-
-public class MultiLinePreference extends Preference {
-
-    public MultiLinePreference(Context ctx, AttributeSet attrs, int defStyle) {
-        super(ctx, attrs, defStyle);
-    }
-
-    public MultiLinePreference(Context ctx, AttributeSet attrs) {
-        super(ctx, attrs);
-    }
-
-    public MultiLinePreference(Context ctx) {
-        super(ctx);
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder view) {
-        super.onBindViewHolder(view);
-
-        TextView textView = (TextView) view.findViewById(android.R.id.title);
-        if (textView != null) {
-            textView.setSingleLine(false);
-        }
-    }
-}
diff --git a/src/com/android/settings/PreviewSeekBarPreferenceFragment.java b/src/com/android/settings/PreviewSeekBarPreferenceFragment.java
index 544999a..f5f3017 100644
--- a/src/com/android/settings/PreviewSeekBarPreferenceFragment.java
+++ b/src/com/android/settings/PreviewSeekBarPreferenceFragment.java
@@ -58,6 +58,7 @@
     private DotsPageIndicator mPageIndicator;
 
     private TextView mLabel;
+    private LabeledSeekBar mSeekBar;
     private View mLarger;
     private View mSmaller;
 
@@ -110,19 +111,17 @@
         // seek bar.
         final int max = Math.max(1, mEntries.length - 1);
 
-        final LabeledSeekBar seekBar = (LabeledSeekBar) content.findViewById(R.id.seek_bar);
-        seekBar.setLabels(mEntries);
-        seekBar.setMax(max);
-        seekBar.setProgress(mInitialIndex);
-        seekBar.setOnSeekBarChangeListener(new onPreviewSeekBarChangeListener());
+        mSeekBar = (LabeledSeekBar) content.findViewById(R.id.seek_bar);
+        mSeekBar.setLabels(mEntries);
+        mSeekBar.setMax(max);
 
         mSmaller = content.findViewById(R.id.smaller);
         mSmaller.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                final int progress = seekBar.getProgress();
+                final int progress = mSeekBar.getProgress();
                 if (progress > 0) {
-                    seekBar.setProgress(progress - 1, true);
+                    mSeekBar.setProgress(progress - 1, true);
                 }
             }
         });
@@ -131,9 +130,9 @@
         mLarger.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                final int progress = seekBar.getProgress();
-                if (progress < seekBar.getMax()) {
-                    seekBar.setProgress(progress + 1, true);
+                final int progress = mSeekBar.getProgress();
+                if (progress < mSeekBar.getMax()) {
+                    mSeekBar.setProgress(progress + 1, true);
                 }
             }
         });
@@ -141,7 +140,7 @@
         if (mEntries.length == 1) {
             // The larger and smaller buttons will be disabled when we call
             // setPreviewLayer() later in this method.
-            seekBar.setEnabled(false);
+            mSeekBar.setEnabled(false);
         }
 
         final Context context = getContext();
@@ -172,6 +171,21 @@
         return root;
     }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+        // Set SeekBar listener here to avoid onProgressChanged() is called
+        // during onRestoreInstanceState().
+        mSeekBar.setProgress(mCurrentIndex);
+        mSeekBar.setOnSeekBarChangeListener(new onPreviewSeekBarChangeListener());
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        mSeekBar.setOnSeekBarChangeListener(null);
+    }
+
     /**
      * Creates new configuration based on the current position of the SeekBar.
      */
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index db1f01d..b885483 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -173,6 +173,7 @@
 
     private TextView mDeviceId; //DeviceId is the IMEI in GSM and the MEID in CDMA
     private TextView number;
+    private TextView mSubscriberId;
     private TextView callState;
     private TextView operatorName;
     private TextView roamingState;
@@ -371,8 +372,9 @@
         mImsManager = ImsManager.getInstance(getApplicationContext(),
                 SubscriptionManager.getDefaultVoicePhoneId());
 
-        mDeviceId= (TextView) findViewById(R.id.imei);
+        mDeviceId = (TextView) findViewById(R.id.imei);
         number = (TextView) findViewById(R.id.number);
+        mSubscriberId = (TextView) findViewById(R.id.imsi);
         callState = (TextView) findViewById(R.id.call);
         operatorName = (TextView) findViewById(R.id.operator);
         roamingState = (TextView) findViewById(R.id.roaming);
@@ -896,6 +898,10 @@
         if (s == null) s = r.getString(R.string.radioInfo_unknown);
         mDeviceId.setText(s);
 
+        s = phone.getSubscriberId();
+        if (s == null) s = r.getString(R.string.radioInfo_unknown);
+        mSubscriberId.setText(s);
+
         //FIXME: Replace with a TelephonyManager call
         s = phone.getLine1Number();
         if (s == null) s = r.getString(R.string.radioInfo_unknown);
@@ -1136,11 +1142,11 @@
             switch (state) {
                 case TelephonyManager.DATA_CONNECTED:
                     //FIXME: Replace with a TelephonyManager call
-                    phone.setDataEnabled(false);
+                    phone.setUserDataEnabled(false);
                     break;
                 case TelephonyManager.DATA_DISCONNECTED:
                     //FIXME: Replace with a TelephonyManager call
-                    phone.setDataEnabled(true);
+                    phone.setUserDataEnabled(true);
                     break;
                 default:
                     // do nothing
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 736b85c..55f21fd 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -359,6 +359,15 @@
                     getResources().getString(R.string.switch_on_text));
         }
 
+        // Encryption status of device
+        if (LockPatternUtils.isDeviceEncryptionEnabled()) {
+            root.findPreference(KEY_ENCRYPTION_AND_CREDENTIALS).setSummary(
+                R.string.encryption_and_credential_settings_summary);
+        } else {
+            root.findPreference(KEY_ENCRYPTION_AND_CREDENTIALS).setSummary(
+                R.string.summary_placeholder);
+        }
+
         // Show password
         mShowPassword = (SwitchPreference) root.findPreference(KEY_SHOW_PASSWORD);
 
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index ed5180b..ee041e8 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -21,7 +21,6 @@
 import com.android.settings.applications.AppOpsSummary;
 import com.android.settings.enterprise.EnterprisePrivacySettings;
 import com.android.settings.fingerprint.FingerprintEnrollIntroduction;
-import com.android.settings.fingerprint.FingerprintSettings;
 import com.android.settings.password.ChooseLockGeneric;
 
 /**
@@ -53,6 +52,7 @@
     public static class UserDictionarySettingsActivity extends SettingsActivity { /* empty */ }
     public static class DisplaySettingsActivity extends SettingsActivity { /* empty */ }
     public static class NightDisplaySettingsActivity extends SettingsActivity { /* empty */ }
+    public static class NightDisplaySuggestionActivity extends NightDisplaySettingsActivity { /* empty */ }
     public static class DeviceInfoSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ApplicationSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ManageApplicationsActivity extends SettingsActivity { /* empty */ }
@@ -66,7 +66,7 @@
                 return true;
             }
             return super.isValidFragment(className);
-            }
+        }
     }
     public static class BackgroundCheckSummaryActivity extends SettingsActivity { /* empty */ }
     public static class StorageUseActivity extends SettingsActivity { /* empty */ }
@@ -88,7 +88,9 @@
     public static class AccountSyncSettingsInAddAccountActivity extends SettingsActivity { /* empty */ }
     public static class CryptKeeperSettingsActivity extends SettingsActivity { /* empty */ }
     public static class DeviceAdminSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class DataPlanUsageSummaryActivity extends SettingsActivity { /* empty */ }
     public static class DataUsageSummaryActivity extends SettingsActivity { /* empty */ }
+    public static class MobileDataUsageListActivity extends SettingsActivity { /* empty */ }
     public static class ConfigureWifiSettingsActivity extends SettingsActivity { /* empty */ }
     public static class SavedAccessPointsSettingsActivity extends SettingsActivity { /* empty */ }
     public static class TextToSpeechSettingsActivity extends SettingsActivity { /* empty */ }
@@ -97,6 +99,7 @@
     public static class DreamSettingsActivity extends SettingsActivity { /* empty */ }
     public static class NotificationStationActivity extends SettingsActivity { /* empty */ }
     public static class UserSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class SpecialAccessSettingsActivity extends SettingsActivity { /* empty */ }
     public static class NotificationAccessSettingsActivity extends SettingsActivity { /* empty */ }
     public static class VrListenersSettingsActivity extends SettingsActivity { /* empty */ }
     public static class PictureInPictureSettingsActivity extends SettingsActivity { /* empty */ }
@@ -124,6 +127,9 @@
     public static class AutomaticStorageManagerSettingsActivity extends SettingsActivity { /* empty */ }
     public static class GamesStorageActivity extends SettingsActivity { /* empty */ }
     public static class MoviesStorageActivity extends SettingsActivity { /* empty */ }
+    public static class PhotosStorageActivity extends SettingsActivity {
+        /* empty */
+    }
 
     public static class TopLevelSettings extends SettingsActivity { /* empty */ }
     public static class ApnSettingsActivity extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 556dbfb..609120d 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -33,7 +33,6 @@
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
-import android.nfc.NfcAdapter;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.UserHandle;
@@ -45,13 +44,11 @@
 import android.text.TextUtils;
 import android.transition.TransitionManager;
 import android.util.Log;
-import android.view.Menu;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.Toolbar;
-
 import com.android.internal.util.ArrayUtils;
 import com.android.settings.Settings.WifiSettingsActivity;
 import com.android.settings.backup.BackupSettingsActivity;
@@ -62,14 +59,11 @@
 import com.android.settings.dashboard.DashboardSummary;
 import com.android.settings.development.DevelopmentSettings;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.search.DynamicIndexableContentMonitor;
 import com.android.settings.search.SearchActivity;
-import com.android.settings.search.SearchFeatureProvider;
 import com.android.settings.wfd.WifiDisplaySettings;
 import com.android.settings.widget.SwitchBar;
 import com.android.settingslib.drawer.DashboardCategory;
 import com.android.settingslib.drawer.SettingsDrawerActivity;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -81,8 +75,6 @@
 
     private static final String LOG_TAG = "Settings";
 
-    public static final int LOADER_ID_INDEXABLE_CONTENT_MONITOR = 1;
-
     // Constants for state save/restore
     private static final String SAVE_KEY_CATEGORIES = ":settings:categories";
     @VisibleForTesting
@@ -188,8 +180,6 @@
         }
     };
 
-    private DynamicIndexableContentMonitor mDynamicIndexableContentMonitor;
-
     private SwitchBar mSwitchBar;
 
     private Button mNextButton;
@@ -540,10 +530,6 @@
                 mDevelopmentPreferencesListener);
 
         registerReceiver(mBatteryInfoReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
-        if (mDynamicIndexableContentMonitor == null) {
-            mDynamicIndexableContentMonitor = new DynamicIndexableContentMonitor();
-        }
-        mDynamicIndexableContentMonitor.register(this, LOADER_ID_INDEXABLE_CONTENT_MONITOR);
 
         updateTilesList();
     }
@@ -555,9 +541,6 @@
                 mDevelopmentPreferencesListener);
         mDevelopmentPreferencesListener = null;
         unregisterReceiver(mBatteryInfoReceiver);
-        if (mDynamicIndexableContentMonitor != null) {
-            mDynamicIndexableContentMonitor.unregister(this, LOADER_ID_INDEXABLE_CONTENT_MONITOR);
-        }
     }
 
     @Override
@@ -770,68 +753,97 @@
         PackageManager pm = getPackageManager();
         final UserManager um = UserManager.get(this);
         final boolean isAdmin = um.isAdminUser();
-
+        boolean somethingChanged = false;
         String packageName = getPackageName();
-        setTileEnabled(new ComponentName(packageName, WifiSettingsActivity.class.getName()),
-                pm.hasSystemFeature(PackageManager.FEATURE_WIFI), isAdmin);
+        somethingChanged = setTileEnabled(
+                new ComponentName(packageName, WifiSettingsActivity.class.getName()),
+                pm.hasSystemFeature(PackageManager.FEATURE_WIFI), isAdmin) || somethingChanged;
 
-        setTileEnabled(new ComponentName(packageName,
+        somethingChanged = setTileEnabled(new ComponentName(packageName,
                         Settings.BluetoothSettingsActivity.class.getName()),
-                pm.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH), isAdmin);
+                pm.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH), isAdmin)
+                || somethingChanged;
 
-        setTileEnabled(new ComponentName(packageName,
-                        Settings.DataUsageSummaryActivity.class.getName()),
-                Utils.isBandwidthControlEnabled(), isAdmin);
+        boolean isDataPlanFeatureEnabled = FeatureFactory.getFactory(this)
+                .getDataPlanFeatureProvider()
+                .isEnabled();
 
-        setTileEnabled(new ComponentName(packageName,
+        // When the data plan feature flag is turned on we disable DataUsageSummaryActivity
+        // and enable DataPlanUsageSummaryActivity. When the feature flag is turned off we do the
+        // reverse.
+
+        // Disable DataUsageSummaryActivity if the data plan feature flag is turned on otherwise
+        // disable DataPlanUsageSummaryActivity.
+        somethingChanged = setTileEnabled(
+                new ComponentName(packageName,
+                        isDataPlanFeatureEnabled
+                                ? Settings.DataUsageSummaryActivity.class.getName()
+                                : Settings.DataPlanUsageSummaryActivity.class.getName()),
+                false /* enabled */,
+                isAdmin) || somethingChanged;
+
+        // Enable DataUsageSummaryActivity if the data plan feature flag is turned on otherwise
+        // enable DataPlanUsageSummaryActivity.
+        somethingChanged = setTileEnabled(
+                new ComponentName(packageName,
+                        isDataPlanFeatureEnabled
+                                ? Settings.DataPlanUsageSummaryActivity.class.getName()
+                                : Settings.DataUsageSummaryActivity.class.getName()),
+                Utils.isBandwidthControlEnabled() /* enabled */,
+                isAdmin) || somethingChanged;
+
+        somethingChanged = setTileEnabled(new ComponentName(packageName,
                         Settings.SimSettingsActivity.class.getName()),
-                Utils.showSimCardTile(this), isAdmin);
+                Utils.showSimCardTile(this), isAdmin)
+                || somethingChanged;
 
-        setTileEnabled(new ComponentName(packageName,
+        somethingChanged = setTileEnabled(new ComponentName(packageName,
                         Settings.PowerUsageSummaryActivity.class.getName()),
-                mBatteryPresent, isAdmin);
+                mBatteryPresent, isAdmin) || somethingChanged;
 
-        setTileEnabled(new ComponentName(packageName,
+        somethingChanged = setTileEnabled(new ComponentName(packageName,
                         Settings.UserSettingsActivity.class.getName()),
                 UserHandle.MU_ENABLED && UserManager.supportsMultipleUsers()
-                        && !Utils.isMonkeyRunning(), isAdmin);
+                        && !Utils.isMonkeyRunning(), isAdmin)
+                || somethingChanged;
 
-        setTileEnabled(new ComponentName(packageName,
+        somethingChanged = setTileEnabled(new ComponentName(packageName,
                         Settings.NetworkDashboardActivity.class.getName()),
-                !UserManager.isDeviceInDemoMode(this), isAdmin);
+                !UserManager.isDeviceInDemoMode(this), isAdmin)
+                || somethingChanged;
 
-        setTileEnabled(new ComponentName(packageName,
+        somethingChanged = setTileEnabled(new ComponentName(packageName,
                         Settings.ConnectedDeviceDashboardActivity.class.getName()),
-                !UserManager.isDeviceInDemoMode(this), isAdmin);
+                !UserManager.isDeviceInDemoMode(this), isAdmin)
+                || somethingChanged;
 
-        setTileEnabled(new ComponentName(packageName,
+        somethingChanged = setTileEnabled(new ComponentName(packageName,
                         Settings.DateTimeSettingsActivity.class.getName()),
-                !UserManager.isDeviceInDemoMode(this), isAdmin);
-        NfcAdapter adapter = NfcAdapter.getDefaultAdapter(this);
-        setTileEnabled(new ComponentName(packageName,
-                        Settings.PaymentSettingsActivity.class.getName()),
-                pm.hasSystemFeature(PackageManager.FEATURE_NFC)
-                        && pm.hasSystemFeature(PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)
-                        && adapter != null && adapter.isEnabled(), isAdmin);
+                !UserManager.isDeviceInDemoMode(this), isAdmin)
+                || somethingChanged;
 
-        setTileEnabled(new ComponentName(packageName,
+        somethingChanged = setTileEnabled(new ComponentName(packageName,
                         Settings.PrintSettingsActivity.class.getName()),
-                pm.hasSystemFeature(PackageManager.FEATURE_PRINTING), isAdmin);
+                pm.hasSystemFeature(PackageManager.FEATURE_PRINTING), isAdmin)
+                || somethingChanged;
 
         final boolean showDev = mDevelopmentPreferences.getBoolean(
                 DevelopmentSettings.PREF_SHOW, android.os.Build.TYPE.equals("eng"))
                 && !um.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES);
-        setTileEnabled(new ComponentName(packageName,
+        somethingChanged = setTileEnabled(new ComponentName(packageName,
                         Settings.DevelopmentSettingsActivity.class.getName()),
-                showDev, isAdmin);
+                showDev, isAdmin)
+                || somethingChanged;
 
         // Enable/disable backup settings depending on whether the user is admin.
-        setTileEnabled(new ComponentName(packageName,
-                        BackupSettingsActivity.class.getName()), true, isAdmin);
+        somethingChanged = setTileEnabled(new ComponentName(packageName,
+                BackupSettingsActivity.class.getName()), true, isAdmin)
+                || somethingChanged;
 
-        setTileEnabled(new ComponentName(packageName,
+        somethingChanged = setTileEnabled(new ComponentName(packageName,
                         Settings.WifiDisplaySettingsActivity.class.getName()),
-                WifiDisplaySettings.isAvailable(this), isAdmin);
+                WifiDisplaySettings.isAvailable(this), isAdmin)
+                || somethingChanged;
 
         if (UserHandle.MU_ENABLED && !isAdmin) {
 
@@ -848,7 +860,8 @@
                                 SettingsGateway.SETTINGS_FOR_RESTRICTED, name);
                         if (packageName.equals(component.getPackageName())
                                 && !isEnabledForRestricted) {
-                            setTileEnabled(component, false, isAdmin);
+                            somethingChanged = setTileEnabled(component, false, isAdmin)
+                                    || somethingChanged;
                         }
                     }
                 }
@@ -856,16 +869,24 @@
         }
 
         // Final step, refresh categories.
-        updateCategories();
+        if (somethingChanged) {
+            Log.d(LOG_TAG, "Enabled state changed for some tiles, reloading all categories");
+            updateCategories();
+        } else {
+            Log.d(LOG_TAG, "No enabled state changed, skipping updateCategory call");
+        }
     }
 
-    private void setTileEnabled(ComponentName component, boolean enabled, boolean isAdmin) {
+    /**
+     * @return whether or not the enabled state actually changed.
+     */
+    private boolean setTileEnabled(ComponentName component, boolean enabled, boolean isAdmin) {
         if (UserHandle.MU_ENABLED && !isAdmin && getPackageName().equals(component.getPackageName())
                 && !ArrayUtils.contains(SettingsGateway.SETTINGS_FOR_RESTRICTED,
                 component.getClassName())) {
             enabled = false;
         }
-        setTileEnabled(component, enabled);
+        return setTileEnabled(component, enabled);
     }
 
     private void getMetaData() {
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 5f22545..a3d26af 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -49,6 +49,7 @@
 import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.core.instrumentation.Instrumentable;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.widget.LoadingViewController;
 import com.android.settingslib.CustomDialogPreference;
 import com.android.settingslib.CustomEditTextPreference;
 import com.android.settingslib.HelpUtils;
@@ -240,14 +241,11 @@
         unregisterObserverIfNeeded();
     }
 
-    public void showLoadingWhenEmpty() {
-        View loading = getView().findViewById(R.id.loading_container);
-        setEmptyView(loading);
-    }
-
     public void setLoading(boolean loading, boolean animate) {
-        View loading_container = getView().findViewById(R.id.loading_container);
-        Utils.handleLoadingContainer(loading_container, getListView(), !loading, animate);
+        View loadingContainer = getView().findViewById(R.id.loading_container);
+        LoadingViewController.handleLoadingContainer(loadingContainer, getListView(),
+                !loading /* done */,
+                animate);
     }
 
     public void registerObserverIfNeeded() {
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 708e17f..664916a 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -43,6 +43,8 @@
 import com.android.settings.datausage.DataSaverBackend;
 import com.android.settings.wifi.WifiApDialog;
 import com.android.settings.wifi.WifiApEnabler;
+import com.android.settings.wifi.tether.WifiTetherPreferenceController;
+import com.android.settings.wifi.tether.WifiTetherSettings;
 import com.android.settingslib.TetherUtil;
 
 import java.lang.ref.WeakReference;
@@ -63,7 +65,6 @@
     private static final String USB_TETHER_SETTINGS = "usb_tether_settings";
     private static final String ENABLE_WIFI_AP = "enable_wifi_ap";
     private static final String ENABLE_BLUETOOTH_TETHERING = "enable_bluetooth_tethering";
-    private static final String TETHER_CHOICE = "TETHER_TYPE";
     private static final String DATA_SAVER_FOOTER = "disabled_on_data_saver";
 
     private static final int DIALOG_AP_SETTINGS = 1;
@@ -100,17 +101,14 @@
     private WifiConfiguration mWifiConfig = null;
     private ConnectivityManager mCm;
 
+    private WifiTetherPreferenceController mWifiTetherPreferenceController;
+
     private boolean mRestartWifiApAfterConfigChange;
 
     private boolean mUsbConnected;
     private boolean mMassStorageActive;
 
     private boolean mBluetoothEnableForTether;
-
-    /* Stores the package name and the class name of the provisioning app */
-    private String[] mProvisionApp;
-    private static final int PROVISION_REQUEST = 0;
-
     private boolean mUnavailable;
 
     private DataSaverBackend mDataSaverBackend;
@@ -127,6 +125,13 @@
     }
 
     @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        mWifiTetherPreferenceController =
+                new WifiTetherPreferenceController(context, getLifecycle());
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
@@ -154,6 +159,7 @@
 
         mEnableWifiAp =
                 (SwitchPreference) findPreference(ENABLE_WIFI_AP);
+
         Preference wifiApSettings = findPreference(WIFI_AP_SSID_AND_SECURITY);
         mUsbTether = (SwitchPreference) findPreference(USB_TETHER_SETTINGS);
         mBluetoothTether = (SwitchPreference) findPreference(ENABLE_BLUETOOTH_TETHERING);
@@ -175,12 +181,18 @@
             getPreferenceScreen().removePreference(mUsbTether);
         }
 
-        if (wifiAvailable && !Utils.isMonkeyRunning()) {
-            mWifiApEnabler = new WifiApEnabler(activity, mDataSaverBackend, mEnableWifiAp);
-            initWifiTethering();
+        mWifiTetherPreferenceController.displayPreference(getPreferenceScreen());
+        if (WifiTetherSettings.isTetherSettingPageEnabled()) {
+            removePreference(ENABLE_WIFI_AP);
+            removePreference(WIFI_AP_SSID_AND_SECURITY);
         } else {
-            getPreferenceScreen().removePreference(mEnableWifiAp);
-            getPreferenceScreen().removePreference(wifiApSettings);
+            if (wifiAvailable && !Utils.isMonkeyRunning()) {
+                mWifiApEnabler = new WifiApEnabler(activity, mDataSaverBackend, mEnableWifiAp);
+                initWifiTethering();
+            } else {
+                getPreferenceScreen().removePreference(mEnableWifiAp);
+                getPreferenceScreen().removePreference(wifiApSettings);
+            }
         }
 
         if (!bluetoothAvailable) {
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 5371ca4..417ac0f 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -51,6 +51,9 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.hardware.fingerprint.FingerprintManager;
+import android.icu.text.MeasureFormat;
+import android.icu.util.Measure;
+import android.icu.util.MeasureUnit;
 import android.net.ConnectivityManager;
 import android.net.LinkProperties;
 import android.net.Network;
@@ -104,6 +107,7 @@
 import com.android.internal.util.ArrayUtils;
 import com.android.internal.util.UserIcons;
 import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.enterprise.DevicePolicyManagerWrapper;
 import com.android.settings.password.FingerprintManagerWrapper;
 import com.android.settings.password.IFingerprintManager;
 
@@ -821,33 +825,36 @@
             minutes = seconds / SECONDS_PER_MINUTE;
             seconds -= minutes * SECONDS_PER_MINUTE;
         }
-        if (withSeconds) {
-            if (days > 0) {
-                sb.append(context.getString(R.string.battery_history_days,
-                        days, hours, minutes, seconds));
-            } else if (hours > 0) {
-                sb.append(context.getString(R.string.battery_history_hours,
-                        hours, minutes, seconds));
-            } else if (minutes > 0) {
-                sb.append(context.getString(R.string.battery_history_minutes, minutes, seconds));
-            } else {
-                sb.append(context.getString(R.string.battery_history_seconds, seconds));
-            }
-        } else {
-            if (days > 0) {
-                sb.append(context.getString(R.string.battery_history_days_no_seconds,
-                        days, hours, minutes));
-            } else if (hours > 0) {
-                sb.append(context.getString(R.string.battery_history_hours_no_seconds,
-                        hours, minutes));
-            } else {
-                sb.append(context.getString(R.string.battery_history_minutes_no_seconds, minutes));
 
-                // Add ttsSpan if it only have minute value, because it will be read as "meters"
-                TtsSpan ttsSpan = new TtsSpan.MeasureBuilder().setNumber(minutes)
-                        .setUnit("minute").build();
-                sb.setSpan(ttsSpan, 0, sb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-            }
+        final ArrayList<Measure> measureList = new ArrayList(4);
+        if (days > 0) {
+            measureList.add(new Measure(days, MeasureUnit.DAY));
+        }
+        if (hours > 0) {
+            measureList.add(new Measure(hours, MeasureUnit.HOUR));
+        }
+        if (minutes > 0) {
+            measureList.add(new Measure(minutes, MeasureUnit.MINUTE));
+        }
+        if (withSeconds && seconds > 0) {
+            measureList.add(new Measure(seconds, MeasureUnit.SECOND));
+        }
+        if (measureList.size() == 0) {
+            // Everything addable was zero, so nothing was added. We add a zero.
+            measureList.add(new Measure(0, withSeconds ? MeasureUnit.SECOND : MeasureUnit.MINUTE));
+        }
+        final Measure[] measureArray = measureList.toArray(new Measure[measureList.size()]);
+
+        final Locale locale = context.getResources().getConfiguration().locale;
+        final MeasureFormat measureFormat = MeasureFormat.getInstance(
+                locale, MeasureFormat.FormatWidth.NARROW);
+        sb.append(measureFormat.formatMeasures(measureArray));
+
+        if (measureArray.length == 1 && MeasureUnit.MINUTE.equals(measureArray[0].getUnit())) {
+            // Add ttsSpan if it only have minute value, because it will be read as "meters"
+            final TtsSpan ttsSpan = new TtsSpan.MeasureBuilder().setNumber(minutes)
+                    .setUnit("minute").build();
+            sb.setSpan(ttsSpan, 0, sb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
         }
 
         return sb;
@@ -943,43 +950,6 @@
         return result;
     }
 
-    // TODO: move this out of Utils to a mixin or a controller or a helper class.
-    @Deprecated
-    public static void handleLoadingContainer(View loading, View doneLoading, boolean done,
-            boolean animate) {
-        setViewShown(loading, !done, animate);
-        setViewShown(doneLoading, done, animate);
-    }
-
-    private static void setViewShown(final View view, boolean shown, boolean animate) {
-        if (animate) {
-            Animation animation = AnimationUtils.loadAnimation(view.getContext(),
-                    shown ? android.R.anim.fade_in : android.R.anim.fade_out);
-            if (shown) {
-                view.setVisibility(View.VISIBLE);
-            } else {
-                animation.setAnimationListener(new AnimationListener() {
-                    @Override
-                    public void onAnimationStart(Animation animation) {
-                    }
-
-                    @Override
-                    public void onAnimationRepeat(Animation animation) {
-                    }
-
-                    @Override
-                    public void onAnimationEnd(Animation animation) {
-                        view.setVisibility(View.INVISIBLE);
-                    }
-                });
-            }
-            view.startAnimation(animation);
-        } else {
-            view.clearAnimation();
-            view.setVisibility(shown ? View.VISIBLE : View.INVISIBLE);
-        }
-    }
-
     /**
      * Returns the application info of the currently installed MDM package.
      */
@@ -1311,6 +1281,28 @@
     }
 
     /**
+     * Return {@code true} if the supplied package is device owner or profile owner of at
+     * least one user.
+     * @param userManager used to get profile owner app for each user
+     * @param devicePolicyManager used to check whether it is device owner app
+     * @param packageName package to check about
+     */
+    public static boolean isProfileOrDeviceOwner(UserManager userManager,
+            DevicePolicyManagerWrapper devicePolicyManager, String packageName) {
+        List<UserInfo> userInfos = userManager.getUsers();
+        if (devicePolicyManager.isDeviceOwnerAppOnAnyUser(packageName)) {
+            return true;
+        }
+        for (int i = 0, size = userInfos.size(); i < size; i++) {
+            ComponentName cn = devicePolicyManager.getProfileOwnerAsUser(userInfos.get(i).id);
+            if (cn != null && cn.getPackageName().equals(packageName)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
      * Return the resource id to represent the install status for an app
      */
     @StringRes
@@ -1321,20 +1313,6 @@
         return info.enabled ? R.string.installed : R.string.disabled;
     }
 
-    /**
-     * Control if other apps can display overlays. By default this is allowed. Be sure to
-     * re-enable overlays, as the effect is system-wide.
-     */
-    public static void setOverlayAllowed(Context context, IBinder token, boolean allowed) {
-        AppOpsManager appOpsManager = context.getSystemService(AppOpsManager.class);
-        if (appOpsManager != null) {
-            appOpsManager.setUserRestriction(AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
-                    !allowed, token);
-            appOpsManager.setUserRestriction(AppOpsManager.OP_TOAST_WINDOW,
-                    !allowed, token);
-        }
-    }
-
     private static boolean isVolumeValid(VolumeInfo volume) {
         return (volume != null) && (volume.getType() == VolumeInfo.TYPE_PRIVATE)
                 && volume.isMountedReadable();
diff --git a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
index 0a6932f..c1c8a64 100644
--- a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
+++ b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
@@ -27,6 +27,8 @@
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -37,6 +39,8 @@
 import java.util.List;
 import java.util.Locale;
 
+import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+
 /**
  * Utility class for creating the dialog that asks users for explicit permission to grant
  * all of the requested capabilities to an accessibility service before the service is enabled
@@ -65,6 +69,10 @@
             return false;
         };
 
+        Window window = ad.getWindow();
+        WindowManager.LayoutParams params = window.getAttributes();
+        params.privateFlags |= PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+        window.setAttributes(params);
         ad.create();
         ad.getButton(AlertDialog.BUTTON_POSITIVE).setOnTouchListener(filterTouchListener);
         ad.setCanceledOnTouchOutside(true);
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 0766b1a..51b676d 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -20,7 +20,6 @@
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
 import android.content.Context;
-import android.content.pm.PackageManager;
 import android.content.pm.ServiceInfo;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
@@ -52,7 +51,6 @@
 import com.android.settings.Utils;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
-import com.android.settings.search.SearchIndexableRaw;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedPreference;
@@ -493,7 +491,7 @@
                     getString(R.string.accessibility_summary_state_disabled);
             final CharSequence serviceSummary = info.loadSummary(getPackageManager());
             final String stateSummaryCombo = getString(
-                    R.string.accessibility_summary_default_combination,
+                    R.string.preference_summary_default_combination,
                     serviceState, serviceSummary);
             preference.setSummary((TextUtils.isEmpty(serviceSummary)) ? serviceState
                     : stateSummaryCombo);
@@ -727,40 +725,6 @@
 
     public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
-        @Override
-        public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
-            List<SearchIndexableRaw> indexables = new ArrayList<>();
-
-            PackageManager packageManager = context.getPackageManager();
-            AccessibilityManager accessibilityManager =
-                    context.getSystemService(AccessibilityManager.class);
-
-            String screenTitle = context.getResources().getString(
-                    R.string.accessibility_settings);
-
-            // Indexing all services, regardless if enabled.
-            List<AccessibilityServiceInfo> services = accessibilityManager
-                    .getInstalledAccessibilityServiceList();
-            final int serviceCount = services.size();
-            for (int i = 0; i < serviceCount; i++) {
-                AccessibilityServiceInfo service = services.get(i);
-                if (service == null || service.getResolveInfo() == null) {
-                    continue;
-                }
-
-                ServiceInfo serviceInfo = service.getResolveInfo().serviceInfo;
-                ComponentName componentName = new ComponentName(serviceInfo.packageName,
-                        serviceInfo.name);
-
-                SearchIndexableRaw indexable = new SearchIndexableRaw(context);
-                indexable.key = componentName.flattenToString();
-                indexable.title = service.getResolveInfo().loadLabel(packageManager).toString();
-                indexable.screenTitle = screenTitle;
-                indexables.add(indexable);
-            }
-
-            return indexables;
-        }
 
         @Override
         public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
index da47a95..4e95cad 100644
--- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
@@ -83,34 +83,43 @@
     protected void onInstallSwitchBarToggleSwitch() {
         super.onInstallSwitchBarToggleSwitch();
         mSwitchBar.addOnSwitchChangeListener((Switch switchView, boolean enabled) -> {
-            onPreferenceToggled(Settings.Secure.ACCESSIBILITY_SHORTCUT_ENABLED, enabled);
+            Context context = getContext();
+            if (enabled && (getServiceInfo(context) == null)) {
+                // If no service is configured, we'll disable the shortcut shortly. Give the
+                // user a chance to select a service. We'll update the preferences when we resume.
+                Settings.Secure.putInt(
+                        getContentResolver(), Settings.Secure.ACCESSIBILITY_SHORTCUT_ENABLED, 1);
+                mServicePreference.setEnabled(true);
+                mServicePreference.performClick();
+            } else {
+                onPreferenceToggled(Settings.Secure.ACCESSIBILITY_SHORTCUT_ENABLED, enabled);
+            }
         });
     }
 
     @Override
     protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
         Settings.Secure.putInt(getContentResolver(), preferenceKey, enabled ? 1 : 0);
+        updatePreferences();
     }
 
     private void updatePreferences() {
         ContentResolver cr = getContentResolver();
+        Context context = getContext();
+        mServicePreference.setSummary(getServiceName(context));
+        if (getServiceInfo(context) == null) {
+            // If no service is configured, make sure the overall shortcut is turned off
+            Settings.Secure.putInt(
+                    getContentResolver(), Settings.Secure.ACCESSIBILITY_SHORTCUT_ENABLED, 0);
+        }
         boolean isEnabled = Settings.Secure
                 .getInt(cr, Settings.Secure.ACCESSIBILITY_SHORTCUT_ENABLED, 1) == 1;
-        mToggleSwitch.setChecked(isEnabled);
-        CharSequence serviceName = getServiceName(getContext());
-        mServicePreference.setSummary(serviceName);
+        mSwitchBar.setChecked(isEnabled);
         mOnLockScreenSwitchPreference.setChecked(Settings.Secure.getInt(
                 cr, Settings.Secure.ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN, 0) == 1);
-        if (TextUtils.equals(serviceName, getString(R.string.accessibility_no_service_selected))) {
-            // If there's no service configured, enabling the shortcut will have no effect
-            // It should already be disabled, but force the switch to off just in case
-            mToggleSwitch.setChecked(false);
-            mToggleSwitch.setEnabled(false);
-            mSwitchBar.setEnabled(false);
-        } else {
-            mToggleSwitch.setEnabled(true);
-            mSwitchBar.setEnabled(true);
-        }
+        // Only enable changing the service and lock screen behavior if the shortcut is on
+        mServicePreference.setEnabled(mToggleSwitch.isChecked());
+        mOnLockScreenSwitchPreference.setEnabled(mToggleSwitch.isChecked());
     }
 
     /**
@@ -120,17 +129,21 @@
      * @return The name of the service or a string saying that none is selected.
      */
     public static CharSequence getServiceName(Context context) {
-        ComponentName shortcutServiceName = ComponentName.unflattenFromString(
-                AccessibilityUtils.getShortcutTargetServiceComponentNameString(
-                        context, UserHandle.myUserId()));
-        AccessibilityServiceInfo shortcutServiceInfo = AccessibilityManager.getInstance(context)
-                .getInstalledServiceInfoWithComponentName(shortcutServiceName);
+        AccessibilityServiceInfo shortcutServiceInfo = getServiceInfo(context);
         if (shortcutServiceInfo != null) {
             return shortcutServiceInfo.getResolveInfo().loadLabel(context.getPackageManager());
         }
         return context.getString(R.string.accessibility_no_service_selected);
     }
 
+    private static AccessibilityServiceInfo getServiceInfo(Context context) {
+        ComponentName shortcutServiceName = ComponentName.unflattenFromString(
+                AccessibilityUtils.getShortcutTargetServiceComponentNameString(
+                        context, UserHandle.myUserId()));
+        return AccessibilityManager.getInstance(context)
+                .getInstalledServiceInfoWithComponentName(shortcutServiceName);
+    }
+
     public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
                 // This fragment is for details of the shortcut. Only the shortcut itself needs
diff --git a/src/com/android/settings/accessibility/OWNERS b/src/com/android/settings/accessibility/OWNERS
new file mode 100644
index 0000000..3394323
--- /dev/null
+++ b/src/com/android/settings/accessibility/OWNERS
@@ -0,0 +1,2 @@
+# Default reviewers for this and subdirectories.
+pweaver@google.com
diff --git a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
index ae57f06..07f4c37 100644
--- a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
+++ b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
@@ -16,7 +16,6 @@
 package com.android.settings.accessibility;
 
 import static android.content.DialogInterface.BUTTON_POSITIVE;
-import static com.android.settings.Utils.setOverlayAllowed;
 
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.app.Activity;
@@ -147,22 +146,6 @@
         }
 
         @Override
-        public void onResume() {
-            super.onResume();
-            if (mToken != null) {
-                setOverlayAllowed(getActivity(), mToken, false);
-            }
-        }
-
-        @Override
-        public void onPause() {
-            super.onPause();
-            if (mToken != null) {
-                setOverlayAllowed(getActivity(), mToken, true);
-            }
-        }
-
-        @Override
         public void onClick(DialogInterface dialog, int which) {
             final Fragment fragment = getTargetFragment();
             if ((which == BUTTON_POSITIVE) && (fragment instanceof DefaultAppPickerFragment)) {
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index 976a743..53f7fb5 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -48,8 +48,6 @@
 
 import java.util.List;
 
-import static com.android.settings.Utils.setOverlayAllowed;
-
 public class ToggleAccessibilityServicePreferenceFragment
         extends ToggleFeaturePreferenceFragment implements DialogInterface.OnClickListener {
 
@@ -72,8 +70,6 @@
 
     private int mShownDialogId;
 
-    private final IBinder mToken = new Binder();
-
     @Override
     public int getMetricsCategory() {
         return MetricsEvent.ACCESSIBILITY_SERVICE;
@@ -96,18 +92,12 @@
     public void onResume() {
         mSettingsContentObserver.register(getContentResolver());
         updateSwitchBarToggleSwitch();
-        if (mToken != null) {
-            setOverlayAllowed(getActivity(), mToken, false);
-        }
         super.onResume();
     }
 
     @Override
     public void onPause() {
         mSettingsContentObserver.unregister(getContentResolver());
-        if (mToken != null) {
-            setOverlayAllowed(getActivity(), mToken, true);
-        }
         super.onPause();
     }
 
diff --git a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
index 3d853fe..53664f5 100644
--- a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
+++ b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
@@ -27,9 +27,9 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settingslib.accounts.AuthenticatorHelper;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.drawer.Tile;
 
 import java.util.ArrayList;
@@ -39,6 +39,7 @@
 
     private static final String TAG = "AccountDetailDashboard";
     private static final String METADATA_IA_ACCOUNT = "com.android.settings.ia.account";
+    private static final String EXTRA_ACCOUNT_NAME = "extra.accountName";
 
     public static final String KEY_ACCOUNT = "account";
     public static final String KEY_ACCOUNT_TYPE = "account_type";
@@ -57,6 +58,7 @@
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
+        getPreferenceManager().setPreferenceComparisonCallback(null);
         Bundle args = getArguments();
         final Activity activity = getActivity();
         UserHandle userHandle = Utils.getSecureTargetUser(activity.getActivityToken(),
@@ -107,8 +109,8 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
-        final List<PreferenceController> controllers = new ArrayList<>();
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         mAccountSynController = new AccountSyncPreferenceController(context);
         controllers.add(mAccountSynController);
         mRemoveAccountController = new RemoveAccountPreferenceController(context, this);
@@ -127,7 +129,11 @@
         if (metadata == null) {
             return false;
         }
-        return mAccountType.equals(metadata.getString(METADATA_IA_ACCOUNT));
+        final boolean display = mAccountType.equals(metadata.getString(METADATA_IA_ACCOUNT));
+        if (display && tile.intent != null) {
+            tile.intent.putExtra(EXTRA_ACCOUNT_NAME, mAccount.name);
+        }
+        return display;
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/accounts/AccountHeaderPreferenceController.java b/src/com/android/settings/accounts/AccountHeaderPreferenceController.java
index 5cbd1b0..e2902a2 100644
--- a/src/com/android/settings/accounts/AccountHeaderPreferenceController.java
+++ b/src/com/android/settings/accounts/AccountHeaderPreferenceController.java
@@ -29,15 +29,16 @@
 
 import com.android.settings.R;
 import com.android.settings.applications.LayoutPreference;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.accounts.AuthenticatorHelper;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
-public class AccountHeaderPreferenceController extends PreferenceController
-        implements LifecycleObserver, OnResume {
+public class AccountHeaderPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver, OnResume {
 
     private static final String KEY_ACCOUNT_HEADER = "account_header";
 
diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java
index 03a620b..246baff 100644
--- a/src/com/android/settings/accounts/AccountPreferenceController.java
+++ b/src/com/android/settings/accounts/AccountPreferenceController.java
@@ -16,6 +16,12 @@
 
 package com.android.settings.accounts;
 
+import static android.content.Intent.EXTRA_USER;
+import static android.os.UserManager.DISALLOW_MODIFY_ACCOUNTS;
+import static android.os.UserManager.DISALLOW_REMOVE_MANAGED_PROFILE;
+import static android.provider.Settings.ACTION_ADD_ACCOUNT;
+import static android.provider.Settings.EXTRA_AUTHORITIES;
+
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.content.BroadcastReceiver;
@@ -45,13 +51,14 @@
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.search.SearchIndexableRaw;
 import com.android.settings.search.SearchFeatureProviderImpl;
+import com.android.settings.search.SearchIndexableRaw;
 import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.accounts.AuthenticatorHelper;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
@@ -61,17 +68,11 @@
 import java.util.Comparator;
 import java.util.List;
 
-import static android.content.Intent.EXTRA_USER;
-import static android.os.UserManager.DISALLOW_MODIFY_ACCOUNTS;
-import static android.os.UserManager.DISALLOW_REMOVE_MANAGED_PROFILE;
-import static android.provider.Settings.EXTRA_AUTHORITIES;
-
-public class AccountPreferenceController extends PreferenceController
-        implements AuthenticatorHelper.OnAccountsUpdateListener,
+public class AccountPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, AuthenticatorHelper.OnAccountsUpdateListener,
         OnPreferenceClickListener, LifecycleObserver, OnPause, OnResume {
 
     private static final String TAG = "AccountPrefController";
-    private static final String ADD_ACCOUNT_ACTION = "android.settings.ADD_ACCOUNT_SETTINGS";
 
     private static final int ORDER_ACCOUNT_PROFILES = 1;
     private static final int ORDER_LAST = 1002;
@@ -232,7 +233,7 @@
         for (int i = 0; i < count; i++) {
             ProfileData profileData = mProfiles.valueAt(i);
             if (preference == profileData.addAccountPreference) {
-                Intent intent = new Intent(ADD_ACCOUNT_ACTION);
+                Intent intent = new Intent(ACTION_ADD_ACCOUNT);
                 intent.putExtra(EXTRA_USER, profileData.userInfo.getUserHandle());
                 intent.putExtra(EXTRA_AUTHORITIES, mAuthorities);
                 mContext.startActivity(intent);
diff --git a/src/com/android/settings/accounts/AccountSyncPreferenceController.java b/src/com/android/settings/accounts/AccountSyncPreferenceController.java
index 2eee579..3eed037 100644
--- a/src/com/android/settings/accounts/AccountSyncPreferenceController.java
+++ b/src/com/android/settings/accounts/AccountSyncPreferenceController.java
@@ -31,11 +31,12 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.accounts.AuthenticatorHelper;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class AccountSyncPreferenceController extends PreferenceController
-        implements AuthenticatorHelper.OnAccountsUpdateListener {
+public class AccountSyncPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, AuthenticatorHelper.OnAccountsUpdateListener {
 
     private static final String TAG = "AccountSyncController";
     private static final String KEY_ACCOUNT_SYNC = "account_sync";
@@ -97,6 +98,9 @@
 
     @VisibleForTesting
     void updateSummary(Preference preference) {
+        if (mAccount == null) {
+            return;
+        }
         final int userId = mUserHandle.getIdentifier();
         final SyncAdapterType[] syncAdapters = ContentResolver.getSyncAdapterTypesAsUser(userId);
         int total = 0;
diff --git a/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java b/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java
index a3dd94d..f2f2307 100644
--- a/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java
+++ b/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java
@@ -19,15 +19,17 @@
 import android.provider.Settings.Global;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.users.UserCapabilities;
 import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
-public class AddUserWhenLockedPreferenceController extends PreferenceController
-        implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnPause, OnResume {
+public class AddUserWhenLockedPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
+        LifecycleObserver, OnPause, OnResume {
 
     private static final String KEY_ADD_USER_WHEN_LOCKED = "add_users_when_locked";
 
diff --git a/src/com/android/settings/accounts/AutoSyncDataPreferenceController.java b/src/com/android/settings/accounts/AutoSyncDataPreferenceController.java
index f5d7b64..128e88d 100644
--- a/src/com/android/settings/accounts/AutoSyncDataPreferenceController.java
+++ b/src/com/android/settings/accounts/AutoSyncDataPreferenceController.java
@@ -32,10 +32,12 @@
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class AutoSyncDataPreferenceController extends PreferenceController {
+public class AutoSyncDataPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
 
     private static final String TAG = "AutoSyncDataController";
     private static final String TAG_CONFIRM_AUTO_SYNC_CHANGE = "confirmAutoSyncChange";
diff --git a/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java b/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java
index 0c53041..e1aeeb2 100644
--- a/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java
+++ b/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java
@@ -23,15 +23,16 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.search.SearchIndexableRaw;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.List;
 
-public class EmergencyInfoPreferenceController extends PreferenceController {
+public class EmergencyInfoPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
 
     private static final String KEY_EMERGENCY_INFO = "emergency_info";
     private static final String ACTION_EDIT_EMERGENCY_INFO = "android.settings.EDIT_EMERGENCY_INFO";
diff --git a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
index f331144..b5133d3 100644
--- a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
+++ b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
@@ -21,6 +21,7 @@
 import android.accounts.AccountManagerFuture;
 import android.accounts.AuthenticatorException;
 import android.accounts.OperationCanceledException;
+import android.app.admin.DevicePolicyManager;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -29,33 +30,46 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.Process;
 import android.os.UserHandle;
+import android.os.UserManager;
 import android.support.v7.preference.PreferenceScreen;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 
+import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.applications.LayoutPreference;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.enterprise.DevicePolicyManagerWrapper;
+import com.android.settings.enterprise.DevicePolicyManagerWrapperImpl;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.io.IOException;
 
-public class RemoveAccountPreferenceController extends PreferenceController
-    implements OnClickListener {
+public class RemoveAccountPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, OnClickListener {
 
     private static final String KEY_REMOVE_ACCOUNT = "remove_account";
 
     private Account mAccount;
     private Fragment mParentFragment;
     private UserHandle mUserHandle;
+    private DevicePolicyManagerWrapper mDpm;
 
     public RemoveAccountPreferenceController(Context context, Fragment parent) {
+        this(context, parent, new DevicePolicyManagerWrapperImpl(
+                (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE)));
+    }
+
+    @VisibleForTesting
+    RemoveAccountPreferenceController(Context context, Fragment parent,
+            DevicePolicyManagerWrapper dpm) {
         super(context);
         mParentFragment = parent;
+        mDpm = dpm;
     }
 
     @Override
@@ -79,6 +93,12 @@
 
     @Override
     public void onClick(View v) {
+        final Intent intent = mDpm.createAdminSupportIntent(UserManager.DISALLOW_MODIFY_ACCOUNTS);
+        if (intent != null) {
+            // DISALLOW_MODIFY_ACCOUNTS is active, show admin support dialog
+            mContext.startActivity(intent);
+            return;
+        }
         ConfirmRemoveAccountDialog.show(mParentFragment, mAccount, mUserHandle);
     }
 
diff --git a/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java b/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java
index 792b77a..f375cf8 100644
--- a/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java
+++ b/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java
@@ -15,6 +15,8 @@
  */
 package com.android.settings.accounts;
 
+import static android.provider.Settings.EXTRA_AUTHORITIES;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.pm.UserInfo;
@@ -25,18 +27,16 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.drawer.Tile;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static android.provider.Settings.EXTRA_AUTHORITIES;
-
 public class UserAndAccountDashboardFragment extends DashboardFragment {
 
     private static final String TAG = "UserAndAccountDashboard";
@@ -63,8 +63,8 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
-        final List<PreferenceController> controllers = new ArrayList<>();
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new EmergencyInfoPreferenceController(context));
         AddUserWhenLockedPreferenceController addUserWhenLockedPrefController =
                 new AddUserWhenLockedPreferenceController(context);
@@ -81,15 +81,6 @@
         return controllers;
     }
 
-    @Override
-    protected boolean displayTile(Tile tile) {
-        final Bundle metadata = tile.metaData;
-        if (metadata != null) {
-            return metadata.getString(METADATA_IA_ACCOUNT) == null;
-        }
-        return true;
-    }
-
     private static class SummaryProvider implements SummaryLoader.SummaryProvider {
 
         private final Context mContext;
diff --git a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
index e0fc2b0..d306353 100644
--- a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
+++ b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
@@ -24,10 +24,10 @@
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.notification.EmergencyBroadcastPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -64,7 +64,7 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
         final Activity activity = getActivity();
         final Application app;
         if (activity != null) {
@@ -75,9 +75,9 @@
         return buildPreferenceControllers(context, app, this);
     }
 
-    private static List<PreferenceController> buildPreferenceControllers(Context context,
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
             Application app, Fragment host) {
-        final List<PreferenceController> controllers = new ArrayList<>();
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new EmergencyBroadcastPreferenceController(context,
                 "app_and_notif_cell_broadcast_settings"));
         controllers.add(new SpecialAppAccessPreferenceController(context));
@@ -97,7 +97,8 @@
                 }
 
                 @Override
-                public List<PreferenceController> getPreferenceControllers(Context context) {
+                public List<AbstractPreferenceController> getPreferenceControllers(
+                        Context context) {
                     return buildPreferenceControllers(context, null, null /* host */);
                 }
 
diff --git a/src/com/android/settings/applications/AppInfoBase.java b/src/com/android/settings/applications/AppInfoBase.java
index 564bc49..2aa3b0b 100644
--- a/src/com/android/settings/applications/AppInfoBase.java
+++ b/src/com/android/settings/applications/AppInfoBase.java
@@ -43,6 +43,8 @@
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.enterprise.DevicePolicyManagerWrapper;
+import com.android.settings.enterprise.DevicePolicyManagerWrapperImpl;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.applications.ApplicationsState;
@@ -73,7 +75,7 @@
     protected String mPackageName;
 
     protected IUsbManager mUsbManager;
-    protected DevicePolicyManager mDpm;
+    protected DevicePolicyManagerWrapper mDpm;
     protected UserManager mUserManager;
     protected PackageManager mPm;
 
@@ -92,7 +94,8 @@
                 .getApplicationFeatureProvider(activity);
         mState = ApplicationsState.getInstance(activity.getApplication());
         mSession = mState.newSession(this);
-        mDpm = (DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        mDpm = new DevicePolicyManagerWrapperImpl(
+                (DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE));
         mUserManager = (UserManager) activity.getSystemService(Context.USER_SERVICE);
         mPm = activity.getPackageManager();
         IBinder b = ServiceManager.getService(Context.USB_SERVICE);
@@ -135,7 +138,7 @@
         if (mPackageName == null) {
             Intent intent = (args == null) ?
                     getActivity().getIntent() : (Intent) args.getParcelable("intent");
-            if (intent != null) {
+            if (intent != null && intent.getData() != null) {
                 mPackageName = intent.getData().getSchemeSpecificPart();
             }
         }
diff --git a/src/com/android/settings/applications/AppInfoWithHeader.java b/src/com/android/settings/applications/AppInfoWithHeader.java
index 95877e9..3df81c7 100644
--- a/src/com/android/settings/applications/AppInfoWithHeader.java
+++ b/src/com/android/settings/applications/AppInfoWithHeader.java
@@ -51,7 +51,8 @@
                 .setIsInstantApp(AppUtils.isInstant(mPackageInfo.applicationInfo))
                 .setPackageName(mPackageName)
                 .setUid(mPackageInfo.applicationInfo.uid)
-                .setButtonActions(ActionType.ACTION_APP_INFO, ActionType.ACTION_NONE)
+                .setHasAppInfoLink(true)
+                .setButtonActions(ActionType.ACTION_NONE, ActionType.ACTION_NONE)
                 .done(activity, getPrefContext());
         getPreferenceScreen().addPreference(pref);
     }
diff --git a/src/com/android/settings/applications/AppPermissionsPreferenceController.java b/src/com/android/settings/applications/AppPermissionsPreferenceController.java
index 57ec6d8..f6a2271 100644
--- a/src/com/android/settings/applications/AppPermissionsPreferenceController.java
+++ b/src/com/android/settings/applications/AppPermissionsPreferenceController.java
@@ -24,11 +24,14 @@
 import android.util.ArraySet;
 import android.util.Log;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
 import java.util.List;
 import java.util.Set;
 
-public class AppPermissionsPreferenceController extends PreferenceController {
+public class AppPermissionsPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
 
     private static final String TAG = "AppPermissionPrefCtrl";
     private static final String KEY_APP_PERMISSION_GROUPS = "manage_perms";
diff --git a/src/com/android/settings/applications/AdvancedAppSettings.java b/src/com/android/settings/applications/DefaultAppSettings.java
similarity index 85%
rename from src/com/android/settings/applications/AdvancedAppSettings.java
rename to src/com/android/settings/applications/DefaultAppSettings.java
index b623801..5b15e51 100644
--- a/src/com/android/settings/applications/AdvancedAppSettings.java
+++ b/src/com/android/settings/applications/DefaultAppSettings.java
@@ -22,6 +22,7 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
+import com.android.settings.applications.assist.DefaultAssistPreferenceController;
 import com.android.settings.applications.defaultapps.DefaultBrowserPreferenceController;
 import com.android.settings.applications.defaultapps.DefaultEmergencyPreferenceController;
 import com.android.settings.applications.defaultapps.DefaultHomePreferenceController;
@@ -29,19 +30,20 @@
 import com.android.settings.applications.defaultapps.DefaultSmsPreferenceController;
 import com.android.settings.applications.defaultapps.DefaultWorkBrowserPreferenceController;
 import com.android.settings.applications.defaultapps.DefaultWorkPhonePreferenceController;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.applications.defaultapps.DefaultPaymentSettingsPreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-public class AdvancedAppSettings extends DashboardFragment {
+public class DefaultAppSettings extends DashboardFragment {
 
-    static final String TAG = "AdvancedAppSettings";
+    static final String TAG = "DefaultAppSettings";
 
     private static final String KEY_ASSIST_VOICE_INPUT = "assist_and_voice_input";
 
@@ -56,7 +58,7 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
         return buildPreferenceControllers(context);
     }
 
@@ -65,8 +67,10 @@
         return MetricsEvent.APPLICATIONS_ADVANCED;
     }
 
-    private static List<PreferenceController> buildPreferenceControllers(Context context) {
-        final List<PreferenceController> controllers = new ArrayList<>();
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        controllers.add(new DefaultAssistPreferenceController(context, KEY_ASSIST_VOICE_INPUT,
+                false /* showSetting */));
         controllers.add(new DefaultBrowserPreferenceController(context));
         controllers.add(new DefaultWorkBrowserPreferenceController(context));
         controllers.add(new DefaultPhonePreferenceController(context));
@@ -74,6 +78,7 @@
         controllers.add(new DefaultSmsPreferenceController(context));
         controllers.add(new DefaultEmergencyPreferenceController(context));
         controllers.add(new DefaultHomePreferenceController(context));
+        controllers.add(new DefaultPaymentSettingsPreferenceController(context));
         return controllers;
     }
 
@@ -100,7 +105,8 @@
                 }
 
                 @Override
-                public List<PreferenceController> getPreferenceControllers(Context context) {
+                public List<AbstractPreferenceController> getPreferenceControllers(
+                        Context context) {
                     return buildPreferenceControllers(context);
                 }
             };
@@ -152,7 +158,7 @@
                 @Override
                 public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
                         SummaryLoader summaryLoader) {
-                    return new AdvancedAppSettings.SummaryProvider(activity, summaryLoader);
+                    return new DefaultAppSettings.SummaryProvider(activity, summaryLoader);
                 }
             };
 }
diff --git a/src/com/android/settings/applications/DrawOverlayDetails.java b/src/com/android/settings/applications/DrawOverlayDetails.java
index c6f3cc0..78f1c08 100644
--- a/src/com/android/settings/applications/DrawOverlayDetails.java
+++ b/src/com/android/settings/applications/DrawOverlayDetails.java
@@ -29,12 +29,13 @@
 import android.support.v7.preference.Preference.OnPreferenceClickListener;
 import android.util.Log;
 
+import android.view.Window;
+import android.view.WindowManager;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
 import com.android.settings.applications.AppStateOverlayBridge.OverlayState;
-import com.android.settings.core.TouchOverlayManager;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 
@@ -60,8 +61,6 @@
     private Intent mSettingsIntent;
     private OverlayState mOverlayState;
 
-    private TouchOverlayManager mTouchOverlayManager;
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -69,7 +68,6 @@
         Context context = getActivity();
         mOverlayBridge = new AppStateOverlayBridge(context, mState, null);
         mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
-        mTouchOverlayManager = new TouchOverlayManager(context);
 
         // find preferences
         addPreferencesFromResource(R.xml.app_ops_permissions_details);
@@ -92,17 +90,17 @@
     }
 
     @Override
-    public void onStart() {
-        super.onStart();
-
-        mTouchOverlayManager.setOverlayAllowed(false);
+    public void onResume() {
+        super.onResume();
+        getActivity().getWindow().addFlags(
+                WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
     }
 
     @Override
-    public void onStop() {
-        super.onStop();
-
-        mTouchOverlayManager.setOverlayAllowed(true);
+    public void onPause() {
+        getActivity().getWindow().clearFlags(
+                WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
+        super.onPause();
     }
 
     @Override
@@ -153,16 +151,6 @@
                 .getMetricsFeatureProvider().action(getContext(), logCategory, packageName);
     }
 
-    private boolean canDrawOverlay(String pkgName) {
-        int result = mAppOpsManager.noteOpNoThrow(AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
-                mPackageInfo.applicationInfo.uid, pkgName);
-        if (result == AppOpsManager.MODE_ALLOWED) {
-            return true;
-        }
-
-        return false;
-    }
-
     @Override
     protected boolean refreshUi() {
         mOverlayState = mOverlayBridge.getOverlayInfo(mPackageName,
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 39e3255..5421586 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (C) 2007 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -16,6 +16,8 @@
 
 package com.android.settings.applications;
 
+import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
 import android.Manifest.permission;
 import android.app.Activity;
 import android.app.ActivityManager;
@@ -55,6 +57,7 @@
 import android.support.v7.preference.Preference.OnPreferenceClickListener;
 import android.support.v7.preference.PreferenceCategory;
 import android.support.v7.preference.PreferenceScreen;
+import android.text.BidiFormatter;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.text.format.Formatter;
@@ -69,7 +72,6 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.os.BatterySipper;
 import com.android.internal.os.BatteryStatsHelper;
-import com.android.settings.AppHeader;
 import com.android.settings.DeviceAdminAdd;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
@@ -83,7 +85,8 @@
 import com.android.settings.applications.instantapps.InstantAppButtonsController;
 import com.android.settings.datausage.AppDataUsage;
 import com.android.settings.datausage.DataUsageList;
-import com.android.settings.datausage.DataUsageSummary;
+import com.android.settings.datausage.DataUsageUtils;
+import com.android.settings.development.DevelopmentSettingsEnabler;
 import com.android.settings.fuelgauge.AdvancedPowerUsageDetail;
 import com.android.settings.fuelgauge.BatteryEntry;
 import com.android.settings.fuelgauge.BatteryStatsHelperLoader;
@@ -110,8 +113,6 @@
 import java.util.List;
 import java.util.Set;
 
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
 /**
  * Activity to display application information from Settings. This activity presents
  * extended information associated with a package like code, data, total size, permissions
@@ -145,7 +146,7 @@
     private static final int DLG_FORCE_STOP = DLG_BASE + 1;
     private static final int DLG_DISABLE = DLG_BASE + 2;
     private static final int DLG_SPECIAL_DISABLE = DLG_BASE + 3;
-
+    private static final String EXTRA_HIDE_INFO_BUTTON = "hideInfoButton";
     private static final String KEY_HEADER = "header_view";
     private static final String KEY_INSTANT_APP_BUTTONS = "instant_app_buttons";
     private static final String KEY_ACTION_BUTTONS = "action_buttons";
@@ -177,7 +178,7 @@
     private Preference mMemoryPreference;
     private Preference mVersionPreference;
     private AppDomainsPreference mInstantAppDomainsPreference;
-
+    private DevelopmentSettingsEnabler mDevelopmentSettingsEnabler;
     private boolean mDisableAfterUninstall;
 
     // Used for updating notification preference.
@@ -273,7 +274,7 @@
         // We don't allow uninstalling DO/PO on *any* users, because if it's a system app,
         // "uninstall" is actually "downgrade to the system version + disable", and "downgrade"
         // will clear data on all users.
-        if (isProfileOrDeviceOwner(mPackageInfo.packageName)) {
+        if (Utils.isProfileOrDeviceOwner(mUserManager, mDpm, mPackageInfo.packageName)) {
             enabled = false;
         }
 
@@ -348,23 +349,6 @@
         return enabled;
     }
 
-    /** Returns if the supplied package is device owner or profile owner of at least one user */
-    private boolean isProfileOrDeviceOwner(String packageName) {
-        List<UserInfo> userInfos = mUserManager.getUsers();
-        DevicePolicyManager dpm = (DevicePolicyManager)
-                getContext().getSystemService(Context.DEVICE_POLICY_SERVICE);
-        if (dpm.isDeviceOwnerAppOnAnyUser(packageName)) {
-            return true;
-        }
-        for (UserInfo userInfo : userInfos) {
-            ComponentName cn = dpm.getProfileOwnerAsUser(userInfo.id);
-            if (cn != null && cn.getPackageName().equals(packageName)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     /** Called when the activity is first created. */
     @Override
     public void onCreate(Bundle icicle) {
@@ -377,6 +361,7 @@
 
         setHasOptionsMenu(true);
         addPreferencesFromResource(R.xml.installed_app_details);
+
         addDynamicPrefs();
         if (Utils.isBandwidthControlEnabled()) {
             INetworkStatsService statsService = INetworkStatsService.Stub.asInterface(
@@ -390,6 +375,8 @@
             removePreference(KEY_DATA);
         }
         mBatteryUtils = BatteryUtils.getInstance(getContext());
+        mDevelopmentSettingsEnabler = new DevelopmentSettingsEnabler(
+                activity, null /* lifecycle */);
     }
 
     @Override
@@ -413,7 +400,9 @@
             loaderManager.restartLoader(LOADER_STORAGE, Bundle.EMPTY, this);
         }
         restartBatteryStatsLoader();
-        new MemoryUpdater().execute();
+        if (mDevelopmentSettingsEnabler.getLastEnabledState()) {
+            new MemoryUpdater().execute();
+        }
         updateDynamicPrefs();
     }
 
@@ -445,6 +434,7 @@
         EntityHeaderController.newInstance(activity, this, mHeader.findViewById(R.id.entity_header))
                 .setRecyclerView(getListView(), getLifecycle())
                 .setPackageName(mPackageName)
+                .setHasAppInfoLink(false)
                 .setButtonActions(EntityHeaderController.ActionType.ACTION_APP_PREFERENCE,
                         EntityHeaderController.ActionType.ACTION_NONE)
                 .styleActionBar(activity)
@@ -466,6 +456,7 @@
         mBatteryPreference.setOnPreferenceClickListener(this);
         mMemoryPreference = findPreference(KEY_MEMORY);
         mMemoryPreference.setOnPreferenceClickListener(this);
+        mMemoryPreference.setVisible(mDevelopmentSettingsEnabler.getLastEnabledState());
         mVersionPreference = findPreference(KEY_VERSION);
         mInstantAppDomainsPreference =
                 (AppDomainsPreference) findPreference(KEY_INSTANT_APP_SUPPORTED_LINKS);
@@ -626,7 +617,8 @@
                 .setSummary(summary)
                 .setIsInstantApp(isInstantApp)
                 .done(activity, false /* rebindActions */);
-        mVersionPreference.setSummary(getString(R.string.version_text, pkgInfo.versionName));
+        mVersionPreference.setSummary(getString(R.string.version_text,
+                BidiFormatter.getInstance().unicodeWrap(pkgInfo.versionName)));
     }
 
     @VisibleForTesting
@@ -935,7 +927,7 @@
         // start new activity to manage app permissions
         Intent intent = new Intent(Intent.ACTION_MANAGE_APP_PERMISSIONS);
         intent.putExtra(Intent.EXTRA_PACKAGE_NAME, mAppEntry.info.packageName);
-        intent.putExtra(AppHeader.EXTRA_HIDE_INFO_BUTTON, true);
+        intent.putExtra(EXTRA_HIDE_INFO_BUTTON, true);
         try {
             getActivity().startActivityForResult(intent, SUB_INFO_FRAGMENT);
         } catch (ActivityNotFoundException e) {
@@ -953,7 +945,6 @@
         Bundle args = new Bundle();
         args.putString(ARG_PACKAGE_NAME, appEntry.info.packageName);
         args.putInt(ARG_PACKAGE_UID, appEntry.info.uid);
-        args.putBoolean(AppHeader.EXTRA_HIDE_INFO_BUTTON, true);
 
         SettingsActivity sa = (SettingsActivity) caller.getActivity();
         sa.startPreferencePanel(caller, fragment.getName(), args, -1, title, caller,
@@ -1072,27 +1063,27 @@
         final Context context = getContext();
         if (DefaultHomePreferenceController.hasHomePreference(mPackageName, context)) {
             screen.addPreference(new ShortcutPreference(getPrefContext(),
-                    AdvancedAppSettings.class, "default_home", R.string.home_app,
+                    DefaultAppSettings.class, "default_home", R.string.home_app,
                     R.string.configure_apps));
         }
         if (DefaultBrowserPreferenceController.hasBrowserPreference(mPackageName, context)) {
             screen.addPreference(new ShortcutPreference(getPrefContext(),
-                    AdvancedAppSettings.class, "default_browser", R.string.default_browser_title,
+                    DefaultAppSettings.class, "default_browser", R.string.default_browser_title,
                     R.string.configure_apps));
         }
         if (DefaultPhonePreferenceController.hasPhonePreference(mPackageName, context)) {
             screen.addPreference(new ShortcutPreference(getPrefContext(),
-                    AdvancedAppSettings.class, "default_phone_app", R.string.default_phone_title,
+                    DefaultAppSettings.class, "default_phone_app", R.string.default_phone_title,
                     R.string.configure_apps));
         }
         if (DefaultEmergencyPreferenceController.hasEmergencyPreference(mPackageName, context)) {
             screen.addPreference(new ShortcutPreference(getPrefContext(),
-                    AdvancedAppSettings.class, "default_emergency_app",
+                    DefaultAppSettings.class, "default_emergency_app",
                     R.string.default_emergency_app, R.string.configure_apps));
         }
         if (DefaultSmsPreferenceController.hasSmsPreference(mPackageName, context)) {
             screen.addPreference(new ShortcutPreference(getPrefContext(),
-                    AdvancedAppSettings.class, "default_sms_app", R.string.sms_application_title,
+                    DefaultAppSettings.class, "default_sms_app", R.string.sms_application_title,
                     R.string.configure_apps));
         }
 
@@ -1298,7 +1289,7 @@
         if (DataUsageList.hasReadyMobileRadio(context)) {
             return NetworkTemplate.buildTemplateMobileWildcard();
         }
-        if (DataUsageSummary.hasWifiRadio(context)) {
+        if (DataUsageUtils.hasWifiRadio(context)) {
             return NetworkTemplate.buildTemplateWifiWildcard();
         }
         return NetworkTemplate.buildTemplateEthernet();
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index c0df50c..deda92a 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -59,6 +59,7 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
+import com.android.settings.Settings;
 import com.android.settings.Settings.AllApplicationsActivity;
 import com.android.settings.Settings.GamesStorageActivity;
 import com.android.settings.Settings.HighPowerApplicationsActivity;
@@ -81,6 +82,7 @@
 import com.android.settings.notification.ConfigureNotificationSettings;
 import com.android.settings.notification.NotificationBackend;
 import com.android.settings.notification.NotificationBackend.AppRow;
+import com.android.settings.widget.LoadingViewController;
 import com.android.settingslib.HelpUtils;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
@@ -114,6 +116,8 @@
     public static final String EXTRA_VOLUME_UUID = "volumeUuid";
     public static final String EXTRA_VOLUME_NAME = "volumeName";
     public static final String EXTRA_STORAGE_TYPE = "storageType";
+    public static final String EXTRA_WORK_ONLY = "workProfileOnly";
+    public static final String EXTRA_WORK_ID = "workId";
 
     private static final String EXTRA_SORT_ORDER = "sortOrder";
     private static final String EXTRA_SHOW_SYSTEM = "showSystem";
@@ -217,6 +221,9 @@
     public static final int STORAGE_TYPE_DEFAULT = 0; // Show all apps that are not categorized.
     public static final int STORAGE_TYPE_MUSIC = 1;
     public static final int STORAGE_TYPE_LEGACY = 2; // Show apps even if they can be categorized.
+    public static final int STORAGE_TYPE_PHOTOS_VIDEOS = 3;
+
+    private static final int NO_USER_SPECIFIED = -1;
 
     // sort order
     private int mSortOrder = R.id.sort_order_alpha;
@@ -260,6 +267,7 @@
     public static final int LIST_TYPE_MANAGE_SOURCES = 8;
     public static final int LIST_TYPE_GAMES = 9;
     public static final int LIST_TYPE_MOVIES = 10;
+    public static final int LIST_TYPE_PHOTOGRAPHY = 11;
 
 
     // List types that should show instant apps.
@@ -276,6 +284,8 @@
     private ResetAppsHelper mResetAppsHelper;
     private String mVolumeUuid;
     private int mStorageType;
+    private boolean mIsWorkOnly;
+    private int mWorkUserId;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -323,10 +333,16 @@
         } else if (className.equals(MoviesStorageActivity.class.getName())) {
             mListType = LIST_TYPE_MOVIES;
             mSortOrder = R.id.sort_order_size;
+        } else if (className.equals(Settings.PhotosStorageActivity.class.getName())) {
+            mListType = LIST_TYPE_PHOTOGRAPHY;
+            mSortOrder = R.id.sort_order_size;
+            mStorageType = args.getInt(EXTRA_STORAGE_TYPE, STORAGE_TYPE_DEFAULT);
         } else {
             mListType = LIST_TYPE_MAIN;
         }
         mFilter = getDefaultFilter();
+        mIsWorkOnly = args != null ? args.getBoolean(EXTRA_WORK_ONLY) : false;
+        mWorkUserId = args != null ? args.getInt(EXTRA_WORK_ID) : NO_USER_SPECIFIED;
 
         if (savedInstanceState != null) {
             mSortOrder = savedInstanceState.getInt(EXTRA_SORT_ORDER, mSortOrder);
@@ -367,13 +383,23 @@
                 mApplications.mHasReceivedBridgeCallback =
                         savedInstanceState.getBoolean(EXTRA_HAS_BRIDGE, false);
             }
+            int userId = mIsWorkOnly ? mWorkUserId : UserHandle.getUserId(mCurrentUid);
             if (mStorageType == STORAGE_TYPE_MUSIC) {
                 Context context = getContext();
-                mApplications.setExtraViewController(new MusicViewHolderController(
-                        context,
-                        new StorageStatsSource(context),
-                        mVolumeUuid,
-                        UserHandle.of(UserHandle.getUserId(mCurrentUid))));
+                mApplications.setExtraViewController(
+                        new MusicViewHolderController(
+                                context,
+                                new StorageStatsSource(context),
+                                mVolumeUuid,
+                                UserHandle.of(userId)));
+            } else if (mStorageType == STORAGE_TYPE_PHOTOS_VIDEOS) {
+                Context context = getContext();
+                mApplications.setExtraViewController(
+                        new PhotosViewHolderController(
+                                context,
+                                new StorageStatsSource(context),
+                                mVolumeUuid,
+                                UserHandle.of(userId)));
             }
             mListView.setAdapter(mApplications);
             mListView.setRecyclerListener(mApplications);
@@ -422,6 +448,9 @@
         }
 
         AppFilter compositeFilter = getCompositeFilter(mListType, mStorageType, mVolumeUuid);
+        if (mIsWorkOnly) {
+            compositeFilter = new CompoundFilter(compositeFilter, FILTERS[FILTER_APPS_WORK]);
+        }
         if (compositeFilter != null) {
             mApplications.setCompositeFilter(compositeFilter);
         }
@@ -443,6 +472,8 @@
             return new CompoundFilter(ApplicationsState.FILTER_GAMES, filter);
         } else if (listType == LIST_TYPE_MOVIES) {
             return new CompoundFilter(ApplicationsState.FILTER_MOVIES, filter);
+        } else if (listType == LIST_TYPE_PHOTOGRAPHY) {
+            return new CompoundFilter(ApplicationsState.FILTER_PHOTOS, filter);
         }
 
         return null;
@@ -472,6 +503,7 @@
             case LIST_TYPE_STORAGE:
             case LIST_TYPE_GAMES:
             case LIST_TYPE_MOVIES:
+            case LIST_TYPE_PHOTOGRAPHY:
                 return mSortOrder == R.id.sort_order_alpha;
             default:
                 return false;
@@ -494,6 +526,8 @@
                 return MetricsEvent.APPLICATIONS_STORAGE_GAMES;
             case LIST_TYPE_MOVIES:
                 return MetricsEvent.APPLICATIONS_STORAGE_MOVIES;
+            case LIST_TYPE_PHOTOGRAPHY:
+                return MetricsEvent.APPLICATIONS_STORAGE_PHOTOS;
             case LIST_TYPE_USAGE_ACCESS:
                 return MetricsEvent.USAGE_ACCESS;
             case LIST_TYPE_HIGH_POWER:
@@ -597,6 +631,9 @@
             case LIST_TYPE_MOVIES:
                 startAppInfoFragment(AppStorageSettings.class, R.string.storage_movies_tv);
                 break;
+            case LIST_TYPE_PHOTOGRAPHY:
+                startAppInfoFragment(AppStorageSettings.class, R.string.storage_photos_videos);
+                break;
             // TODO: Figure out if there is a way where we can spin up the profile's settings
             // process ahead of time, to avoid a long load of data when user clicks on a managed
             // app. Maybe when they load the list of apps that contains managed profile apps.
@@ -687,7 +724,7 @@
                             ADVANCED_SETTINGS);
                 } else {
                     ((SettingsActivity) getActivity()).startPreferencePanel(this,
-                            AdvancedAppSettings.class.getName(), null, R.string.configure_apps,
+                            DefaultAppSettings.class.getName(), null, R.string.configure_apps,
                             null, this, ADVANCED_SETTINGS);
                 }
                 return true;
@@ -849,6 +886,7 @@
         private final AppStateBaseBridge mExtraInfoBridge;
         private final Handler mBgHandler;
         private final Handler mFgHandler;
+        private final LoadingViewController mLoadingViewController;
 
         private int mFilterMode;
         private ArrayList<ApplicationsState.AppEntry> mBaseEntries;
@@ -894,12 +932,6 @@
             }
         };
 
-        private Runnable mShowLoadingContainerRunnable = new Runnable() {
-            public void run() {
-                Utils.handleLoadingContainer(mManageApplications.mLoadingContainer,
-                        mManageApplications.mListContainer, false /* done */, false /* animate */);
-            }
-        };
 
         public ApplicationsAdapter(ApplicationsState state, ManageApplications manageApplications,
                 int filterMode) {
@@ -908,6 +940,10 @@
             mBgHandler = new Handler(mState.getBackgroundLooper());
             mSession = state.newSession(this);
             mManageApplications = manageApplications;
+            mLoadingViewController = new LoadingViewController(
+                    mManageApplications.mLoadingContainer,
+                    mManageApplications.mListContainer
+            );
             mContext = manageApplications.getActivity();
             mPm = mContext.getPackageManager();
             mFilterMode = filterMode;
@@ -1109,11 +1145,7 @@
 
             if (mSession.getAllApps().size() != 0
                     && mManageApplications.mListContainer.getVisibility() != View.VISIBLE) {
-                // Cancel any pending task to show the loading animation and show the list of
-                // apps directly.
-                mFgHandler.removeCallbacks(mShowLoadingContainerRunnable);
-                Utils.handleLoadingContainer(mManageApplications.mLoadingContainer,
-                        mManageApplications.mListContainer, true, true);
+                mLoadingViewController.showContent(true /* animate */);
             }
             if (mManageApplications.mListType == LIST_TYPE_USAGE_ACCESS) {
                 // No enabled or disabled filters for usage access.
@@ -1167,11 +1199,9 @@
         void updateLoading() {
             final boolean appLoaded = mHasReceivedLoadEntries && mSession.getAllApps().size() != 0;
             if (appLoaded) {
-                Utils.handleLoadingContainer(mManageApplications.mLoadingContainer,
-                        mManageApplications.mListContainer, true /* done */, false /* animate */);
+                mLoadingViewController.showContent(false /* animate */);
             } else {
-                mFgHandler.postDelayed(
-                        mShowLoadingContainerRunnable, DELAY_SHOW_LOADING_CONTAINER_THRESHOLD_MS);
+                mLoadingViewController.showLoadingViewDelayed();
             }
         }
 
diff --git a/src/com/android/settings/applications/ManageDomainUrls.java b/src/com/android/settings/applications/ManageDomainUrls.java
index 2149fbd..1d325ce 100644
--- a/src/com/android/settings/applications/ManageDomainUrls.java
+++ b/src/com/android/settings/applications/ManageDomainUrls.java
@@ -141,7 +141,7 @@
                     final Intent launchIntent = instantAppSettingsIntent;
                     // TODO: Make this button actually launch the account chooser.
                     mInstantAppAccountPreference = new Preference(getPrefContext());
-                    mInstantAppAccountPreference.setTitle(R.string.instant_apps_account);
+                    mInstantAppAccountPreference.setTitle(R.string.instant_apps_settings);
                     mInstantAppAccountPreference.setOnPreferenceClickListener(pref -> {
                         startActivity(launchIntent);
                         return true;
diff --git a/src/com/android/settings/applications/PackageManagerWrapper.java b/src/com/android/settings/applications/PackageManagerWrapper.java
index 580b578..b0accdc 100644
--- a/src/com/android/settings/applications/PackageManagerWrapper.java
+++ b/src/com/android/settings/applications/PackageManagerWrapper.java
@@ -21,6 +21,7 @@
 import android.content.IntentFilter;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.IPackageDeleteObserver;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.UserHandle;
@@ -49,6 +50,11 @@
     List<ApplicationInfo> getInstalledApplicationsAsUser(int flags, int userId);
 
     /**
+     * Calls {@code PackageManager.getInstalledPackagesAsUser}
+     */
+    List<PackageInfo> getInstalledPackagesAsUser(int flags, int userId);
+
+    /**
      * Calls {@code PackageManager.hasSystemFeature()}.
      *
      * @see android.content.pm.PackageManager#hasSystemFeature
diff --git a/src/com/android/settings/applications/PackageManagerWrapperImpl.java b/src/com/android/settings/applications/PackageManagerWrapperImpl.java
index a47137c..021a80a 100644
--- a/src/com/android/settings/applications/PackageManagerWrapperImpl.java
+++ b/src/com/android/settings/applications/PackageManagerWrapperImpl.java
@@ -21,6 +21,7 @@
 import android.content.IntentFilter;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.IPackageDeleteObserver;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.UserHandle;
@@ -47,6 +48,11 @@
     }
 
     @Override
+    public List<PackageInfo> getInstalledPackagesAsUser(int flags, int userId) {
+        return mPm.getInstalledPackagesAsUser(flags, userId);
+    }
+
+    @Override
     public boolean hasSystemFeature(String name) {
         return mPm.hasSystemFeature(name);
     }
diff --git a/src/com/android/settings/applications/PhotosViewHolderController.java b/src/com/android/settings/applications/PhotosViewHolderController.java
new file mode 100644
index 0000000..a652bb1
--- /dev/null
+++ b/src/com/android/settings/applications/PhotosViewHolderController.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.applications;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.drawable.InsetDrawable;
+import android.os.UserHandle;
+import android.support.annotation.WorkerThread;
+import android.text.format.Formatter;
+import android.util.Log;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settingslib.applications.StorageStatsSource;
+
+import java.io.IOException;
+
+/** PhotosViewHolderController controls an Audio/Music file view in the ManageApplications view. */
+public class PhotosViewHolderController implements FileViewHolderController {
+    private static final String TAG = "PhotosViewHolderController";
+
+    private static final String IMAGE_MIME_TYPE = "image/*";
+    private static final int INSET_SIZE = 24; // dp
+
+    private Context mContext;
+    private StorageStatsSource mSource;
+    private String mVolumeUuid;
+    private long mFilesSize;
+    private UserHandle mUser;
+
+    public PhotosViewHolderController(
+            Context context, StorageStatsSource source, String volumeUuid, UserHandle user) {
+        mContext = context;
+        mSource = source;
+        mVolumeUuid = volumeUuid;
+        mUser = user;
+    }
+
+    @Override
+    @WorkerThread
+    public void queryStats() {
+        try {
+            StorageStatsSource.ExternalStorageStats stats =
+                    mSource.getExternalStorageStats(mVolumeUuid, mUser);
+            mFilesSize = stats.imageBytes + stats.videoBytes;
+        } catch (IOException e) {
+            mFilesSize = 0;
+            Log.w(TAG, e);
+        }
+    }
+
+    @Override
+    public boolean shouldShow() {
+        return true;
+    }
+
+    @Override
+    public void setupView(AppViewHolder holder) {
+        holder.appIcon.setImageDrawable(
+                new InsetDrawable(mContext.getDrawable(R.drawable.ic_photo_library), INSET_SIZE));
+        holder.appName.setText(mContext.getText(R.string.storage_detail_images));
+        holder.summary.setText(Formatter.formatFileSize(mContext, mFilesSize));
+    }
+
+    @Override
+    public void onClick(Fragment fragment) {
+        Intent intent = new Intent();
+        intent.setAction(android.content.Intent.ACTION_VIEW);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+        intent.setType(IMAGE_MIME_TYPE);
+        intent.putExtra(Intent.EXTRA_FROM_STORAGE, true);
+        Utils.launchIntent(fragment, intent);
+    }
+}
diff --git a/src/com/android/settings/applications/PictureInPictureSettings.java b/src/com/android/settings/applications/PictureInPictureSettings.java
index b1c544a..79780d6 100644
--- a/src/com/android/settings/applications/PictureInPictureSettings.java
+++ b/src/com/android/settings/applications/PictureInPictureSettings.java
@@ -22,14 +22,16 @@
 import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
-import android.content.pm.PackageItemInfo;
 import android.content.pm.PackageManager;
+import android.content.pm.UserInfo;
 import android.os.Bundle;
 import android.os.UserHandle;
+import android.os.UserManager;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceClickListener;
 import android.support.v7.preference.PreferenceScreen;
-import android.util.ArrayMap;
+import android.util.IconDrawableFactory;
+import android.util.Pair;
 import android.view.View;
 
 import com.android.internal.annotations.VisibleForTesting;
@@ -37,8 +39,10 @@
 import com.android.settings.R;
 import com.android.settings.notification.EmptyTextSettings;
 
+import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 public class PictureInPictureSettings extends EmptyTextSettings {
@@ -50,8 +54,38 @@
         IGNORE_PACKAGE_LIST.add("com.android.systemui");
     }
 
+    /**
+     * Comparator by name, then user id.
+     * {@see PackageItemInfo#DisplayNameComparator}
+     */
+    static class AppComparator implements Comparator<Pair<ApplicationInfo, Integer>> {
+
+        private final Collator mCollator = Collator.getInstance();
+        private final PackageManager mPm;
+
+        public AppComparator(PackageManager pm) {
+            mPm = pm;
+        }
+
+        public final int compare(Pair<ApplicationInfo, Integer> a,
+                Pair<ApplicationInfo, Integer> b) {
+            CharSequence  sa = a.first.loadLabel(mPm);
+            if (sa == null) sa = a.first.name;
+            CharSequence  sb = b.first.loadLabel(mPm);
+            if (sb == null) sb = b.first.name;
+            int nameCmp = mCollator.compare(sa.toString(), sb.toString());
+            if (nameCmp != 0) {
+                return nameCmp;
+            } else {
+                return a.second - b.second;
+            }
+        }
+    }
+
     private Context mContext;
-    private PackageManager mPackageManager;
+    private PackageManagerWrapper mPackageManager;
+    private UserManagerWrapper mUserManager;
+    private IconDrawableFactory mIconDrawableFactory;
 
     /**
      * @return true if the package has any activities that declare that they support
@@ -93,12 +127,23 @@
         return false;
     }
 
+    public PictureInPictureSettings() {
+        // Do nothing
+    }
+
+    public PictureInPictureSettings(PackageManagerWrapper pm, UserManagerWrapper um) {
+        mPackageManager = pm;
+        mUserManager = um;
+    }
+
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
         mContext = getActivity();
-        mPackageManager = mContext.getPackageManager();
+        mPackageManager = new PackageManagerWrapperImpl(mContext.getPackageManager());
+        mUserManager = new UserManagerWrapperImpl(mContext.getSystemService(UserManager.class));
+        mIconDrawableFactory = IconDrawableFactory.newInstance(mContext);
         setPreferenceScreen(getPreferenceManager().createPreferenceScreen(mContext));
     }
 
@@ -110,33 +155,25 @@
         final PreferenceScreen screen = getPreferenceScreen();
         screen.removeAll();
 
-        // Fetch the set of applications which have at least one activity that declare that they
-        // support picture-in-picture
-        final ArrayMap<String, Boolean> packageToState = new ArrayMap<>();
-        final ArrayList<ApplicationInfo> pipApps = new ArrayList<>();
-        final List<PackageInfo> installedPackages = mPackageManager.getInstalledPackagesAsUser(
-                GET_ACTIVITIES, UserHandle.myUserId());
-        for (PackageInfo packageInfo : installedPackages) {
-            if (checkPackageHasPictureInPictureActivities(packageInfo.packageName,
-                    packageInfo.activities)) {
-                final String packageName = packageInfo.applicationInfo.packageName;
-                final boolean state = PictureInPictureDetails.getEnterPipStateForPackage(
-                        mContext, packageInfo.applicationInfo.uid, packageName);
-                pipApps.add(packageInfo.applicationInfo);
-                packageToState.put(packageName, state);
-            }
-        }
-        Collections.sort(pipApps, new PackageItemInfo.DisplayNameComparator(mPackageManager));
+        // Fetch the set of applications for each profile which have at least one activity that
+        // declare that they support picture-in-picture
+        final PackageManager pm = mPackageManager.getPackageManager();
+        final ArrayList<Pair<ApplicationInfo, Integer>> pipApps =
+                collectPipApps(UserHandle.myUserId());
+        Collections.sort(pipApps, new AppComparator(pm));
 
         // Rebuild the list of prefs
         final Context prefContext = getPrefContext();
-        for (final ApplicationInfo appInfo : pipApps) {
+        for (final Pair<ApplicationInfo, Integer> appData : pipApps) {
+            final ApplicationInfo appInfo = appData.first;
+            final int userId = appData.second;
+            final UserHandle user = UserHandle.of(userId);
             final String packageName = appInfo.packageName;
-            final CharSequence label = appInfo.loadLabel(mPackageManager);
+            final CharSequence label = appInfo.loadLabel(pm);
 
             final Preference pref = new Preference(prefContext);
-            pref.setIcon(appInfo.loadIcon(mPackageManager));
-            pref.setTitle(label);
+            pref.setIcon(mIconDrawableFactory.getBadgedIcon(appInfo, userId));
+            pref.setTitle(pm.getUserBadgedLabel(label, user));
             pref.setSummary(PictureInPictureDetails.getPreferenceSummary(prefContext,
                     appInfo.uid, packageName));
             pref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@@ -162,4 +199,28 @@
     public int getMetricsCategory() {
         return MetricsEvent.SETTINGS_MANAGE_PICTURE_IN_PICTURE;
     }
+
+    /**
+     * @return the list of applications for the given user and all their profiles that have
+     *         activities which support PiP.
+     */
+    ArrayList<Pair<ApplicationInfo, Integer>> collectPipApps(int userId) {
+        final ArrayList<Pair<ApplicationInfo, Integer>> pipApps = new ArrayList<>();
+        final ArrayList<Integer> userIds = new ArrayList<>();
+        for (UserInfo user : mUserManager.getProfiles(userId)) {
+            userIds.add(user.id);
+        }
+
+        for (int id : userIds) {
+            final List<PackageInfo> installedPackages = mPackageManager.getInstalledPackagesAsUser(
+                    GET_ACTIVITIES, id);
+            for (PackageInfo packageInfo : installedPackages) {
+                if (checkPackageHasPictureInPictureActivities(packageInfo.packageName,
+                        packageInfo.activities)) {
+                    pipApps.add(new Pair<>(packageInfo.applicationInfo, id));
+                }
+            }
+        }
+        return pipApps;
+    }
 }
diff --git a/src/com/android/settings/applications/PremiumSmsAccess.java b/src/com/android/settings/applications/PremiumSmsAccess.java
index 2b0942f..d220a46 100644
--- a/src/com/android/settings/applications/PremiumSmsAccess.java
+++ b/src/com/android/settings/applications/PremiumSmsAccess.java
@@ -78,6 +78,13 @@
     }
 
     @Override
+    public void onDestroy() {
+        mSmsBackend.release();
+        mSession.release();
+        super.onDestroy();
+    }
+
+    @Override
     public int getMetricsCategory() {
         return MetricsProto.MetricsEvent.PREMIUM_SMS_ACCESS;
     }
diff --git a/src/com/android/settings/applications/ProcessStatsBase.java b/src/com/android/settings/applications/ProcessStatsBase.java
index 7aa3cc7..3f66789 100644
--- a/src/com/android/settings/applications/ProcessStatsBase.java
+++ b/src/com/android/settings/applications/ProcessStatsBase.java
@@ -24,7 +24,6 @@
 import android.widget.Spinner;
 
 import com.android.internal.app.procstats.ProcessStats;
-import com.android.settings.AppHeader;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
@@ -138,7 +137,6 @@
         args.putDouble(ProcessStatsDetail.EXTRA_MAX_MEMORY_USAGE,
                 memInfo.usedWeight * memInfo.weightToRam);
         args.putDouble(ProcessStatsDetail.EXTRA_TOTAL_SCALE, memInfo.totalScale);
-        args.putBoolean(AppHeader.EXTRA_HIDE_INFO_BUTTON, !includeAppInfo);
         activity.startPreferencePanel(null, ProcessStatsDetail.class.getName(), args,
                 R.string.memory_usage, null, null, 0);
     }
diff --git a/src/com/android/settings/applications/ProcessStatsDetail.java b/src/com/android/settings/applications/ProcessStatsDetail.java
index b9c3826..af35298 100644
--- a/src/com/android/settings/applications/ProcessStatsDetail.java
+++ b/src/com/android/settings/applications/ProcessStatsDetail.java
@@ -137,7 +137,8 @@
                 .setUid(mApp.mUiTargetApp != null
                         ? mApp.mUiTargetApp.uid
                         : UserHandle.USER_NULL)
-                .setButtonActions(ActionType.ACTION_APP_INFO, ActionType.ACTION_NONE)
+                .setHasAppInfoLink(true)
+                .setButtonActions(ActionType.ACTION_NONE, ActionType.ACTION_NONE)
                 .done(activity, getPrefContext());
         getPreferenceScreen().addPreference(pref);
     }
diff --git a/src/com/android/settings/applications/RecentAppsPreferenceController.java b/src/com/android/settings/applications/RecentAppsPreferenceController.java
index dd95605..d0f7584 100644
--- a/src/com/android/settings/applications/RecentAppsPreferenceController.java
+++ b/src/com/android/settings/applications/RecentAppsPreferenceController.java
@@ -16,6 +16,9 @@
 
 package com.android.settings.applications;
 
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
+        .SETTINGS_APP_NOTIF_CATEGORY;
+
 import android.app.Application;
 import android.app.Fragment;
 import android.app.usage.UsageStats;
@@ -29,7 +32,6 @@
 import android.support.v7.preference.PreferenceCategory;
 import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
-import android.text.format.DateUtils;
 import android.util.ArrayMap;
 import android.util.ArraySet;
 import android.util.IconDrawableFactory;
@@ -37,8 +39,9 @@
 
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -49,15 +52,12 @@
 import java.util.Map;
 import java.util.Set;
 
-import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
-        .SETTINGS_APP_NOTIF_CATEGORY;
-
 /**
  * This controller displays a list of recently used apps and a "See all" button. If there is
  * no recently used app, "See all" will be displayed as "App info".
  */
-public class RecentAppsPreferenceController extends PreferenceController
-        implements Comparator<UsageStats> {
+public class RecentAppsPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, Comparator<UsageStats> {
 
     private static final String TAG = "RecentAppsCtrl";
     private static final String KEY_PREF_CATEGORY = "recent_apps_category";
@@ -122,7 +122,7 @@
 
     @Override
     public void updateNonIndexableKeys(List<String> keys) {
-        super.updateNonIndexableKeys(keys);
+        PreferenceControllerMixin.super.updateNonIndexableKeys(keys);
         // Don't index category name into search. It's not actionable.
         keys.add(KEY_PREF_CATEGORY);
         keys.add(KEY_DIVIDER);
diff --git a/src/com/android/settings/applications/ResetAppPrefPreferenceController.java b/src/com/android/settings/applications/ResetAppPrefPreferenceController.java
index 6c99a2e..2766c59 100644
--- a/src/com/android/settings/applications/ResetAppPrefPreferenceController.java
+++ b/src/com/android/settings/applications/ResetAppPrefPreferenceController.java
@@ -21,14 +21,15 @@
 import android.support.v7.preference.Preference;
 import android.text.TextUtils;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnCreate;
 import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
 
-public class ResetAppPrefPreferenceController extends PreferenceController
-        implements LifecycleObserver, OnCreate, OnSaveInstanceState {
+public class ResetAppPrefPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver, OnCreate, OnSaveInstanceState {
 
     private ResetAppsHelper mResetAppsHelper;
 
diff --git a/src/com/android/settings/applications/RunningServices.java b/src/com/android/settings/applications/RunningServices.java
index 736eafb..634fefd 100644
--- a/src/com/android/settings/applications/RunningServices.java
+++ b/src/com/android/settings/applications/RunningServices.java
@@ -15,7 +15,6 @@
  */
 package com.android.settings.applications;
 
-import android.app.Fragment;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -27,7 +26,7 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.Utils;
+import com.android.settings.widget.LoadingViewController;
 
 public class RunningServices extends SettingsPreferenceFragment {
 
@@ -37,6 +36,7 @@
     private RunningProcessesView mRunningProcessesView;
     private Menu mOptionsMenu;
     private View mLoadingContainer;
+    private LoadingViewController mLoadingViewController;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -47,12 +47,13 @@
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
+            Bundle savedInstanceState) {
         View rootView = inflater.inflate(R.layout.manage_applications_running, null);
-        mRunningProcessesView = (RunningProcessesView) rootView.findViewById(
-                R.id.running_processes);
+        mRunningProcessesView = rootView.findViewById(R.id.running_processes);
         mRunningProcessesView.doCreate();
         mLoadingContainer = rootView.findViewById(R.id.loading_container);
+        mLoadingViewController = new LoadingViewController(
+                mLoadingContainer, mRunningProcessesView);
 
         return rootView;
     }
@@ -71,7 +72,7 @@
     public void onResume() {
         super.onResume();
         boolean haveData = mRunningProcessesView.doResume(this, mRunningProcessesAvail);
-        Utils.handleLoadingContainer(mLoadingContainer, mRunningProcessesView, haveData, false);
+        mLoadingViewController.handleLoadingContainer(haveData /* done */, false /* animate */);
     }
 
     @Override
@@ -115,7 +116,7 @@
     private final Runnable mRunningProcessesAvail = new Runnable() {
         @Override
         public void run() {
-            Utils.handleLoadingContainer(mLoadingContainer, mRunningProcessesView, true, true);
+            mLoadingViewController.showContent(true /* animate */);
         }
     };
 
diff --git a/src/com/android/settings/applications/SpacePreference.java b/src/com/android/settings/applications/SpacePreference.java
index 58a1dce..797bc92 100644
--- a/src/com/android/settings/applications/SpacePreference.java
+++ b/src/com/android/settings/applications/SpacePreference.java
@@ -22,7 +22,6 @@
 import android.support.v7.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.view.ViewGroup.LayoutParams;
-
 import com.android.settings.R;
 
 /**
@@ -50,6 +49,7 @@
         final TypedArray a = context.obtainStyledAttributes(attrs,
                 new int[] { com.android.internal.R.attr.layout_height }, defStyleAttr, defStyleRes);
         mHeight = a.getDimensionPixelSize(0, 0);
+        a.recycle();
     }
 
     public void setHeight(int height) {
diff --git a/src/com/android/settings/applications/SpecialAccessSettings.java b/src/com/android/settings/applications/SpecialAccessSettings.java
index 069db76..73ae744 100644
--- a/src/com/android/settings/applications/SpecialAccessSettings.java
+++ b/src/com/android/settings/applications/SpecialAccessSettings.java
@@ -14,16 +14,17 @@
 
 package com.android.settings.applications;
 
+import android.app.ActivityManager;
 import android.content.Context;
+import android.os.Bundle;
 import android.provider.SearchIndexableResource;
-
+import android.support.v7.preference.Preference;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
-
+import com.android.settingslib.core.AbstractPreferenceController;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -31,6 +32,10 @@
 
     private static final String TAG = "SpecialAccessSettings";
 
+    private static final String[] DISABLED_FEATURES_LOW_RAM =
+            new String[]{"notification_access", "zen_access", "enabled_vr_listeners",
+                    "picture_in_picture"};
+
     @Override
     protected String getLogTag() {
         return TAG;
@@ -42,7 +47,21 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        if (ActivityManager.isLowRamDeviceStatic()) {
+            for (String disabledFeature : DISABLED_FEATURES_LOW_RAM) {
+                Preference pref = findPreference(disabledFeature);
+                if (pref != null) {
+                    removePreference(disabledFeature);
+                }
+            }
+        }
+    }
+
+    @Override
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
         return null;
     }
 
diff --git a/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java b/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java
index 3735c01..ae578d0 100644
--- a/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java
+++ b/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java
@@ -16,10 +16,12 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.datausage.DataSaverBackend;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class SpecialAppAccessPreferenceController extends PreferenceController {
+public class SpecialAppAccessPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
 
     private static final String KEY_SPECIAL_ACCESS = "special_access";
 
diff --git a/src/com/android/settings/applications/UserManagerWrapper.java b/src/com/android/settings/applications/UserManagerWrapper.java
index 5b4ed2a..5a86285 100644
--- a/src/com/android/settings/applications/UserManagerWrapper.java
+++ b/src/com/android/settings/applications/UserManagerWrapper.java
@@ -29,4 +29,5 @@
 public interface UserManagerWrapper {
     UserInfo getPrimaryUser();
     List<UserInfo> getUsers();
+    List<UserInfo> getProfiles(int userHandle);
 }
diff --git a/src/com/android/settings/applications/UserManagerWrapperImpl.java b/src/com/android/settings/applications/UserManagerWrapperImpl.java
index 14ea64a..26ffc3e 100644
--- a/src/com/android/settings/applications/UserManagerWrapperImpl.java
+++ b/src/com/android/settings/applications/UserManagerWrapperImpl.java
@@ -37,4 +37,9 @@
     public List<UserInfo> getUsers() {
         return mUserManager.getUsers();
     }
+
+    @Override
+    public List<UserInfo> getProfiles(int userHandle) {
+        return mUserManager.getProfiles(userHandle);
+    }
 }
diff --git a/src/com/android/settings/applications/assist/AssistContextPreferenceController.java b/src/com/android/settings/applications/assist/AssistContextPreferenceController.java
index 4a8e9c2..f54d5f4 100644
--- a/src/com/android/settings/applications/assist/AssistContextPreferenceController.java
+++ b/src/com/android/settings/applications/assist/AssistContextPreferenceController.java
@@ -25,7 +25,8 @@
 import android.support.v7.preference.TwoStatePreference;
 
 import com.android.internal.app.AssistUtils;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -34,8 +35,9 @@
 import java.util.Arrays;
 import java.util.List;
 
-public class AssistContextPreferenceController extends PreferenceController
-        implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause {
+public class AssistContextPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
+        LifecycleObserver, OnResume, OnPause {
 
     private static final String KEY_CONTEXT = "context";
 
diff --git a/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java b/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java
index faee23d..083ab42 100644
--- a/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java
+++ b/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java
@@ -27,7 +27,8 @@
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.app.AssistUtils;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -36,8 +37,9 @@
 import java.util.Arrays;
 import java.util.List;
 
-public class AssistFlashScreenPreferenceController extends PreferenceController
-        implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause {
+public class AssistFlashScreenPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
+        LifecycleObserver, OnResume, OnPause {
 
     private static final String KEY_FLASH = "flash";
 
diff --git a/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java b/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java
index fb7be629b..0e3d621 100644
--- a/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java
+++ b/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java
@@ -25,7 +25,8 @@
 import android.support.v7.preference.TwoStatePreference;
 
 import com.android.internal.app.AssistUtils;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -34,8 +35,9 @@
 import java.util.Arrays;
 import java.util.List;
 
-public class AssistScreenshotPreferenceController extends PreferenceController
-        implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause {
+public class AssistScreenshotPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
+        LifecycleObserver, OnResume, OnPause {
 
     private static final String KEY_SCREENSHOT = "screenshot";
 
diff --git a/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java b/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java
index b8d6a87..7520155 100644
--- a/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java
+++ b/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java
@@ -23,8 +23,8 @@
 import android.content.pm.ResolveInfo;
 import android.service.voice.VoiceInteractionService;
 import android.service.voice.VoiceInteractionServiceInfo;
-
 import android.support.annotation.VisibleForTesting;
+
 import com.android.internal.app.AssistUtils;
 import com.android.settings.applications.defaultapps.DefaultAppInfo;
 import com.android.settings.applications.defaultapps.DefaultAppPreferenceController;
@@ -33,17 +33,23 @@
 
 public class DefaultAssistPreferenceController extends DefaultAppPreferenceController {
 
-    private static final String KEY_DEFAULT_ASSIST = "default_assist";
+    private final AssistUtils mAssistUtils;
+    private final boolean mShowSetting;
+    private final String mPrefKey;
 
-    private AssistUtils mAssistUtils;
-
-    public DefaultAssistPreferenceController(Context context) {
+    public DefaultAssistPreferenceController(Context context, String prefKey,
+            boolean showSetting) {
         super(context);
+        mPrefKey = prefKey;
+        mShowSetting = showSetting;
         mAssistUtils = new AssistUtils(context);
     }
 
     @Override
     protected Intent getSettingIntent(DefaultAppInfo info) {
+        if (!mShowSetting) {
+            return null;
+        }
         final ComponentName cn = mAssistUtils.getAssistComponentForUser(mUserId);
         if (cn == null) {
             return null;
@@ -72,7 +78,7 @@
 
     @Override
     public String getPreferenceKey() {
-        return KEY_DEFAULT_ASSIST;
+        return mPrefKey;
     }
 
     @Override
diff --git a/src/com/android/settings/applications/assist/ManageAssist.java b/src/com/android/settings/applications/assist/ManageAssist.java
index 4209a42..4126aaf 100644
--- a/src/com/android/settings/applications/assist/ManageAssist.java
+++ b/src/com/android/settings/applications/assist/ManageAssist.java
@@ -21,11 +21,11 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.gestures.AssistGesturePreferenceController;
+import com.android.settings.gestures.AssistGestureSettingsPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
@@ -51,7 +51,7 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
         return buildPreferenceControllers(context, getLifecycle());
     }
 
@@ -68,12 +68,13 @@
                 .setTitle(R.string.assist_footer);
     }
 
-    private static List<PreferenceController> buildPreferenceControllers(Context context,
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
             Lifecycle lifecycle) {
-        final List<PreferenceController> controllers = new ArrayList<>();
-        controllers.add(new DefaultAssistPreferenceController(context));
-        controllers.add(new AssistGesturePreferenceController(context, lifecycle, KEY_ASSIST,
-                true /* assistOnly */));
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        controllers.add(new DefaultAssistPreferenceController(context, "default_assist",
+                true /* showSetting */));
+        controllers.add(new AssistGestureSettingsPreferenceController(context, lifecycle,
+                KEY_ASSIST, true /* assistOnly */));
         controllers.add(new AssistContextPreferenceController(context, lifecycle));
         controllers.add(new AssistScreenshotPreferenceController(context, lifecycle));
         controllers.add(new AssistFlashScreenPreferenceController(context, lifecycle));
@@ -81,7 +82,6 @@
         return controllers;
     }
 
-
     public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
                 @Override
@@ -93,7 +93,8 @@
                 }
 
                 @Override
-                public List<PreferenceController> getPreferenceControllers(Context context) {
+                public List<AbstractPreferenceController> getPreferenceControllers(
+                        Context context) {
                     return buildPreferenceControllers(context, null /* lifecycle */);
                 }
 
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppInfo.java b/src/com/android/settings/applications/defaultapps/DefaultAppInfo.java
index b40943f..12470eb 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAppInfo.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAppInfo.java
@@ -18,7 +18,6 @@
 
 import android.app.AppGlobals;
 import android.content.ComponentName;
-import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.ComponentInfo;
 import android.content.pm.PackageItemInfo;
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
index b53a335..c7b450e 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.drawable.Drawable;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
@@ -27,10 +28,12 @@
 import com.android.settings.R;
 import com.android.settings.applications.PackageManagerWrapper;
 import com.android.settings.applications.PackageManagerWrapperImpl;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.widget.GearPreference;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public abstract class DefaultAppPreferenceController extends PreferenceController {
+public abstract class DefaultAppPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
 
     private static final String TAG = "DefaultAppPrefControl";
 
@@ -52,9 +55,11 @@
         CharSequence defaultAppLabel = getDefaultAppLabel();
         if (!TextUtils.isEmpty(defaultAppLabel)) {
             preference.setSummary(defaultAppLabel);
+            preference.setIcon(getDefaultAppIcon());
         } else {
             Log.d(TAG, "No default app");
             preference.setSummary(R.string.app_list_preference_none);
+            preference.setIcon(null);
         }
         mayUpdateGearIcon(app, preference);
     }
@@ -82,6 +87,17 @@
         return null;
     }
 
+    public Drawable getDefaultAppIcon() {
+        if (!isAvailable()) {
+            return null;
+        }
+        final DefaultAppInfo app = getDefaultAppInfo();
+        if (app != null) {
+            return app.loadIcon();
+        }
+        return null;
+    }
+
     public CharSequence getDefaultAppLabel() {
         if (!isAvailable()) {
             return null;
diff --git a/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
index 219ce0f..a0bf0ca 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
@@ -21,6 +21,7 @@
 import android.content.pm.ComponentInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.support.v7.preference.Preference;
 import android.text.TextUtils;
@@ -86,6 +87,18 @@
         return getOnlyAppLabel();
     }
 
+    @Override
+    public Drawable getDefaultAppIcon() {
+        if (!isAvailable()) {
+            return null;
+        }
+        final DefaultAppInfo defaultApp = getDefaultAppInfo();
+        if (defaultApp != null) {
+            return defaultApp.loadIcon();
+        }
+        return getOnlyAppIcon();
+    }
+
     private List<ResolveInfo> getCandidates() {
         return mPackageManager.queryIntentActivitiesAsUser(BROWSE_PROBE, PackageManager.MATCH_ALL,
                 mUserId);
@@ -105,6 +118,18 @@
         return null;
     }
 
+    private Drawable getOnlyAppIcon() {
+        final List<ResolveInfo> list = getCandidates();
+        if (list != null && list.size() == 1) {
+            final ResolveInfo info = list.get(0);
+            final ComponentInfo cn = info.getComponentInfo();
+            final String packageName = cn == null ? null : cn.packageName;
+            Log.d(TAG, "Getting icon for the only browser app: " + packageName);
+            return info.loadIcon(mPackageManager.getPackageManager());
+        }
+        return null;
+    }
+
     /**
      * Whether or not the pkg contains browser capability
      */
diff --git a/src/com/android/settings/applications/defaultapps/DefaultHomePicker.java b/src/com/android/settings/applications/defaultapps/DefaultHomePicker.java
index dca7ad1..aebe343 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultHomePicker.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultHomePicker.java
@@ -18,6 +18,7 @@
 
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
@@ -104,6 +105,14 @@
                     IntentFilter.MATCH_CATEGORY_EMPTY,
                     allComponents.toArray(new ComponentName[0]),
                     component);
+
+            // Launch the new Home app so the change is immediately visible even if
+            // the Home button is not pressed.
+            final Context context = getContext();
+            Intent i = new Intent(Intent.ACTION_MAIN);
+            i.addCategory(Intent.CATEGORY_HOME);
+            i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            context.startActivity(i);
             return true;
         }
         return false;
diff --git a/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java
index a89766f..88b36b2 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java
@@ -23,8 +23,6 @@
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.support.v7.preference.Preference;
-import android.text.TextUtils;
 
 import com.android.settings.applications.PackageManagerWrapper;
 
@@ -59,27 +57,20 @@
     }
 
     @Override
-    public void updateState(Preference preference) {
-        super.updateState(preference);
-        final DefaultAppInfo defaultApp = getDefaultAppInfo();
-        final CharSequence defaultAppLabel = defaultApp != null ? defaultApp.loadLabel() : null;
-        if (TextUtils.isEmpty(defaultAppLabel)) {
-            final String onlyAppLabel = getOnlyAppLabel();
-            if (!TextUtils.isEmpty(onlyAppLabel)) {
-                preference.setSummary(onlyAppLabel);
-            }
-        }
-    }
-
-    @Override
     protected DefaultAppInfo getDefaultAppInfo() {
         final ArrayList<ResolveInfo> homeActivities = new ArrayList<>();
         final ComponentName currentDefaultHome = mPackageManager.getHomeActivities(homeActivities);
-
-        return new DefaultAppInfo(mPackageManager, mUserId, currentDefaultHome);
+        if (currentDefaultHome != null) {
+            return new DefaultAppInfo(mPackageManager, mUserId, currentDefaultHome);
+        }
+        final ActivityInfo onlyAppInfo = getOnlyAppInfo();
+        if (onlyAppInfo != null) {
+            return new DefaultAppInfo(mPackageManager, mUserId, onlyAppInfo.getComponentName());
+        }
+        return null;
     }
 
-    private String getOnlyAppLabel() {
+    private ActivityInfo getOnlyAppInfo() {
         final List<ResolveInfo> homeActivities = new ArrayList<>();
         final List<ActivityInfo> appLabels = new ArrayList<>();
 
@@ -92,7 +83,7 @@
             appLabels.add(info);
         }
         return appLabels.size() == 1
-                ? appLabels.get(0).loadLabel(mPackageManager.getPackageManager()).toString()
+                ? appLabels.get(0)
                 : null;
     }
 
diff --git a/src/com/android/settings/applications/defaultapps/DefaultNotificationAssistantPicker.java b/src/com/android/settings/applications/defaultapps/DefaultNotificationAssistantPicker.java
deleted file mode 100644
index 8ffcb68..0000000
--- a/src/com/android/settings/applications/defaultapps/DefaultNotificationAssistantPicker.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications.defaultapps;
-
-import android.app.ActivityManager;
-import android.content.ComponentName;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-import android.provider.Settings;
-import android.service.notification.NotificationAssistantService;
-import android.util.Slog;
-
-import com.android.settings.R;
-import com.android.settings.utils.ManagedServiceSettings;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class DefaultNotificationAssistantPicker extends DefaultAppPickerFragment {
-    private static final String TAG = "DefaultNotiAssist";
-
-    private final ManagedServiceSettings.Config mConfig = getConfig();
-
-    @Override
-    public int getMetricsCategory() {
-        return 0;
-    }
-
-    @Override
-    protected String getDefaultKey() {
-        return Settings.Secure.getString(getContext().getContentResolver(), mConfig.setting);
-    }
-
-    @Override
-    protected boolean setDefaultKey(String value) {
-        Settings.Secure.putString(getContext().getContentResolver(), mConfig.setting, value);
-        return true;
-    }
-
-    @Override
-    protected List<DefaultAppInfo> getCandidates() {
-        List<DefaultAppInfo> candidates = new ArrayList<>();
-        final int user = ActivityManager.getCurrentUser();
-
-        List<ResolveInfo> installedServices = mPm.queryIntentServicesAsUser(
-                new Intent(mConfig.intentAction),
-                PackageManager.GET_SERVICES | PackageManager.GET_META_DATA,
-                user);
-
-        for (int i = 0, count = installedServices.size(); i < count; i++) {
-            ResolveInfo resolveInfo = installedServices.get(i);
-            ServiceInfo info = resolveInfo.serviceInfo;
-
-            if (!mConfig.permission.equals(info.permission)) {
-                Slog.w(mConfig.tag, "Skipping " + mConfig.noun + " service "
-                        + info.packageName + "/" + info.name
-                        + ": it does not require the permission "
-                        + mConfig.permission);
-                continue;
-            }
-
-            candidates.add(new DefaultAppInfo(mPm,
-                    mUserId, new ComponentName(info.packageName, info.name)));
-        }
-        return candidates;
-    }
-
-    @Override
-    protected boolean shouldShowItemNone() {
-        return true;
-    }
-
-    private ManagedServiceSettings.Config getConfig() {
-        final ManagedServiceSettings.Config c = new ManagedServiceSettings.Config();
-        c.tag = TAG;
-        c.setting = Settings.Secure.ENABLED_NOTIFICATION_ASSISTANT;
-        c.intentAction = NotificationAssistantService.SERVICE_INTERFACE;
-        c.permission = android.Manifest.permission.BIND_NOTIFICATION_ASSISTANT_SERVICE;
-        c.noun = "notification assistant";
-        c.warningDialogTitle = R.string.notification_listener_security_warning_title;
-        c.warningDialogSummary = R.string.notification_listener_security_warning_summary;
-        c.emptyText = R.string.no_notification_listeners;
-        return c;
-    }
-}
diff --git a/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceController.java
new file mode 100644
index 0000000..413e1d5
--- /dev/null
+++ b/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceController.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.defaultapps;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.nfc.NfcAdapter;
+import android.os.UserManager;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.nfc.PaymentBackend;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+public class DefaultPaymentSettingsPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
+
+    private final NfcAdapter mNfcAdapter;
+    private final PackageManager mPackageManager;
+    private final UserManager mUserManager;
+    private PaymentBackend mPaymentBackend;
+
+    public DefaultPaymentSettingsPreferenceController(Context context) {
+        super(context);
+        mPackageManager = context.getPackageManager();
+        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        mNfcAdapter = NfcAdapter.getDefaultAdapter(mContext);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mPackageManager.hasSystemFeature(PackageManager.FEATURE_NFC)
+                && mPackageManager.hasSystemFeature(PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)
+                && mUserManager.isAdminUser()
+                && mNfcAdapter != null
+                && mNfcAdapter.isEnabled();
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        if (mPaymentBackend == null) {
+            if (mNfcAdapter != null) {
+                mPaymentBackend = new PaymentBackend(mContext);
+            } else {
+                mPaymentBackend = null;
+            }
+        }
+        if (mPaymentBackend == null) {
+            return;
+        }
+        mPaymentBackend.refresh();
+        final PaymentBackend.PaymentAppInfo app = mPaymentBackend.getDefaultApp();
+        if (app != null) {
+            preference.setSummary(app.label);
+        } else {
+            preference.setSummary(R.string.app_list_preference_none);
+        }
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return "default_payment_app";
+    }
+}
diff --git a/src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java b/src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java
index 8e0f922..afc13b4 100644
--- a/src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java
+++ b/src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java
@@ -18,19 +18,15 @@
 
 import android.app.backup.BackupManager;
 import android.content.Context;
-import android.os.Build;
-import android.os.RemoteException;
-import android.os.ServiceManager;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.util.Log;
 
 import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class BackupSettingsActivityPreferenceController extends PreferenceController {
+public class BackupSettingsActivityPreferenceController extends
+        AbstractPreferenceController implements PreferenceControllerMixin {
     private static final String KEY_BACKUP_SETTINGS = "backup_settings";
     private static final String TAG = "BackupSettingActivityPC" ;
 
diff --git a/src/com/android/settings/backup/BackupSettingsFragment.java b/src/com/android/settings/backup/BackupSettingsFragment.java
index a451272..e6bb12d 100644
--- a/src/com/android/settings/backup/BackupSettingsFragment.java
+++ b/src/com/android/settings/backup/BackupSettingsFragment.java
@@ -21,10 +21,11 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -57,11 +58,11 @@
     }
 
     /**
-     * Get a list of {@link PreferenceController} for this fragment.
+     * Get a list of {@link AbstractPreferenceController} for this fragment.
      */
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
-        final List<PreferenceController> controllers = new ArrayList<>();
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new BackupSettingsPreferenceController(context));
         return controllers;
     }
diff --git a/src/com/android/settings/backup/BackupSettingsPreferenceController.java b/src/com/android/settings/backup/BackupSettingsPreferenceController.java
index 2c4605a..d25d2f5 100644
--- a/src/com/android/settings/backup/BackupSettingsPreferenceController.java
+++ b/src/com/android/settings/backup/BackupSettingsPreferenceController.java
@@ -22,9 +22,11 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class BackupSettingsPreferenceController extends PreferenceController {
+public class BackupSettingsPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
     private static final String BACKUP_SETTINGS = "backup_settings";
     private static final  String MANUFACTURER_SETTINGS = "manufacturer_backup";
     private Intent mBackupSettingsIntent;
diff --git a/src/com/android/settings/backup/OWNERS b/src/com/android/settings/backup/OWNERS
new file mode 100644
index 0000000..4c4da44
--- /dev/null
+++ b/src/com/android/settings/backup/OWNERS
@@ -0,0 +1,4 @@
+# Default reviewers for this and subdirectories.
+bryanmawhinney@google.com
+cprins@google.com
+philippov@google.com
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsController.java
index 73e9f31..265690b 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsController.java
@@ -20,8 +20,9 @@
 import android.support.v14.preference.PreferenceFragment;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -31,8 +32,9 @@
  * This class provides common lifecycle and bluetooth device event registration for Bluetooth device
  * details controllers.
  */
-public abstract class BluetoothDetailsController extends PreferenceController
-        implements CachedBluetoothDevice.Callback, LifecycleObserver, OnPause, OnResume {
+public abstract class BluetoothDetailsController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, CachedBluetoothDevice.Callback, LifecycleObserver,
+        OnPause, OnResume {
 
     protected final Context mContext;
     protected final PreferenceFragment mFragment;
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
index 5ec7c85..04e9f5a 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
@@ -16,8 +16,8 @@
 
 package com.android.settings.bluetooth;
 
-
 import android.content.Context;
+import android.graphics.drawable.Drawable;
 import android.support.v14.preference.PreferenceFragment;
 import android.support.v7.preference.PreferenceScreen;
 import android.util.Pair;
@@ -51,11 +51,12 @@
     }
 
     protected void setHeaderProperties() {
-        Pair<Integer, String> pair = Utils.getBtClassDrawableWithDescription
-                (mContext.getResources(), mCachedDevice);
+        final Pair<Drawable, String> pair = Utils.getBtClassDrawableWithDescription(
+                mContext, mCachedDevice,
+                mContext.getResources().getFraction(R.fraction.bt_battery_scale_fraction, 1, 1));
         String summaryText = mCachedDevice.getConnectionSummary();
         mHeaderController.setLabel(mCachedDevice.getName());
-        mHeaderController.setIcon(mContext.getDrawable(pair.first));
+        mHeaderController.setIcon(pair.first);
         mHeaderController.setIconContentDescription(pair.second);
         mHeaderController.setSummary(summaryText);
     }
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
index 259a5ff..a762fa1 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
@@ -28,10 +28,10 @@
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.RestrictedDashboardFragment;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
@@ -136,8 +136,8 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
-        ArrayList<PreferenceController> controllers = new ArrayList<>();
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        ArrayList<AbstractPreferenceController> controllers = new ArrayList<>();
 
         if (mCachedDevice != null) {
             Lifecycle lifecycle = getLifecycle();
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
index f156a5d..8b07bcb 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
@@ -29,9 +29,10 @@
 import android.util.Log;
 
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
@@ -40,8 +41,8 @@
 /**
  * Controller that shows and updates the bluetooth device name
  */
-public class BluetoothDeviceNamePreferenceController extends PreferenceController implements
-        LifecycleObserver, OnStart, OnStop {
+public class BluetoothDeviceNamePreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop {
     private static final String TAG = "BluetoothNamePrefCtrl";
 
     public static final String KEY_DEVICE_NAME = "device_name";
diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index a216400..94ba478 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -21,6 +21,7 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceViewHolder;
@@ -53,16 +54,17 @@
     private final UserManager mUserManager;
 
     private AlertDialog mDisconnectDialog;
-
     private String contentDescription = null;
-
+    private DeviceListPreferenceFragment mDeviceListPreferenceFragment;
     /* Talk-back descriptions for various BT icons */
     Resources mResources;
 
-    public BluetoothDevicePreference(Context context, CachedBluetoothDevice cachedDevice) {
+    public BluetoothDevicePreference(Context context, CachedBluetoothDevice cachedDevice,
+            DeviceListPreferenceFragment deviceListPreferenceFragment) {
         super(context, null);
         mResources = getContext().getResources();
         mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        mDeviceListPreferenceFragment = deviceListPreferenceFragment;
 
         if (sDimAlpha == Integer.MIN_VALUE) {
             TypedValue outValue = new TypedValue();
@@ -120,9 +122,9 @@
         // Null check is done at the framework
         setSummary(mCachedDevice.getConnectionSummary());
 
-        Pair<Integer, String> pair = Utils.getBtClassDrawableWithDescription(mResources,
+        final Pair<Drawable, String> pair = Utils.getBtClassDrawableWithDescription(getContext(),
                 mCachedDevice);
-        if (pair.first != 0) {
+        if (pair.first != null) {
             setIcon(pair.first);
             contentDescription = pair.second;
         }
@@ -130,6 +132,11 @@
         // Used to gray out the item
         setEnabled(!mCachedDevice.isBusy());
 
+        // Device is only visible in the UI if it has a valid name besides MAC address or when user
+        // allows showing devices without user-friendly name in developer settings
+        setVisible(mDeviceListPreferenceFragment.shouldShowDevicesWithoutNames()
+                || mCachedDevice.hasHumanReadableName());
+
         // This could affect ordering, so notify that
         notifyHierarchyChanged();
     }
@@ -181,22 +188,27 @@
     }
 
     void onClicked() {
+        Context context = getContext();
         int bondState = mCachedDevice.getBondState();
 
         final MetricsFeatureProvider metricsFeatureProvider =
-                FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider();
+                FeatureFactory.getFactory(context).getMetricsFeatureProvider();
 
         if (mCachedDevice.isConnected()) {
-            metricsFeatureProvider.action(getContext(),
+            metricsFeatureProvider.action(context,
                     MetricsEvent.ACTION_SETTINGS_BLUETOOTH_DISCONNECT);
             askDisconnect();
         } else if (bondState == BluetoothDevice.BOND_BONDED) {
-            metricsFeatureProvider.action(getContext(),
+            metricsFeatureProvider.action(context,
                     MetricsEvent.ACTION_SETTINGS_BLUETOOTH_CONNECT);
             mCachedDevice.connect(true);
         } else if (bondState == BluetoothDevice.BOND_NONE) {
-            metricsFeatureProvider.action(getContext(),
+            metricsFeatureProvider.action(context,
                     MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR);
+            if (!mCachedDevice.hasHumanReadableName()) {
+                metricsFeatureProvider.action(context,
+                        MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR_DEVICES_WITHOUT_NAMES);
+            }
             pair();
         }
     }
diff --git a/src/com/android/settings/bluetooth/BluetoothEnabler.java b/src/com/android/settings/bluetooth/BluetoothEnabler.java
index c0935ab..f95145d 100644
--- a/src/com/android/settings/bluetooth/BluetoothEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothEnabler.java
@@ -106,7 +106,7 @@
             mContext = context;
         }
 
-        maybeEnforceRestrictions();
+        final boolean restricted = maybeEnforceRestrictions();
 
         if (mLocalAdapter == null) {
             mSwitchWidget.setEnabled(false);
@@ -114,7 +114,9 @@
         }
 
         // Bluetooth state is not sticky, so set it manually
-        handleStateChanged(mLocalAdapter.getBluetoothState());
+        if (!restricted) {
+            handleStateChanged(mLocalAdapter.getBluetoothState());
+        }
 
         mSwitchWidget.startListening();
         mContext.registerReceiver(mReceiver, mIntentFilter);
@@ -155,7 +157,9 @@
     }
 
     private void setChecked(boolean isChecked) {
-        if (isChecked != mSwitchWidget.isChecked()) {
+        final boolean currentState =
+                (mSwitchWidget.getSwitch() != null) && mSwitchWidget.getSwitch().isChecked();
+        if (isChecked != currentState) {
             // set listener to null, so onCheckedChanged won't be called
             // if the checked status on Switch isn't changed by user click
             if (mValidListener) {
diff --git a/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java
index c425cdc..450c7b2 100644
--- a/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java
+++ b/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java
@@ -22,14 +22,16 @@
 import android.support.v7.preference.Preference;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 /**
  * Controller that shows received files
  */
-public class BluetoothFilesPreferenceController extends PreferenceController {
+public class BluetoothFilesPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
     private static final String TAG = "BluetoothFilesPrefCtrl";
 
     public static final String KEY_RECEIVED_FILES = "bt_received_files";
diff --git a/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceController.java
index 4d5692f..d1492e4 100644
--- a/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceController.java
+++ b/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceController.java
@@ -25,21 +25,22 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.widget.MasterSwitchController;
 import com.android.settings.widget.MasterSwitchPreference;
 import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
 
-public class BluetoothMasterSwitchPreferenceController extends PreferenceController
-        implements OnSummaryChangeListener,
-        LifecycleObserver, OnResume, OnPause, OnStart, OnStop {
+public class BluetoothMasterSwitchPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, OnSummaryChangeListener, LifecycleObserver, OnResume,
+        OnPause, OnStart, OnStop {
 
     public static final String KEY_TOGGLE_BLUETOOTH = "toggle_bluetooth";
 
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingController.java b/src/com/android/settings/bluetooth/BluetoothPairingController.java
index ce82612..7d2d7b4 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingController.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingController.java
@@ -172,6 +172,22 @@
     }
 
     /**
+     * Update Phone book permission
+     *
+     */
+     public void  setContactSharingState() {
+        if ((mDevice.getPhonebookAccessPermission() != BluetoothDevice.ACCESS_ALLOWED)
+                && (mDevice.getPhonebookAccessPermission() != BluetoothDevice.ACCESS_REJECTED)) {
+                 if (mDevice.getBluetoothClass().getDeviceClass()
+                        == BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE) {
+                    onCheckedChanged(null, true);
+            } else {
+                onCheckedChanged(null, false);
+            }
+        }
+    }
+
+    /**
      * A method for querying if the provided editable is a valid passkey/pin format for this device.
      *
      * @param s - The passkey/pin
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
index fee37d0..60011f9 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
@@ -26,10 +26,10 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.search.Indexable;
 import com.android.settingslib.bluetooth.BluetoothDeviceFilter;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.widget.FooterPreference;
 
 import java.util.ArrayList;
@@ -184,8 +184,8 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
-        List<PreferenceController> controllers = new ArrayList<>();
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        List<AbstractPreferenceController> controllers = new ArrayList<>();
         mDeviceNamePrefController = new BluetoothDeviceNamePreferenceController(context,
                 getLifecycle());
         controllers.add(mDeviceNamePrefController);
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
index 97382c3..22cb3a6 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
@@ -108,12 +108,6 @@
     @VisibleForTesting
     void dismiss() {
         if (!isFinishing()) {
-            BluetoothPairingDialogFragment bluetoothFragment =
-                (BluetoothPairingDialogFragment) getFragmentManager()
-                    .findFragmentByTag(FRAGMENT_TAG);
-            if (bluetoothFragment != null) {
-                bluetoothFragment.dismiss();
-            }
             finish();
         }
     }
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
index f95ce46..18839dc 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
@@ -25,6 +25,7 @@
 import android.text.InputFilter;
 import android.text.InputFilter.LengthFilter;
 import android.text.InputType;
+import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.Log;
 import android.view.View;
@@ -34,6 +35,7 @@
 import android.widget.EditText;
 import android.widget.TextView;
 
+import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -186,6 +188,19 @@
     }
 
     /**
+     * Helper method to return the text of the pin entry field - this exists primarily to help us
+     * simulate having existing text when the dialog is recreated, for example after a screen
+     * rotation.
+     */
+    @VisibleForTesting
+    CharSequence getPairingViewText() {
+        if (mPairingView != null) {
+            return mPairingView.getText();
+        }
+        return null;
+    }
+
+    /**
      * Returns a dialog with UI elements that allow a user to provide input.
      */
     private AlertDialog createUserEntryDialog() {
@@ -196,7 +211,9 @@
         mBuilder.setNegativeButton(getString(android.R.string.cancel), this);
         AlertDialog dialog = mBuilder.create();
         dialog.setOnShowListener(d -> {
-            mDialog.getButton(Dialog.BUTTON_POSITIVE).setEnabled(false);
+            if (TextUtils.isEmpty(getPairingViewText())) {
+                mDialog.getButton(Dialog.BUTTON_POSITIVE).setEnabled(false);
+            }
             if (mPairingView != null && mPairingView.requestFocus()) {
                 InputMethodManager imm = (InputMethodManager)
                         getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
@@ -224,6 +241,7 @@
 
         contactSharing.setVisibility(mPairingController.isProfileReady()
                 ? View.GONE : View.VISIBLE);
+        mPairingController.setContactSharingState();
         contactSharing.setOnCheckedChangeListener(mPairingController);
         contactSharing.setChecked(mPairingController.getContactSharingState());
 
@@ -314,6 +332,7 @@
 
         contactSharing.setVisibility(
                 mPairingController.isProfileReady() ? View.GONE : View.VISIBLE);
+        mPairingController.setContactSharingState();
         contactSharing.setChecked(mPairingController.getContactSharingState());
         contactSharing.setOnCheckedChangeListener(mPairingController);
 
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java
index ab99aad..8ac64e8 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java
@@ -22,14 +22,16 @@
 import android.os.UserHandle;
 
 import com.android.settings.SettingsActivity;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.R;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 
 /**
  * Controller that shows and updates the bluetooth device name
  */
-public class BluetoothPairingPreferenceController extends PreferenceController {
+public class BluetoothPairingPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
     private static final String TAG = "BluetoothPairingPrefCtrl";
 
     public static final String KEY_PAIRING = "pref_bt_pairing";
@@ -74,7 +76,7 @@
     public Preference createBluetoothPairingPreference(int order) {
         mPreference = new Preference(mFragment.getPreferenceScreen().getContext());
         mPreference.setKey(KEY_PAIRING);
-        mPreference.setIcon(R.drawable.ic_add);
+        mPreference.setIcon(R.drawable.ic_menu_add);
         mPreference.setOrder(order);
         mPreference.setTitle(R.string.bluetooth_pairing_pref_title);
 
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index a0c805c..9789310 100644
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -16,15 +16,15 @@
 
 package com.android.settings.bluetooth;
 
+import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
+
 import android.app.Activity;
-import android.app.Fragment;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.os.SystemProperties;
 import android.provider.Settings;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
@@ -39,7 +39,6 @@
 import com.android.settings.LinkifyUtils;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.location.ScanningSettings;
 import com.android.settings.overlay.FeatureFactory;
@@ -60,9 +59,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
-
-import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
 
 /**
  * BluetoothSettings is the Settings screen for Bluetooth configuration and
@@ -144,6 +140,8 @@
             mBluetoothEnabler.resume(getActivity());
         }
         super.onStart();
+        // Always show paired devices regardless whether user-friendly name exists
+        mShowDevicesWithoutNames = true;
         if (isUiRestricted()) {
             getPreferenceScreen().removeAll();
             if (!isUiRestrictedByOnlyAdmin()) {
@@ -362,8 +360,8 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
-        final List<PreferenceController> controllers = new ArrayList<>();
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         final Lifecycle lifecycle = getLifecycle();
         mDeviceNamePrefController = new BluetoothDeviceNamePreferenceController(context, lifecycle);
         mPairingPrefController = new BluetoothPairingPreferenceController(context, this,
diff --git a/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java b/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java
index 7d2cc18..662cd70 100644
--- a/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java
+++ b/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java
@@ -42,31 +42,21 @@
     private final LocalBluetoothManager mBluetoothManager;
     private final LocalBluetoothAdapter mBluetoothAdapter;
 
-    private boolean mEnabled;
-    private int mConnectionState;
-
     public BluetoothSummaryUpdater(Context context, OnSummaryChangeListener listener,
             LocalBluetoothManager bluetoothManager) {
         super(context, listener);
         mBluetoothManager = bluetoothManager;
         mBluetoothAdapter = mBluetoothManager != null
-            ? mBluetoothManager.getBluetoothAdapter() : null;
+                ? mBluetoothManager.getBluetoothAdapter() : null;
     }
 
     @Override
     public void onBluetoothStateChanged(int bluetoothState) {
-        mEnabled = bluetoothState == BluetoothAdapter.STATE_ON
-            || bluetoothState == BluetoothAdapter.STATE_TURNING_ON;
-        if (!mEnabled) {
-            mConnectionState = BluetoothAdapter.STATE_DISCONNECTED;
-        }
         notifyChangeIfNeeded();
     }
 
     @Override
     public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {
-        mConnectionState = state;
-        updateConnected();
         notifyChangeIfNeeded();
     }
 
@@ -92,8 +82,6 @@
             return;
         }
         if (listening) {
-            mEnabled = mBluetoothAdapter.isEnabled();
-            mConnectionState = mBluetoothAdapter.getConnectionState();
             notifyChangeIfNeeded();
             mBluetoothManager.getEventManager().registerCallback(this);
         } else {
@@ -103,10 +91,10 @@
 
     @Override
     public String getSummary() {
-        if (!mEnabled) {
+        if (mBluetoothAdapter == null || !mBluetoothAdapter.isEnabled()) {
             return mContext.getString(R.string.bluetooth_disabled);
         }
-        switch (mConnectionState) {
+        switch (mBluetoothAdapter.getConnectionState()) {
             case BluetoothAdapter.STATE_CONNECTED:
                 return getConnectedDeviceSummary();
             case BluetoothAdapter.STATE_CONNECTING:
@@ -118,50 +106,17 @@
         }
     }
 
-    private void updateConnected() {
-        if (mBluetoothAdapter == null) {
-            return;
-        }
-        // Make sure our connection state is up to date.
-        int state = mBluetoothAdapter.getConnectionState();
-        if (state != mConnectionState) {
-            mConnectionState = state;
-            return;
-        }
-        final Collection<CachedBluetoothDevice> devices = getDevices();
-        if (devices == null) {
-            mConnectionState = BluetoothAdapter.STATE_DISCONNECTED;
-            return;
-        }
-        if (mConnectionState == BluetoothAdapter.STATE_CONNECTED) {
-            CachedBluetoothDevice connectedDevice = null;
-            for (CachedBluetoothDevice device : devices) {
-                if (device.isConnected()) {
-                    connectedDevice = device;
-                    break;
-                }
-            }
-            if (connectedDevice == null) {
-                // If somehow we think we are connected, but have no connected devices, we
-                // aren't connected.
-                mConnectionState = BluetoothAdapter.STATE_DISCONNECTED;
-            }
-        }
-    }
-
-    private Collection<CachedBluetoothDevice> getDevices() {
-        return mBluetoothManager != null
-            ? mBluetoothManager.getCachedDeviceManager().getCachedDevicesCopy()
-            : null;
-    }
-
     @VisibleForTesting
     String getConnectedDeviceSummary() {
         String deviceName = null;
         int count = 0;
         final Set<BluetoothDevice> devices = mBluetoothAdapter.getBondedDevices();
-        if (devices == null || devices.isEmpty()) {
-            return null;
+        if (devices == null) {
+            Log.e(TAG, "getConnectedDeviceSummary, bonded devices are null");
+            return mContext.getString(R.string.bluetooth_disabled);
+        } else if (devices.isEmpty()) {
+            Log.e(TAG, "getConnectedDeviceSummary, no bonded devices");
+            return mContext.getString(R.string.disconnected);
         }
         for (BluetoothDevice device : devices) {
             if (device.isConnected()) {
@@ -173,12 +128,13 @@
             }
         }
         if (deviceName == null) {
-            Log.w(TAG, "getConnectedDeviceSummary, deviceName is null, numBondedDevices="
+            Log.e(TAG, "getConnectedDeviceSummary, deviceName is null, numBondedDevices="
                     + devices.size());
             for (BluetoothDevice device : devices) {
-                Log.w(TAG, "getConnectedDeviceSummary, device=" + device.getName() + "["
+                Log.e(TAG, "getConnectedDeviceSummary, device=" + device.getName() + "["
                         + device.getAddress() + "]" + ", isConnected=" + device.isConnected());
             }
+            return mContext.getString(R.string.disconnected);
         }
         return count > 1 ? mContext.getString(R.string.bluetooth_connected_multiple_devices_summary)
                 : mContext.getString(R.string.bluetooth_connected_summary, deviceName);
diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
index ca06e3c..0485e69 100644
--- a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
+++ b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
@@ -19,6 +19,7 @@
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.os.Bundle;
+import android.os.SystemProperties;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
@@ -52,6 +53,10 @@
 
     private static final String KEY_BT_SCAN = "bt_scan";
 
+    // Copied from DevelopmentSettings.java
+    private static final String BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY =
+            "persist.bluetooth.showdeviceswithoutnames";
+
     private BluetoothDeviceFilter.Filter mFilter;
 
     @VisibleForTesting
@@ -68,6 +73,8 @@
     final WeakHashMap<CachedBluetoothDevice, BluetoothDevicePreference> mDevicePreferenceMap =
             new WeakHashMap<CachedBluetoothDevice, BluetoothDevicePreference>();
 
+    boolean mShowDevicesWithoutNames;
+
     DeviceListPreferenceFragment(String restrictedKey) {
         super(restrictedKey);
         mFilter = BluetoothDeviceFilter.ALL_FILTER;
@@ -103,6 +110,8 @@
     @Override
     public void onStart() {
         super.onStart();
+        mShowDevicesWithoutNames = SystemProperties.getBoolean(
+                BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, false);
         if (mLocalManager == null || isUiRestricted()) return;
 
         mLocalManager.setForegroundActivity(getActivity());
@@ -181,7 +190,7 @@
         BluetoothDevicePreference preference = (BluetoothDevicePreference) getCachedPreference(key);
 
         if (preference == null) {
-            preference = new BluetoothDevicePreference(getPrefContext(), cachedDevice);
+            preference = new BluetoothDevicePreference(getPrefContext(), cachedDevice, this);
             preference.setKey(key);
             mDeviceListGroup.addPreference(preference);
         } else {
@@ -271,4 +280,8 @@
      * Return the key of the {@link PreferenceGroup} that contains the bluetooth devices
      */
     public abstract String getDeviceListKey();
+
+    public boolean shouldShowDevicesWithoutNames() {
+        return mShowDevicesWithoutNames;
+    }
 }
diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java
index 4af3732..847a9c9 100644
--- a/src/com/android/settings/bluetooth/DevicePickerFragment.java
+++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.bluetooth;
 
+import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
+
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothDevicePicker;
@@ -29,10 +31,8 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
-
-import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.List;
 
@@ -170,7 +170,7 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
         return null;
     }
 
diff --git a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
old mode 100755
new mode 100644
index a76ed46..8facab0
--- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
+++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
@@ -172,7 +172,11 @@
         mProfileContainer.removeAllViews();
         for (LocalBluetoothProfile profile : mCachedDevice.getConnectableProfiles()) {
             CheckBox pref = createProfilePreference(profile);
-            mProfileContainer.addView(pref);
+            // MAP and PBAP profiles would be added based on permission access
+            if (!((profile instanceof PbapServerProfile) ||
+                (profile instanceof MapProfile))) {
+                mProfileContainer.addView(pref);
+            }
 
             if (profile instanceof A2dpProfile) {
                 BluetoothDevice device = mCachedDevice.getDevice();
@@ -191,6 +195,7 @@
         }
 
         final int pbapPermission = mCachedDevice.getPhonebookPermissionChoice();
+        Log.d(TAG, "addPreferencesForProfiles: pbapPermission = " + pbapPermission);
         // Only provide PBAP cabability if the client device has requested PBAP.
         if (pbapPermission != CachedBluetoothDevice.ACCESS_UNKNOWN) {
             final PbapServerProfile psp = mManager.getProfileManager().getPbapProfile();
@@ -200,6 +205,7 @@
 
         final MapProfile mapProfile = mManager.getProfileManager().getMapProfile();
         final int mapPermission = mCachedDevice.getMessagePermissionChoice();
+        Log.d(TAG, "addPreferencesForProfiles: mapPermission = " + mapPermission);
         if (mapPermission != CachedBluetoothDevice.ACCESS_UNKNOWN) {
             CheckBox mapPreference = createProfilePreference(mapProfile);
             mProfileContainer.addView(mapPreference);
@@ -251,15 +257,6 @@
     private void onProfileClicked(LocalBluetoothProfile profile, CheckBox profilePref) {
         BluetoothDevice device = mCachedDevice.getDevice();
 
-        if (KEY_PBAP_SERVER.equals(profilePref.getTag())) {
-            final int newPermission = mCachedDevice.getPhonebookPermissionChoice()
-                == CachedBluetoothDevice.ACCESS_ALLOWED ? CachedBluetoothDevice.ACCESS_REJECTED
-                : CachedBluetoothDevice.ACCESS_ALLOWED;
-            mCachedDevice.setPhonebookPermissionChoice(newPermission);
-            profilePref.setChecked(newPermission == CachedBluetoothDevice.ACCESS_ALLOWED);
-            return;
-        }
-
         if (!profilePref.isChecked()) {
             // Recheck it, until the dialog is done.
             profilePref.setChecked(true);
@@ -268,6 +265,12 @@
             if (profile instanceof MapProfile) {
                 mCachedDevice.setMessagePermissionChoice(BluetoothDevice.ACCESS_ALLOWED);
             }
+            if (profile instanceof PbapServerProfile) {
+                mCachedDevice.setPhonebookPermissionChoice(BluetoothDevice.ACCESS_ALLOWED);
+                refreshProfilePreference(profilePref, profile);
+                // PBAP server is not preffered profile and cannot initiate connection, so return
+                return;
+            }
             if (profile.isPreferred(device)) {
                 // profile is preferred but not connected: disable auto-connect
                 if (profile instanceof PanProfile) {
@@ -301,10 +304,17 @@
         DialogInterface.OnClickListener disconnectListener =
                 new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialog, int which) {
-                device.disconnect(profile);
-                profile.setPreferred(device.getDevice(), false);
-                if (profile instanceof MapProfile) {
-                    device.setMessagePermissionChoice(BluetoothDevice.ACCESS_REJECTED);
+
+                // Disconnect only when user has selected OK otherwise ignore
+                if (which == DialogInterface.BUTTON_POSITIVE) {
+                    device.disconnect(profile);
+                    profile.setPreferred(device.getDevice(), false);
+                    if (profile instanceof MapProfile) {
+                        device.setMessagePermissionChoice(BluetoothDevice.ACCESS_REJECTED);
+                    }
+                    if (profile instanceof PbapServerProfile) {
+                        device.setPhonebookPermissionChoice(BluetoothDevice.ACCESS_REJECTED);
+                    }
                 }
                 refreshProfilePreference(findProfile(profile.toString()), profile);
             }
@@ -341,6 +351,19 @@
         for (LocalBluetoothProfile profile : mCachedDevice.getRemovedProfiles()) {
             CheckBox profilePref = findProfile(profile.toString());
             if (profilePref != null) {
+
+                if (profile instanceof PbapServerProfile) {
+                    final int pbapPermission = mCachedDevice.getPhonebookPermissionChoice();
+                    Log.d(TAG, "refreshProfiles: pbapPermission = " + pbapPermission);
+                    if (pbapPermission != CachedBluetoothDevice.ACCESS_UNKNOWN)
+                        continue;
+                }
+                if (profile instanceof MapProfile) {
+                    final int mapPermission = mCachedDevice.getMessagePermissionChoice();
+                    Log.d(TAG, "refreshProfiles: mapPermission = " + mapPermission);
+                    if (mapPermission != CachedBluetoothDevice.ACCESS_UNKNOWN)
+                        continue;
+                }
                 Log.d(TAG, "Removing " + profile.toString() + " from profile list");
                 mProfileContainer.removeView(profilePref);
             }
diff --git a/src/com/android/settings/bluetooth/OWNERS b/src/com/android/settings/bluetooth/OWNERS
new file mode 100644
index 0000000..2b82978
--- /dev/null
+++ b/src/com/android/settings/bluetooth/OWNERS
@@ -0,0 +1,7 @@
+# Default reviewers for this and subdirectories.
+asargent@google.com
+eisenbach@google.com
+jackqdyulei@google.com
+siyuanh@google.com
+
+# Emergency approvers in case the above are not available
\ No newline at end of file
diff --git a/src/com/android/settings/bluetooth/Utils.java b/src/com/android/settings/bluetooth/Utils.java
index 26edd84..0ecf62d 100755
--- a/src/com/android/settings/bluetooth/Utils.java
+++ b/src/com/android/settings/bluetooth/Utils.java
@@ -23,6 +23,9 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.IdRes;
 import android.support.annotation.VisibleForTesting;
 import android.util.Pair;
 import android.widget.Toast;
@@ -36,6 +39,7 @@
 import com.android.settingslib.bluetooth.LocalBluetoothManager.BluetoothManagerCallback;
 import com.android.settingslib.bluetooth.LocalBluetoothProfile;
 import com.android.settingslib.bluetooth.Utils.ErrorListener;
+import com.android.settingslib.graph.BluetoothDeviceLayerDrawable;
 
 import java.util.List;
 
@@ -150,27 +154,39 @@
         }
     };
 
-    static Pair<Integer, String> getBtClassDrawableWithDescription(Resources r,
+    static Pair<Drawable, String> getBtClassDrawableWithDescription(Context context,
             CachedBluetoothDevice cachedDevice) {
+        return getBtClassDrawableWithDescription(context, cachedDevice, 1 /* iconScale */);
+    }
+
+    static Pair<Drawable, String> getBtClassDrawableWithDescription(Context context,
+            CachedBluetoothDevice cachedDevice, float iconScale) {
         BluetoothClass btClass = cachedDevice.getBtClass();
+        final int level = cachedDevice.getBatteryLevel();
         if (btClass != null) {
             switch (btClass.getMajorDeviceClass()) {
                 case BluetoothClass.Device.Major.COMPUTER:
-                    return new Pair<Integer, String>(R.drawable.ic_bt_laptop,
-                           r.getString(R.string.bluetooth_talkback_computer));
+                    return new Pair<>(getBluetoothDrawable(context, R.drawable.ic_bt_laptop, level,
+                            iconScale),
+                            context.getString(R.string.bluetooth_talkback_computer));
 
                 case BluetoothClass.Device.Major.PHONE:
-                    return new Pair<Integer, String>(R.drawable.ic_bt_cellphone,
-                            r.getString(R.string.bluetooth_talkback_phone));
+                    return new Pair<>(
+                            getBluetoothDrawable(context, R.drawable.ic_bt_cellphone, level,
+                                    iconScale),
+                            context.getString(R.string.bluetooth_talkback_phone));
 
                 case BluetoothClass.Device.Major.PERIPHERAL:
-                    return new Pair<Integer, String>(HidProfile.getHidClassDrawable(btClass),
-                            r.getString(
-                                    R.string.bluetooth_talkback_input_peripheral));
+                    return new Pair<>(
+                            getBluetoothDrawable(context, HidProfile.getHidClassDrawable(btClass),
+                                    level, iconScale),
+                            context.getString(R.string.bluetooth_talkback_input_peripheral));
 
                 case BluetoothClass.Device.Major.IMAGING:
-                    return new Pair<Integer, String>(R.drawable.ic_settings_print,
-                            r.getString(R.string.bluetooth_talkback_imaging));
+                    return new Pair<>(
+                            getBluetoothDrawable(context, R.drawable.ic_settings_print, level,
+                                    iconScale),
+                            context.getString(R.string.bluetooth_talkback_imaging));
 
                 default:
                     // unrecognized device class; continue
@@ -181,20 +197,38 @@
         for (LocalBluetoothProfile profile : profiles) {
             int resId = profile.getDrawableResource(btClass);
             if (resId != 0) {
-                return new Pair<Integer, String>(resId, null);
+                return new Pair<>(getBluetoothDrawable(context, resId, level, iconScale), null);
             }
         }
         if (btClass != null) {
             if (btClass.doesClassMatch(BluetoothClass.PROFILE_HEADSET)) {
-                return new Pair<Integer, String>(R.drawable.ic_bt_headset_hfp,
-                        r.getString(R.string.bluetooth_talkback_headset));
+                return new Pair<>(
+                        getBluetoothDrawable(context, R.drawable.ic_bt_headset_hfp, level,
+                                iconScale),
+                        context.getString(R.string.bluetooth_talkback_headset));
             }
             if (btClass.doesClassMatch(BluetoothClass.PROFILE_A2DP)) {
-                return new Pair<Integer, String>(R.drawable.ic_bt_headphones_a2dp,
-                        r.getString(R.string.bluetooth_talkback_headphone));
+                return new Pair<>(
+                        getBluetoothDrawable(context, R.drawable.ic_bt_headphones_a2dp, level,
+                                iconScale),
+                        context.getString(R.string.bluetooth_talkback_headphone));
             }
         }
-        return new Pair<Integer, String>(R.drawable.ic_settings_bluetooth,
-                r.getString(R.string.bluetooth_talkback_bluetooth));
+        return new Pair<>(
+                getBluetoothDrawable(context, R.drawable.ic_settings_bluetooth, level, iconScale),
+                context.getString(R.string.bluetooth_talkback_bluetooth));
+    }
+
+    @VisibleForTesting
+    static Drawable getBluetoothDrawable(Context context, @DrawableRes int resId,
+            int batteryLevel, float iconScale) {
+        if (batteryLevel != BluetoothDevice.BATTERY_LEVEL_UNKNOWN) {
+            return BluetoothDeviceLayerDrawable.createLayerDrawable(context, resId, batteryLevel,
+                    iconScale);
+        } else if (resId != 0) {
+            return context.getDrawable(resId);
+        } else {
+            return null;
+        }
     }
 }
diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
index 52028b3..483b00c 100644
--- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
@@ -26,13 +26,14 @@
 import com.android.settings.SettingsActivity;
 import com.android.settings.bluetooth.BluetoothMasterSwitchPreferenceController;
 import com.android.settings.bluetooth.Utils;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.deviceinfo.UsbBackend;
 import com.android.settings.nfc.NfcPreferenceController;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
@@ -65,8 +66,8 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
-        final List<PreferenceController> controllers = new ArrayList<>();
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         final Lifecycle lifecycle = getLifecycle();
         final NfcPreferenceController nfcPreferenceController =
                 new NfcPreferenceController(context);
@@ -81,6 +82,12 @@
                         (SettingsActivity) getActivity());
         lifecycle.addObserver(bluetoothPreferenceController);
         controllers.add(bluetoothPreferenceController);
+
+        SmsMirroringFeatureProvider smsMirroringFeatureProvider =
+                FeatureFactory.getFactory(context).getSmsMirroringFeatureProvider();
+        AbstractPreferenceController smsMirroringController =
+                smsMirroringFeatureProvider.getController(context);
+        controllers.add(smsMirroringController);
         return controllers;
     }
 
@@ -143,6 +150,13 @@
                         keys.add(NfcPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
                     }
                     keys.add(BluetoothMasterSwitchPreferenceController.KEY_TOGGLE_BLUETOOTH);
+
+                    SmsMirroringFeatureProvider smsMirroringFeatureProvider =
+                            FeatureFactory.getFactory(context).getSmsMirroringFeatureProvider();
+                    SmsMirroringPreferenceController smsMirroringController =
+                            smsMirroringFeatureProvider.getController(context);
+                    smsMirroringController.updateNonIndexableKeys(keys);
+
                     return keys;
                 }
             };
diff --git a/src/com/android/settings/connecteddevice/SmsMirroringFeatureProvider.java b/src/com/android/settings/connecteddevice/SmsMirroringFeatureProvider.java
new file mode 100644
index 0000000..9064c81
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/SmsMirroringFeatureProvider.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.connecteddevice;
+
+import android.content.Context;
+
+public interface SmsMirroringFeatureProvider {
+
+    /** Returns whether to show SMS mirroring. */
+    boolean shouldShowSmsMirroring(Context context);
+
+    /** Returns a preference controller for SMS mirroring. */
+    SmsMirroringPreferenceController getController(Context context);
+}
diff --git a/src/com/android/settings/connecteddevice/SmsMirroringFeatureProviderImpl.java b/src/com/android/settings/connecteddevice/SmsMirroringFeatureProviderImpl.java
new file mode 100644
index 0000000..c41d8f5
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/SmsMirroringFeatureProviderImpl.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.connecteddevice;
+
+import android.content.Context;
+
+public class SmsMirroringFeatureProviderImpl implements SmsMirroringFeatureProvider {
+    @Override
+    public boolean shouldShowSmsMirroring(Context context) {
+        return false;
+    }
+
+    @Override
+    public SmsMirroringPreferenceController getController(Context context) {
+        return new SmsMirroringPreferenceController(context);
+    }
+}
+
diff --git a/src/com/android/settings/connecteddevice/SmsMirroringPreferenceController.java b/src/com/android/settings/connecteddevice/SmsMirroringPreferenceController.java
new file mode 100644
index 0000000..c293481
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/SmsMirroringPreferenceController.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.connecteddevice;
+
+import android.content.Context;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+public class SmsMirroringPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
+
+    static final String KEY_SMS_MIRRORING = "sms_mirroring";
+
+    private SmsMirroringFeatureProvider mFeatureProvider;
+
+    public SmsMirroringPreferenceController(Context context) {
+        super(context);
+        mFeatureProvider = FeatureFactory.getFactory(context).getSmsMirroringFeatureProvider();
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mFeatureProvider.shouldShowSmsMirroring(mContext);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_SMS_MIRRORING;
+    }
+}
diff --git a/src/com/android/settings/connecteddevice/UsbModePreferenceController.java b/src/com/android/settings/connecteddevice/UsbModePreferenceController.java
index 9c9ed12..a6cb9be 100644
--- a/src/com/android/settings/connecteddevice/UsbModePreferenceController.java
+++ b/src/com/android/settings/connecteddevice/UsbModePreferenceController.java
@@ -24,15 +24,16 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.R;
 import com.android.settings.deviceinfo.UsbBackend;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
-public class UsbModePreferenceController extends PreferenceController
-        implements LifecycleObserver, OnResume, OnPause {
+public class UsbModePreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {
 
     private static final String KEY_USB_MODE = "usb_mode";
 
diff --git a/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java b/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java
index df6ccd3..04a561c 100644
--- a/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java
+++ b/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java
@@ -20,12 +20,13 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
-public abstract class DynamicAvailabilityPreferenceController extends PreferenceController
-        implements LifecycleObserver, OnResume {
+public abstract class DynamicAvailabilityPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver, OnResume {
 
     private Preference mPreference;
     private PreferenceScreen mScreen;
diff --git a/src/com/android/settings/core/PreferenceController.java b/src/com/android/settings/core/PreferenceControllerMixin.java
similarity index 62%
rename from src/com/android/settings/core/PreferenceController.java
rename to src/com/android/settings/core/PreferenceControllerMixin.java
index 2b3a7ab..0f60210 100644
--- a/src/com/android/settings/core/PreferenceController.java
+++ b/src/com/android/settings/core/PreferenceControllerMixin.java
@@ -15,21 +15,28 @@
  */
 package com.android.settings.core;
 
-import android.content.Context;
-
-import com.android.settings.search.SearchIndexableRaw;
 import com.android.settings.search.ResultPayload;
+import com.android.settings.search.SearchIndexableRaw;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.List;
 
 /**
- * A controller that manages event for preference.
+ * A controller mixin that adds mobile settings specific functionality
  */
-public abstract class PreferenceController extends AbstractPreferenceController {
+public interface PreferenceControllerMixin {
 
-    public PreferenceController(Context context) {
-        super(context);
+    /**
+     * Updates non-indexable keys for search provider.
+     *
+     * Called by SearchIndexProvider#getNonIndexableKeys
+     */
+    default void updateNonIndexableKeys(List<String> keys) {
+        if (this instanceof AbstractPreferenceController) {
+            if (!((AbstractPreferenceController) this).isAvailable()) {
+                keys.add(((AbstractPreferenceController) this).getPreferenceKey());
+            }
+        }
     }
 
     /**
@@ -37,13 +44,13 @@
      *
      * Called by SearchIndexProvider#getRawDataToIndex
      */
-    public void updateRawDataToIndex(List<SearchIndexableRaw> rawData) {
+    default void updateRawDataToIndex(List<SearchIndexableRaw> rawData) {
     }
 
     /**
      * @return the {@link ResultPayload} corresponding to the search result type for the preference.
      */
-    public ResultPayload getResultPayload() {
+    default ResultPayload getResultPayload() {
         return null;
     }
 }
diff --git a/src/com/android/settings/core/TouchOverlayManager.java b/src/com/android/settings/core/TouchOverlayManager.java
deleted file mode 100644
index f69d1bf..0000000
--- a/src/com/android/settings/core/TouchOverlayManager.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.core;
-
-import android.app.AppOpsManager;
-import android.content.Context;
-import android.os.Binder;
-import android.os.IBinder;
-
-public class TouchOverlayManager {
-
-    private final Context mContext;
-    private final IBinder mToken = new Binder();
-
-    public TouchOverlayManager(Context context) {
-        mContext = context;
-    }
-
-    public void setOverlayAllowed(boolean allowed) {
-        final AppOpsManager aom = mContext.getSystemService(AppOpsManager.class);
-        if (aom != null) {
-            aom.setUserRestriction(AppOpsManager.OP_SYSTEM_ALERT_WINDOW, !allowed, mToken);
-            aom.setUserRestriction(AppOpsManager.OP_TOAST_WINDOW, !allowed, mToken);
-        }
-    }
-}
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 53bd0be..fad4e91 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -31,7 +31,6 @@
 import com.android.settings.TestingSettings;
 import com.android.settings.TetherSettings;
 import com.android.settings.TrustedCredentialsSettings;
-import com.android.settings.UserDictionarySettings;
 import com.android.settings.WifiCallingSettings;
 import com.android.settings.accessibility.AccessibilitySettings;
 import com.android.settings.accessibility.AccessibilitySettingsForSetupWizard;
@@ -41,7 +40,7 @@
 import com.android.settings.accounts.ChooseAccountActivity;
 import com.android.settings.accounts.ManagedProfileSettings;
 import com.android.settings.accounts.UserAndAccountDashboardFragment;
-import com.android.settings.applications.AdvancedAppSettings;
+import com.android.settings.applications.DefaultAppSettings;
 import com.android.settings.applications.AppAndNotificationDashboardFragment;
 import com.android.settings.applications.DrawOverlayDetails;
 import com.android.settings.applications.ExternalSourcesDetails;
@@ -53,6 +52,7 @@
 import com.android.settings.applications.PictureInPictureSettings;
 import com.android.settings.applications.ProcessStatsSummary;
 import com.android.settings.applications.ProcessStatsUi;
+import com.android.settings.applications.SpecialAccessSettings;
 import com.android.settings.applications.UsageAccessDetails;
 import com.android.settings.applications.VrListenerSettings;
 import com.android.settings.applications.WriteSettingsDetails;
@@ -61,6 +61,8 @@
 import com.android.settings.bluetooth.BluetoothSettings;
 import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
 import com.android.settings.dashboard.SupportFragment;
+import com.android.settings.datausage.DataPlanUsageSummary;
+import com.android.settings.datausage.DataUsageList;
 import com.android.settings.datausage.DataUsageSummary;
 import com.android.settings.deletionhelper.AutomaticStorageManagerSettings;
 import com.android.settings.development.DevelopmentSettings;
@@ -89,6 +91,7 @@
 import com.android.settings.inputmethod.PhysicalKeyboardFragment;
 import com.android.settings.inputmethod.SpellCheckersSettings;
 import com.android.settings.inputmethod.UserDictionaryList;
+import com.android.settings.inputmethod.UserDictionarySettings;
 import com.android.settings.language.LanguageAndInputSettings;
 import com.android.settings.localepicker.LocaleListEditor;
 import com.android.settings.location.LocationSettings;
@@ -184,9 +187,11 @@
             PickupGestureSettings.class.getName(),
             DoubleTwistGestureSettings.class.getName(),
             CryptKeeperSettings.class.getName(),
+            DataPlanUsageSummary.class.getName(),
             DataUsageSummary.class.getName(),
             DreamSettings.class.getName(),
             UserSettings.class.getName(),
+            SpecialAccessSettings.class.getName(),
             NotificationAccessSettings.class.getName(),
             ZenAccessSettings.class.getName(),
             PrintSettingsFragment.class.getName(),
@@ -217,7 +222,7 @@
             DrawOverlayDetails.class.getName(),
             WriteSettingsDetails.class.getName(),
             ExternalSourcesDetails.class.getName(),
-            AdvancedAppSettings.class.getName(),
+            DefaultAppSettings.class.getName(),
             WallpaperTypeSettings.class.getName(),
             VrListenerSettings.class.getName(),
             PictureInPictureSettings.class.getName(),
@@ -247,10 +252,10 @@
             WebViewAppPicker.class.getName(),
             LockscreenDashboardFragment.class.getName(),
             BluetoothDeviceDetailsFragment.class.getName(),
+            DataUsageList.class.getName()
     };
 
     public static final String[] SETTINGS_FOR_RESTRICTED = {
-            // New IA
             // Home page
             Settings.NetworkDashboardActivity.class.getName(),
             Settings.ConnectedDeviceDashboardActivity.class.getName(),
@@ -266,6 +271,7 @@
             SupportDashboardActivity.class.getName(),
             // Home page > Network & Internet
             Settings.WifiSettingsActivity.class.getName(),
+            Settings.DataPlanUsageSummaryActivity.class.getName(),
             Settings.DataUsageSummaryActivity.class.getName(),
             Settings.SimSettingsActivity.class.getName(),
             // Home page > Connected devices
diff --git a/src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java b/src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java
index b4e6158..dee40c0 100644
--- a/src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java
+++ b/src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java
@@ -120,19 +120,29 @@
 
         final Pair<Integer, Object> valueData;
         if (value instanceof Long) {
-            valueData = Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_LONG_VALUE,
-                    value);
+            final Long longVal = (Long) value;
+            final int intVal;
+            if (longVal > Integer.MAX_VALUE) {
+                intVal = Integer.MAX_VALUE;
+            } else if (longVal < Integer.MIN_VALUE) {
+                intVal = Integer.MIN_VALUE;
+            } else {
+                intVal = longVal.intValue();
+            }
+            valueData = Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE,
+                    intVal);
         } else if (value instanceof Integer) {
-            valueData = Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_LONG_VALUE,
-                    ((Integer) value).longValue());
+            valueData = Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE,
+                    value);
         } else if (value instanceof Boolean) {
-            valueData = Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_LONG_VALUE,
-                    (Boolean) value ? 1L : 0L);
+            valueData = Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE,
+                    (Boolean) value ? 1 : 0);
         } else if (value instanceof Float) {
             valueData = Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_FLOAT_VALUE,
                     value);
         } else if (value instanceof String) {
-            valueData = Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_VALUE, value);
+            Log.d(LOG_TAG, "Tried to log string preference " + prefKey + " = " + value);
+            valueData = null;
         } else {
             Log.w(LOG_TAG, "Tried to log unloggable object" + value);
             valueData = null;
diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index 70fd659..6fee28b 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -30,6 +30,7 @@
 import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.Log;
+import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -47,6 +48,7 @@
 import com.android.settings.dashboard.suggestions.SuggestionAdapter;
 import com.android.settings.dashboard.suggestions.SuggestionDismissController;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
+import com.android.settings.dashboard.suggestions.SuggestionLogHelper;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.Utils;
 import com.android.settingslib.drawer.DashboardCategory;
@@ -111,7 +113,7 @@
             List<Condition> conditions, SuggestionParser suggestionParser,
             SuggestionDismissController.Callback callback) {
         List<Tile> suggestions = null;
-        List<DashboardCategory> categories = null;
+        DashboardCategory category = null;
         int suggestionConditionMode = DashboardData.HEADER_MODE_DEFAULT;
 
         mContext = context;
@@ -127,9 +129,9 @@
 
         if (savedInstanceState != null) {
             suggestions = savedInstanceState.getParcelableArrayList(STATE_SUGGESTION_LIST);
-            categories = savedInstanceState.getParcelableArrayList(STATE_CATEGORY_LIST);
+            category = savedInstanceState.getParcelable(STATE_CATEGORY_LIST);
             suggestionConditionMode = savedInstanceState.getInt(
-                STATE_SUGGESTION_CONDITION_MODE, suggestionConditionMode);
+                    STATE_SUGGESTION_CONDITION_MODE, suggestionConditionMode);
             mSuggestionsShownLogged = savedInstanceState.getStringArrayList(
                     STATE_SUGGESTIONS_SHOWN_LOGGED);
         } else {
@@ -139,7 +141,7 @@
         mDashboardData = new DashboardData.Builder()
                 .setConditions(conditions)
                 .setSuggestions(suggestions)
-                .setCategories(categories)
+                .setCategory(category)
                 .setSuggestionConditionMode(suggestionConditionMode)
                 .build();
     }
@@ -148,37 +150,15 @@
         return mDashboardData.getSuggestions();
     }
 
-    public void setCategoriesAndSuggestions(List<DashboardCategory> categories,
+    public void setCategoriesAndSuggestions(DashboardCategory category,
             List<Tile> suggestions) {
-        if (mDashboardFeatureProvider.shouldTintIcon()) {
-            // TODO: Better place for tinting?
-            final TypedArray a = mContext.obtainStyledAttributes(new int[]{
-                    android.R.attr.colorControlNormal});
-            final int tintColor = a.getColor(0, mContext.getColor(R.color.fallback_tintColor));
-            a.recycle();
-            for (int i = 0; i < categories.size(); i++) {
-                for (int j = 0; j < categories.get(i).tiles.size(); j++) {
-                    final Tile tile = categories.get(i).tiles.get(j);
-
-                    if (tile.isIconTintable) {
-                        // If this drawable is tintable, tint it to match the color.
-                        tile.icon.setTint(tintColor);
-                    }
-                }
-            }
-
-            for (Tile suggestion : suggestions) {
-                if (suggestion.isIconTintable) {
-                    suggestion.icon.setTint(tintColor);
-                }
-            }
-        }
+        tintIcons(category, suggestions);
 
         final DashboardData prevData = mDashboardData;
         mDashboardData = new DashboardData.Builder(prevData)
                 .setSuggestions(suggestions.subList(0,
                         Math.min(suggestions.size(), MAX_SUGGESTION_TO_SHOW)))
-                .setCategories(categories)
+                .setCategory(category)
                 .build();
         notifyDashboardDataChanged(prevData);
         List<Tile> shownSuggestions = null;
@@ -194,17 +174,19 @@
                 final String identifier = mSuggestionFeatureProvider.getSuggestionIdentifier(
                         mContext, suggestion);
                 mMetricsFeatureProvider.action(
-                        mContext, MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION, identifier);
+                        mContext, MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION, identifier,
+                        getSuggestionTaggedData());
                 mSuggestionsShownLogged.add(identifier);
             }
         }
     }
 
-    public void setCategory(List<DashboardCategory> category) {
+    public void setCategory(DashboardCategory category) {
+        tintIcons(category, null);
         final DashboardData prevData = mDashboardData;
         Log.d(TAG, "adapter setCategory called");
         mDashboardData = new DashboardData.Builder(prevData)
-                .setCategories(category)
+                .setCategory(category)
                 .build();
         notifyDashboardDataChanged(prevData);
     }
@@ -262,10 +244,6 @@
     public void onBindViewHolder(DashboardItemHolder holder, int position) {
         final int type = mDashboardData.getItemTypeByPosition(position);
         switch (type) {
-            case R.layout.dashboard_category:
-                onBindCategory(holder,
-                        (DashboardCategory) mDashboardData.getItemEntityByPosition(position));
-                break;
             case R.layout.dashboard_tile:
                 final Tile tile = (Tile) mDashboardData.getItemEntityByPosition(position);
                 onBindTile(holder, tile);
@@ -274,7 +252,7 @@
                 break;
             case R.layout.suggestion_condition_container:
                 onBindConditionAndSuggestion(
-                    (SuggestionAndConditionContainerHolder) holder, position);
+                        (SuggestionAndConditionContainerHolder) holder, position);
                 break;
             case R.layout.suggestion_condition_header:
                 onBindSuggestionConditionHeader((SuggestionAndConditionHeaderHolder) holder,
@@ -287,7 +265,7 @@
                             MetricsEvent.ACTION_SETTINGS_CONDITION_EXPAND, false);
                     DashboardData prevData = mDashboardData;
                     mDashboardData = new DashboardData.Builder(prevData).setSuggestionConditionMode(
-                        DashboardData.HEADER_MODE_COLLAPSED).build();
+                            DashboardData.HEADER_MODE_COLLAPSED).build();
                     notifyDashboardDataChanged(prevData);
                     mRecyclerView.scrollToPosition(SUGGESTION_CONDITION_HEADER_POSITION);
                 });
@@ -327,7 +305,8 @@
                     mContext, suggestion);
             if (mSuggestionsShownLogged.contains(suggestionId)) {
                 mMetricsFeatureProvider.action(
-                        mContext, MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION, suggestionId);
+                        mContext, MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION, suggestionId,
+                        getSuggestionTaggedData());
             }
         }
         mSuggestionsShownLogged.clear();
@@ -354,13 +333,17 @@
     }
 
     private void logSuggestions() {
-        for (Tile suggestion : mDashboardData.getSuggestions()) {
+        final List<Tile> suggestions = mDashboardData.getSuggestions();
+        if (suggestions == null) {
+            return;
+        }
+        for (Tile suggestion : suggestions) {
             final String suggestionId = mSuggestionFeatureProvider.getSuggestionIdentifier(
-                mContext, suggestion);
+                    mContext, suggestion);
             if (!mSuggestionsShownLogged.contains(suggestionId)) {
                 mMetricsFeatureProvider.action(
-                    mContext, MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                    suggestionId);
+                        mContext, MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION, suggestionId,
+                        getSuggestionTaggedData());
                 mSuggestionsShownLogged.add(suggestionId);
             }
         }
@@ -371,9 +354,9 @@
             SuggestionConditionHeaderData data) {
         final int curMode = mDashboardData.getSuggestionConditionMode();
         final int nextMode = data.hiddenSuggestionCount > 0 && data.conditionCount > 0
-            && curMode != DashboardData.HEADER_MODE_SUGGESTION_EXPANDED
-            ? DashboardData.HEADER_MODE_SUGGESTION_EXPANDED
-            : DashboardData.HEADER_MODE_FULLY_EXPANDED;
+                && curMode != DashboardData.HEADER_MODE_SUGGESTION_EXPANDED
+                ? DashboardData.HEADER_MODE_SUGGESTION_EXPANDED
+                : DashboardData.HEADER_MODE_FULLY_EXPANDED;
         final boolean moreSuggestions = data.hiddenSuggestionCount > 0;
         final boolean hasConditions = data.conditionCount > 0;
         if (data.conditionCount > 0) {
@@ -398,22 +381,22 @@
             if (curMode == DashboardData.HEADER_MODE_COLLAPSED) {
                 if (data.conditionCount > 0) {
                     holder.summary.setText(mContext.getResources().getQuantityString(
-                        R.plurals.suggestions_collapsed_summary,
-                        data.hiddenSuggestionCount, data.hiddenSuggestionCount));
+                            R.plurals.suggestions_collapsed_summary,
+                            data.hiddenSuggestionCount, data.hiddenSuggestionCount));
                 } else {
                     holder.title.setText(mContext.getResources().getQuantityString(
-                        R.plurals.suggestions_collapsed_title,
-                        data.hiddenSuggestionCount, data.hiddenSuggestionCount));
+                            R.plurals.suggestions_collapsed_title,
+                            data.hiddenSuggestionCount, data.hiddenSuggestionCount));
                     holder.title.setTextColor(Color.BLACK);
                     holder.summary.setText(null);
                 }
             } else if (curMode == DashboardData.HEADER_MODE_DEFAULT) {
                 if (data.conditionCount > 0) {
                     holder.summary.setText(mContext.getString(
-                        R.string.suggestions_summary, data.hiddenSuggestionCount));
+                            R.string.suggestions_summary, data.hiddenSuggestionCount));
                 } else {
                     holder.title.setText(mContext.getString(
-                        R.string.suggestions_more_title, data.hiddenSuggestionCount));
+                            R.string.suggestions_more_title, data.hiddenSuggestionCount));
                     holder.title.setTextColor(Color.BLACK);
                     holder.summary.setText(null);
                 }
@@ -421,7 +404,7 @@
         } else if (data.conditionCount > 1) {
             holder.summary.setTextColor(Utils.getColorAccent(mContext));
             holder.summary.setText(
-                mContext.getString(R.string.condition_summary, data.conditionCount));
+                    mContext.getString(R.string.condition_summary, data.conditionCount));
         } else {
             holder.summary.setText(null);
         }
@@ -434,16 +417,16 @@
         holder.itemView.setPadding(0, padding, 0, padding);
 
         holder.itemView.setOnClickListener(v -> {
-            if (moreSuggestions ) {
+            if (moreSuggestions) {
                 logSuggestions();
             } else if (hasConditions) {
                 mMetricsFeatureProvider.action(mContext,
-                    MetricsEvent.ACTION_SETTINGS_CONDITION_EXPAND, true);
+                        MetricsEvent.ACTION_SETTINGS_CONDITION_EXPAND, true);
             }
             DashboardData prevData = mDashboardData;
             final boolean wasCollapsed = curMode == DashboardData.HEADER_MODE_COLLAPSED;
             mDashboardData = new DashboardData.Builder(prevData)
-                .setSuggestionConditionMode(nextMode).build();
+                    .setSuggestionConditionMode(nextMode).build();
             notifyDashboardDataChanged(prevData);
             if (wasCollapsed) {
                 mRecyclerView.scrollToPosition(SUGGESTION_CONDITION_HEADER_POSITION);
@@ -460,13 +443,13 @@
         if (position == SUGGESTION_CONDITION_HEADER_POSITION
                 && suggestions != null && suggestions.size() > 0) {
             mSuggestionAdapter = new SuggestionAdapter(mContext, (List<Tile>)
-                mDashboardData.getItemEntityByPosition(position), mSuggestionsShownLogged);
+                    mDashboardData.getItemEntityByPosition(position), mSuggestionsShownLogged);
             mSuggestionDismissHandler = new SuggestionDismissController(mContext,
-                holder.data, mSuggestionParser, mCallback);
+                    holder.data, mSuggestionParser, mCallback);
             holder.data.setAdapter(mSuggestionAdapter);
         } else {
             ConditionAdapter adapter = new ConditionAdapter(mContext,
-                (List<Condition>) mDashboardData.getItemEntityByPosition(position),
+                    (List<Condition>) mDashboardData.getItemEntityByPosition(position),
                     mDashboardData.getSuggestionConditionMode());
             adapter.addDismissHandling(holder.data);
             holder.data.setAdapter(adapter);
@@ -491,22 +474,44 @@
         }
     }
 
-    private void onBindCategory(DashboardItemHolder holder, DashboardCategory category) {
-        holder.title.setText(category.title);
+    private void tintIcons(DashboardCategory category, List<Tile> suggestions) {
+        if (!mDashboardFeatureProvider.shouldTintIcon()) {
+            return;
+        }
+        // TODO: Better place for tinting?
+        final TypedArray a = mContext.obtainStyledAttributes(new int[]{
+                android.R.attr.colorControlNormal});
+        final int tintColor = a.getColor(0, mContext.getColor(R.color.fallback_tintColor));
+        a.recycle();
+        if (category != null) {
+            for (Tile tile : category.tiles) {
+                if (tile.isIconTintable) {
+                    // If this drawable is tintable, tint it to match the color.
+                    tile.icon.setTint(tintColor);
+                }
+            }
+        }
+        if (suggestions != null) {
+            for (Tile suggestion : suggestions) {
+                if (suggestion.isIconTintable) {
+                    suggestion.icon.setTint(tintColor);
+                }
+            }
+        }
     }
 
     void onSaveInstanceState(Bundle outState) {
         final List<Tile> suggestions = mDashboardData.getSuggestions();
-        final List<DashboardCategory> categories = mDashboardData.getCategories();
+        final DashboardCategory category = mDashboardData.getCategory();
         if (suggestions != null) {
             outState.putParcelableArrayList(STATE_SUGGESTION_LIST, new ArrayList<>(suggestions));
         }
-        if (categories != null) {
-            outState.putParcelableArrayList(STATE_CATEGORY_LIST, new ArrayList<>(categories));
+        if (category != null) {
+            outState.putParcelable(STATE_CATEGORY_LIST, category);
         }
         outState.putStringArrayList(STATE_SUGGESTIONS_SHOWN_LOGGED, mSuggestionsShownLogged);
         outState.putInt(STATE_SUGGESTION_CONDITION_MODE,
-            mDashboardData.getSuggestionConditionMode());
+                mDashboardData.getSuggestionConditionMode());
     }
 
     private void updateConditionIcons(List<Icon> icons, ViewGroup parent) {
@@ -518,13 +523,18 @@
         parent.removeAllViews();
         for (int i = 1, size = icons.size(); i < size; i++) {
             ImageView icon = (ImageView) inflater.inflate(
-                R.layout.condition_header_icon, parent, false);
+                    R.layout.condition_header_icon, parent, false);
             icon.setImageIcon(icons.get(i));
             parent.addView(icon);
         }
         parent.setVisibility(View.VISIBLE);
     }
 
+    private Pair<Integer, Object>[] getSuggestionTaggedData() {
+        return SuggestionLogHelper.getSuggestionTaggedData(
+                mSuggestionFeatureProvider.isSmartSuggestionEnabled(mContext));
+    }
+
     public static class IconCache {
         private final Context mContext;
         private final ArrayMap<Icon, Drawable> mMap = new ArrayMap<>();
diff --git a/src/com/android/settings/dashboard/DashboardData.java b/src/com/android/settings/dashboard/DashboardData.java
index 8b04dfc..b9941c5 100644
--- a/src/com/android/settings/dashboard/DashboardData.java
+++ b/src/com/android/settings/dashboard/DashboardData.java
@@ -17,6 +17,7 @@
 
 import android.annotation.IntDef;
 import android.graphics.drawable.Icon;
+import android.support.annotation.VisibleForTesting;
 import android.support.v7.util.DiffUtil;
 import android.text.TextUtils;
 
@@ -29,6 +30,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Description about data list used in the DashboardAdapter. In the data list each item can be
@@ -41,34 +43,42 @@
     public static final int HEADER_MODE_SUGGESTION_EXPANDED = 1;
     public static final int HEADER_MODE_FULLY_EXPANDED = 2;
     public static final int HEADER_MODE_COLLAPSED = 3;
+
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({HEADER_MODE_DEFAULT, HEADER_MODE_SUGGESTION_EXPANDED, HEADER_MODE_FULLY_EXPANDED,
-        HEADER_MODE_COLLAPSED})
-    public @interface HeaderMode{}
+            HEADER_MODE_COLLAPSED})
+    public @interface HeaderMode {
+    }
 
     public static final int POSITION_NOT_FOUND = -1;
     public static final int DEFAULT_SUGGESTION_COUNT = 2;
 
-    // id namespace for different type of items.
-    private static final int NS_SPACER = 0;
-    private static final int NS_ITEMS = 2000;
-    private static final int NS_SUGGESTION_CONDITION = 3000;
+    // stable id for different type of items.
+    @VisibleForTesting
+    static final int STABLE_ID_SUGGESTION_CONDITION_TOP_HEADER = 0;
+    @VisibleForTesting
+    static final int STABLE_ID_SUGGESTION_CONDITION_MIDDLE_HEADER = 1;
+    @VisibleForTesting
+    static final int STABLE_ID_SUGGESTION_CONDITION_FOOTER = 2;
+    @VisibleForTesting
+    static final int STABLE_ID_SUGGESTION_CONTAINER = 3;
+    @VisibleForTesting
+    static final int STABLE_ID_CONDITION_CONTAINER = 4;
 
     private final List<Item> mItems;
-    private final List<DashboardCategory> mCategories;
+    private final DashboardCategory mCategory;
     private final List<Condition> mConditions;
     private final List<Tile> mSuggestions;
-    private final @HeaderMode int mSuggestionConditionMode;
-    private int mId;
+    @HeaderMode
+    private final int mSuggestionConditionMode;
 
     private DashboardData(Builder builder) {
-        mCategories = builder.mCategories;
+        mCategory = builder.mCategory;
         mConditions = builder.mConditions;
         mSuggestions = builder.mSuggestions;
         mSuggestionConditionMode = builder.mSuggestionConditionMode;
 
         mItems = new ArrayList<>();
-        mId = 0;
 
         buildItemsData();
     }
@@ -102,8 +112,8 @@
         return null;
     }
 
-    public List<DashboardCategory> getCategories() {
-        return mCategories;
+    public DashboardCategory getCategory() {
+        return mCategory;
     }
 
     public List<Condition> getConditions() {
@@ -185,33 +195,18 @@
         return suggestionSize;
     }
 
-    public boolean hasMoreSuggestions() {
-        return mSuggestionConditionMode == HEADER_MODE_COLLAPSED && mSuggestions.size() > 0
-                || mSuggestionConditionMode == HEADER_MODE_DEFAULT
-                && mSuggestions.size() > DEFAULT_SUGGESTION_COUNT;
-    }
-
-    private void resetCount() {
-        mId = 0;
-    }
-
     /**
-     * Count the item and add it into list when {@paramref add} is true.
+     * Add item into list when {@paramref add} is true.
      *
-     * Note that {@link #mId} will increment automatically and the real
-     * id stored in {@link Item} is shifted by {@paramref nameSpace}. This is a
-     * simple way to keep the id stable.
-     *
-     * @param object    maybe {@link Condition}, {@link Tile}, {@link DashboardCategory} or null
-     * @param type      type of the item, and value is the layout id
-     * @param add       flag about whether to add item into list
-     * @param nameSpace namespace based on the type
+     * @param item     maybe {@link Condition}, {@link Tile}, {@link DashboardCategory} or null
+     * @param type     type of the item, and value is the layout id
+     * @param stableId The stable id for this item
+     * @param add      flag about whether to add item into list
      */
-    private void countItem(Object object, int type, boolean add, int nameSpace) {
+    private void addToItemList(Object item, int type, int stableId, boolean add) {
         if (add) {
-            mItems.add(new Item(object, type, mId + nameSpace));
+            mItems.add(new Item(item, type, stableId));
         }
-        mId++;
     }
 
     /**
@@ -227,55 +222,59 @@
         final int hiddenSuggestion =
                 hasSuggestions ? sizeOf(mSuggestions) - sizeOf(suggestions) : 0;
 
-        resetCount();
-            /* Top suggestion/condition header. This will be present when there is any suggestion
-             * and the mode is collapsed, or it only has conditions and the mode is not fully
-             * expanded. */
-        countItem(new SuggestionConditionHeaderData(conditions, hiddenSuggestion),
-                R.layout.suggestion_condition_header,
-                        hasSuggestions && mSuggestionConditionMode == HEADER_MODE_COLLAPSED
-                        || !hasSuggestions && hasConditions
-                                && mSuggestionConditionMode != HEADER_MODE_FULLY_EXPANDED,
-                NS_SUGGESTION_CONDITION);
+        final boolean hasSuggestionAndCollapsed = hasSuggestions
+                && mSuggestionConditionMode == HEADER_MODE_COLLAPSED;
+        final boolean onlyHasConditionAndCollapsed = !hasSuggestions
+                && hasConditions
+                && mSuggestionConditionMode != HEADER_MODE_FULLY_EXPANDED;
 
-            /* Suggestion container. This is the card view that contains the list of suggestions.
-             * This will be added whenever the suggestion list is not empty */
-        countItem(suggestions, R.layout.suggestion_condition_container, sizeOf(suggestions) > 0,
-                NS_SUGGESTION_CONDITION);
-
-            /* Second suggestion/condition header. This will be added when there is at least one
-             * suggestion or condition that is not currently displayed, and the user can expand the
-              * section to view more items. */
-        countItem(new SuggestionConditionHeaderData(conditions, hiddenSuggestion),
+        /* Top suggestion/condition header. This will be present when there is any suggestion
+         * and the mode is collapsed */
+        addToItemList(new SuggestionConditionHeaderData(conditions, hiddenSuggestion),
                 R.layout.suggestion_condition_header,
+                STABLE_ID_SUGGESTION_CONDITION_TOP_HEADER, hasSuggestionAndCollapsed);
+
+        /* Use mid header if there is only condition & it's in collapsed mode */
+        addToItemList(new SuggestionConditionHeaderData(conditions, hiddenSuggestion),
+                R.layout.suggestion_condition_header,
+                STABLE_ID_SUGGESTION_CONDITION_MIDDLE_HEADER, onlyHasConditionAndCollapsed);
+
+        /* Suggestion container. This is the card view that contains the list of suggestions.
+         * This will be added whenever the suggestion list is not empty */
+        addToItemList(suggestions, R.layout.suggestion_condition_container,
+                STABLE_ID_SUGGESTION_CONTAINER, sizeOf(suggestions) > 0);
+
+        /* Second suggestion/condition header. This will be added when there is at least one
+         * suggestion or condition that is not currently displayed, and the user can expand the
+         * section to view more items. */
+        addToItemList(new SuggestionConditionHeaderData(conditions, hiddenSuggestion),
+                R.layout.suggestion_condition_header,
+                STABLE_ID_SUGGESTION_CONDITION_MIDDLE_HEADER,
                 mSuggestionConditionMode != HEADER_MODE_COLLAPSED
                         && mSuggestionConditionMode != HEADER_MODE_FULLY_EXPANDED
-                        && (hiddenSuggestion > 0
-                        || hasConditions && hasSuggestions),
-                NS_SUGGESTION_CONDITION);
+                        && (hiddenSuggestion > 0 || hasConditions && hasSuggestions));
 
             /* Condition container. This is the card view that contains the list of conditions.
              * This will be added whenever the condition list is not empty */
-        countItem(conditions, R.layout.suggestion_condition_container,
-                hasConditions && mSuggestionConditionMode == HEADER_MODE_FULLY_EXPANDED,
-                NS_SUGGESTION_CONDITION);
+        addToItemList(conditions, R.layout.suggestion_condition_container,
+                STABLE_ID_CONDITION_CONTAINER,
+                hasConditions && mSuggestionConditionMode == HEADER_MODE_FULLY_EXPANDED);
 
             /* Suggestion/condition footer. This will be present when the section is fully expanded
              * or when there is no conditions and no hidden suggestions */
-        countItem(null, R.layout.suggestion_condition_footer,
-                (hasConditions || hasSuggestions) &&
-                        mSuggestionConditionMode == HEADER_MODE_FULLY_EXPANDED
-                        || hasSuggestions && !hasConditions && hiddenSuggestion == 0,
-                NS_SUGGESTION_CONDITION);
+        addToItemList(null /* item */, R.layout.suggestion_condition_footer,
+                STABLE_ID_SUGGESTION_CONDITION_FOOTER,
+                (hasConditions || hasSuggestions)
+                        && mSuggestionConditionMode == HEADER_MODE_FULLY_EXPANDED
+                        || hasSuggestions
+                        && !hasConditions
+                        && hiddenSuggestion == 0);
 
-        resetCount();
-        for (int i = 0; mCategories != null && i < mCategories.size(); i++) {
-            DashboardCategory category = mCategories.get(i);
-            countItem(category, R.layout.dashboard_category,
-                    !TextUtils.isEmpty(category.title), NS_ITEMS);
-            for (int j = 0; j < category.tiles.size(); j++) {
-                Tile tile = category.tiles.get(j);
-                countItem(tile, R.layout.dashboard_tile, true, NS_ITEMS);
+        if(mCategory != null) {
+            for (int j = 0; j < mCategory.tiles.size(); j++) {
+                final Tile tile = mCategory.tiles.get(j);
+                addToItemList(tile, R.layout.dashboard_tile, Objects.hash(tile.title),
+                        true /* add */);
             }
         }
     }
@@ -316,9 +315,10 @@
      * {@link #mSuggestionConditionMode} have default value while others are not.
      */
     public static class Builder {
-        private @HeaderMode int mSuggestionConditionMode = HEADER_MODE_DEFAULT;
+        @HeaderMode
+        private int mSuggestionConditionMode = HEADER_MODE_DEFAULT;
 
-        private List<DashboardCategory> mCategories;
+        private DashboardCategory mCategory;
         private List<Condition> mConditions;
         private List<Tile> mSuggestions;
 
@@ -326,14 +326,14 @@
         }
 
         public Builder(DashboardData dashboardData) {
-            mCategories = dashboardData.mCategories;
+            mCategory = dashboardData.mCategory;
             mConditions = dashboardData.mConditions;
             mSuggestions = dashboardData.mSuggestions;
             mSuggestionConditionMode = dashboardData.mSuggestionConditionMode;
         }
 
-        public Builder setCategories(List<DashboardCategory> categories) {
-            this.mCategories = categories;
+        public Builder setCategory(DashboardCategory category) {
+            this.mCategory = category;
             return this;
         }
 
@@ -395,27 +395,27 @@
     /**
      * An item contains the data needed in the DashboardData.
      */
-    private static class Item {
+    static class Item {
         // valid types in field type
-        private static final int TYPE_DASHBOARD_CATEGORY = R.layout.dashboard_category;
         private static final int TYPE_DASHBOARD_TILE = R.layout.dashboard_tile;
         private static final int TYPE_SUGGESTION_CONDITION_CONTAINER =
-            R.layout.suggestion_condition_container;
+                R.layout.suggestion_condition_container;
         private static final int TYPE_SUGGESTION_CONDITION_HEADER =
-            R.layout.suggestion_condition_header;
+                R.layout.suggestion_condition_header;
         private static final int TYPE_SUGGESTION_CONDITION_FOOTER =
                 R.layout.suggestion_condition_footer;
         private static final int TYPE_DASHBOARD_SPACER = R.layout.dashboard_spacer;
 
-        @IntDef({TYPE_DASHBOARD_CATEGORY, TYPE_DASHBOARD_TILE, TYPE_SUGGESTION_CONDITION_CONTAINER,
+        @IntDef({TYPE_DASHBOARD_TILE, TYPE_SUGGESTION_CONDITION_CONTAINER,
                 TYPE_SUGGESTION_CONDITION_HEADER, TYPE_SUGGESTION_CONDITION_FOOTER,
                 TYPE_DASHBOARD_SPACER})
         @Retention(RetentionPolicy.SOURCE)
-        public @interface ItemTypes{}
+        public @interface ItemTypes {
+        }
 
         /**
-         * The main data object in item, usually is a {@link Tile}, {@link Condition} or
-         * {@link DashboardCategory} object. This object can also be null when the
+         * The main data object in item, usually is a {@link Tile}, {@link Condition}
+         * object. This object can also be null when the
          * item is an divider line. Please refer to {@link #buildItemsData()} for
          * detail usage of the Item.
          */
@@ -424,7 +424,8 @@
         /**
          * The type of item, value inside is the layout id(e.g. R.layout.dashboard_tile)
          */
-        public final @ItemTypes int type;
+        @ItemTypes
+        public final int type;
 
         /**
          * Id of this item, used in the {@link ItemsDataDiffCallback} to identify the same item.
@@ -439,6 +440,7 @@
 
         /**
          * Override it to make comparision in the {@link ItemsDataDiffCallback}
+         *
          * @param obj object to compared with
          * @return true if the same object or has equal value.
          */
@@ -458,10 +460,6 @@
             }
 
             switch (type) {
-                case TYPE_DASHBOARD_CATEGORY:
-                    // Only check title for dashboard category
-                    return TextUtils.equals(((DashboardCategory) entity).title,
-                            ((DashboardCategory) targetItem.entity).title);
                 case TYPE_DASHBOARD_TILE:
                     final Tile localTile = (Tile) entity;
                     final Tile targetTile = (Tile) targetItem.entity;
@@ -469,6 +467,17 @@
                     // Only check title and summary for dashboard tile
                     return TextUtils.equals(localTile.title, targetTile.title)
                             && TextUtils.equals(localTile.summary, targetTile.summary);
+                case TYPE_SUGGESTION_CONDITION_CONTAINER:
+                    // If entity is suggestion and contains remote view, force refresh
+                    final List entities = (List) entity;
+                    if (!entities.isEmpty()) {
+                        Object firstEntity = entities.get(0);
+                        if (firstEntity instanceof Tile
+                                && ((Tile) firstEntity).remoteViews != null) {
+                            return false;
+                        }
+                    }
+                    // Otherwise Fall through to default
                 default:
                     return entity == null ? targetItem.entity == null
                             : entity.equals(targetItem.entity);
diff --git a/src/com/android/settings/dashboard/DashboardDecorator.java b/src/com/android/settings/dashboard/DashboardDecorator.java
deleted file mode 100644
index 6466c0b..0000000
--- a/src/com/android/settings/dashboard/DashboardDecorator.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package com.android.settings.dashboard;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.drawable.Drawable;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.State;
-import android.support.v7.widget.RecyclerView.ViewHolder;
-import android.util.TypedValue;
-import android.view.View;
-import com.android.settings.R;
-
-public class DashboardDecorator extends RecyclerView.ItemDecoration {
-
-    private final Context mContext;
-    private final Drawable mDivider;
-
-    public DashboardDecorator(Context context) {
-        mContext = context;
-        TypedValue value = new TypedValue();
-        mContext.getTheme().resolveAttribute(android.R.attr.listDivider, value, true);
-        mDivider = mContext.getDrawable(value.resourceId);
-    }
-
-    @Override
-    public void onDrawOver(Canvas c, RecyclerView parent, State state) {
-        final int childCount = parent.getChildCount();
-        for (int i = 1; i < childCount; i++) {
-            final View child = parent.getChildAt(i);
-            final ViewHolder holder = parent.getChildViewHolder(child);
-            if (holder.getItemViewType() == R.layout.dashboard_category
-                    && parent.getChildViewHolder(parent.getChildAt(i - 1)).getItemViewType()
-                        == R.layout.dashboard_tile) {
-                int top = getChildTop(child);
-                mDivider.setBounds(child.getLeft(), top, child.getRight(),
-                        top + mDivider.getIntrinsicHeight());
-                mDivider.draw(c);
-            }
-        }
-    }
-
-    private int getChildTop(View child) {
-        final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child
-                .getLayoutParams();
-        return child.getTop() + params.topMargin + Math.round(ViewCompat.getTranslationY(child));
-    }
-}
diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java
index 3687929..8c3ac0d 100644
--- a/src/com/android/settings/dashboard/DashboardFragment.java
+++ b/src/com/android/settings/dashboard/DashboardFragment.java
@@ -32,12 +32,13 @@
 import android.view.ViewGroup;
 
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.drawer.DashboardCategory;
 import com.android.settingslib.drawer.SettingsDrawerActivity;
 import com.android.settingslib.drawer.Tile;
+import com.android.settingslib.drawer.TileUtils;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -53,7 +54,7 @@
         SummaryLoader.SummaryConsumer {
     private static final String TAG = "DashboardFragment";
 
-    private final Map<Class, PreferenceController> mPreferenceControllers =
+    private final Map<Class, AbstractPreferenceController> mPreferenceControllers =
             new ArrayMap<>();
     private final Set<String> mDashboardTilePrefKeys = new ArraySet<>();
 
@@ -72,14 +73,14 @@
                 .getProgressiveDisclosureMixin(context, this, getArguments());
         getLifecycle().addObserver(mProgressiveDisclosureMixin);
 
-        List<PreferenceController> controllers = getPreferenceControllers(context);
+        List<AbstractPreferenceController> controllers = getPreferenceControllers(context);
         if (controllers == null) {
             controllers = new ArrayList<>();
         }
         mPlaceholderPreferenceController =
                 new DashboardTilePlaceholderPreferenceController(context);
         controllers.add(mPlaceholderPreferenceController);
-        for (PreferenceController controller : controllers) {
+        for (AbstractPreferenceController controller : controllers) {
             addPreferenceController(controller);
         }
     }
@@ -90,6 +91,9 @@
         // Set ComparisonCallback so we get better animation when list changes.
         getPreferenceManager().setPreferenceComparisonCallback(
                 new PreferenceManager.SimplePreferenceComparisonCallback());
+        // Upon rotation configuration change we need to update preference states before any
+        // editing dialog is recreated (that would happen before onResume is called).
+        updatePreferenceStates();
     }
 
     @Override
@@ -156,12 +160,12 @@
 
     @Override
     public boolean onPreferenceTreeClick(Preference preference) {
-        Collection<PreferenceController> controllers = mPreferenceControllers.values();
+        Collection<AbstractPreferenceController> controllers = mPreferenceControllers.values();
         // If preference contains intent, log it before handling.
         mMetricsFeatureProvider.logDashboardStartIntent(
                 getContext(), preference.getIntent(), getMetricsCategory());
         // Give all controllers a chance to handle click.
-        for (PreferenceController controller : controllers) {
+        for (AbstractPreferenceController controller : controllers) {
             if (controller.handlePreferenceTreeClick(preference)) {
                 return true;
             }
@@ -185,12 +189,12 @@
         }
     }
 
-    protected <T extends PreferenceController> T getPreferenceController(Class<T> clazz) {
-        PreferenceController controller = mPreferenceControllers.get(clazz);
+    protected <T extends AbstractPreferenceController> T getPreferenceController(Class<T> clazz) {
+        AbstractPreferenceController controller = mPreferenceControllers.get(clazz);
         return (T) controller;
     }
 
-    protected void addPreferenceController(PreferenceController controller) {
+    protected void addPreferenceController(AbstractPreferenceController controller) {
         mPreferenceControllers.put(controller.getClass(), controller);
     }
 
@@ -213,9 +217,9 @@
     protected abstract int getPreferenceScreenResId();
 
     /**
-     * Get a list of {@link PreferenceController} for this fragment.
+     * Get a list of {@link AbstractPreferenceController} for this fragment.
      */
-    protected abstract List<PreferenceController> getPreferenceControllers(Context context);
+    protected abstract List<AbstractPreferenceController> getPreferenceControllers(Context context);
 
     /**
      * Returns true if this tile should be displayed
@@ -224,6 +228,23 @@
         return true;
     }
 
+    @VisibleForTesting
+    boolean tintTileIcon(Tile tile) {
+        if (tile.icon == null) {
+            return false;
+        }
+        // First check if the tile has set the icon tintable metadata.
+        final Bundle metadata = tile.metaData;
+        if (metadata != null
+                && metadata.containsKey(TileUtils.META_DATA_PREFERENCE_ICON_TINTABLE)) {
+            return metadata.getBoolean(TileUtils.META_DATA_PREFERENCE_ICON_TINTABLE);
+        }
+        final String pkgName = getContext().getPackageName();
+        // If this drawable is coming from outside Settings, tint it to match the color.
+        return pkgName != null && tile.intent != null
+                && !pkgName.equals(tile.intent.getComponent().getPackageName());
+    }
+
     /**
      * Displays resource based tiles.
      */
@@ -234,8 +255,8 @@
         }
         addPreferencesFromResource(resId);
         final PreferenceScreen screen = getPreferenceScreen();
-        Collection<PreferenceController> controllers = mPreferenceControllers.values();
-        for (PreferenceController controller : controllers) {
+        Collection<AbstractPreferenceController> controllers = mPreferenceControllers.values();
+        for (AbstractPreferenceController controller : controllers) {
             controller.displayPreference(screen);
         }
     }
@@ -244,9 +265,9 @@
      * Update state of each preference managed by PreferenceController.
      */
     protected void updatePreferenceStates() {
-        Collection<PreferenceController> controllers = mPreferenceControllers.values();
+        Collection<AbstractPreferenceController> controllers = mPreferenceControllers.values();
         final PreferenceScreen screen = getPreferenceScreen();
-        for (PreferenceController controller : controllers) {
+        for (AbstractPreferenceController controller : controllers) {
             if (!controller.isAvailable()) {
                 continue;
             }
@@ -312,7 +333,6 @@
                 android.R.attr.colorControlNormal});
         final int tintColor = a.getColor(0, context.getColor(android.R.color.white));
         a.recycle();
-        final String pkgName = context.getPackageName();
         // Install dashboard tiles.
         for (Tile tile : tiles) {
             final String key = mDashboardFeatureProvider.getDashboardKeyForTile(tile);
@@ -323,9 +343,7 @@
             if (!displayTile(tile)) {
                 continue;
             }
-            if (pkgName != null && tile.intent != null
-                    && !pkgName.equals(tile.intent.getComponent().getPackageName())) {
-                // If this drawable is coming from outside Settings, tint it to match the color.
+            if (tintTileIcon(tile)) {
                 tile.icon.setTint(tintColor);
             }
             if (mDashboardTilePrefKeys.contains(key)) {
diff --git a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
index f852544..fddd522 100644
--- a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
+++ b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
@@ -22,8 +22,8 @@
 import com.android.settings.SecuritySettings;
 import com.android.settings.accounts.AccountDetailDashboardFragment;
 import com.android.settings.accounts.UserAndAccountDashboardFragment;
-import com.android.settings.applications.AdvancedAppSettings;
 import com.android.settings.applications.AppAndNotificationDashboardFragment;
+import com.android.settings.applications.DefaultAppSettings;
 import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
 import com.android.settings.development.DevelopmentSettings;
 import com.android.settings.deviceinfo.StorageDashboardFragment;
@@ -65,7 +65,7 @@
                 CategoryKey.CATEGORY_APPS);
         PARENT_TO_CATEGORY_KEY_MAP.put(PowerUsageSummary.class.getName(),
                 CategoryKey.CATEGORY_BATTERY);
-        PARENT_TO_CATEGORY_KEY_MAP.put(AdvancedAppSettings.class.getName(),
+        PARENT_TO_CATEGORY_KEY_MAP.put(DefaultAppSettings.class.getName(),
                 CategoryKey.CATEGORY_APPS_DEFAULT);
         PARENT_TO_CATEGORY_KEY_MAP.put(DisplaySettings.class.getName(),
                 CategoryKey.CATEGORY_DISPLAY);
@@ -76,7 +76,7 @@
         PARENT_TO_CATEGORY_KEY_MAP.put(SecuritySettings.class.getName(),
                 CategoryKey.CATEGORY_SECURITY);
         PARENT_TO_CATEGORY_KEY_MAP.put(AccountDetailDashboardFragment.class.getName(),
-                CategoryKey.CATEGORY_ACCOUNT);
+                CategoryKey.CATEGORY_ACCOUNT_DETAIL);
         PARENT_TO_CATEGORY_KEY_MAP.put(UserAndAccountDashboardFragment.class.getName(),
                 CategoryKey.CATEGORY_ACCOUNT);
         PARENT_TO_CATEGORY_KEY_MAP.put(
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index 4a53a7c..be5fbdf 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -75,6 +75,7 @@
     private DashboardFeatureProvider mDashboardFeatureProvider;
     private SuggestionFeatureProvider mSuggestionFeatureProvider;
     private boolean isOnCategoriesChangedCalled;
+    private boolean mOnConditionsChangedCalled;
 
     @Override
     public int getMetricsCategory() {
@@ -95,9 +96,11 @@
 
         mConditionManager = ConditionManager.get(activity, false);
         getLifecycle().addObserver(mConditionManager);
-        mSuggestionParser = new SuggestionParser(activity,
-                mSuggestionFeatureProvider.getSharedPrefs(activity), R.xml.suggestion_ordering);
-        mSuggestionsChecks = new SuggestionsChecks(getContext());
+        if (mSuggestionFeatureProvider.isSuggestionEnabled(activity)) {
+            mSuggestionParser = new SuggestionParser(activity,
+                    mSuggestionFeatureProvider.getSharedPrefs(activity), R.xml.suggestion_ordering);
+            mSuggestionsChecks = new SuggestionsChecks(getContext());
+        }
         if (DEBUG_TIMING) {
             Log.d(TAG, "onCreate took " + (System.currentTimeMillis() - startTime)
                     + " ms");
@@ -191,7 +194,6 @@
         }
         mDashboard.setLayoutManager(mLayoutManager);
         mDashboard.setHasFixedSize(true);
-        mDashboard.addItemDecoration(new DashboardDecorator(getContext()));
         mDashboard.setListener(this);
         mAdapter = new DashboardAdapter(getContext(), bundle, mConditionManager.getConditions(),
             mSuggestionParser, this /* SuggestionDismissController.Callback */);
@@ -210,11 +212,16 @@
 
     @VisibleForTesting
     void rebuildUI() {
-        new SuggestionLoader().execute();
-        // Set categories on their own if loading suggestions takes too long.
-        mHandler.postDelayed(() -> {
+        if (!mSuggestionFeatureProvider.isSuggestionEnabled(getContext())) {
+            Log.d(TAG, "Suggestion feature is disabled, skipping suggestion entirely");
             updateCategoryAndSuggestion(null /* tiles */);
-        }, MAX_WAIT_MILLIS);
+        } else {
+            new SuggestionLoader().execute();
+            // Set categories on their own if loading suggestions takes too long.
+            mHandler.postDelayed(() -> {
+                updateCategoryAndSuggestion(null /* tiles */);
+            }, MAX_WAIT_MILLIS);
+        }
     }
 
     @Override
@@ -231,10 +238,21 @@
     @Override
     public void onConditionsChanged() {
         Log.d(TAG, "onConditionsChanged");
-        final boolean scrollToTop = mLayoutManager.findFirstCompletelyVisibleItemPosition() <= 1;
-        mAdapter.setConditions(mConditionManager.getConditions());
-        if (scrollToTop) {
-            mDashboard.scrollToPosition(0);
+        // Bypass refreshing the conditions on the first call of onConditionsChanged.
+        // onConditionsChanged is called immediately everytime we start listening to the conditions
+        // change when we gain window focus. Since the conditions are passed to the adapter's
+        // constructor when we create the view, the first handling is not necessary.
+        // But, on the subsequent calls we need to handle it because there might be real changes to
+        // conditions.
+        if (mOnConditionsChangedCalled) {
+            final boolean scrollToTop =
+                    mLayoutManager.findFirstCompletelyVisibleItemPosition() <= 1;
+            mAdapter.setConditions(mConditionManager.getConditions());
+            if (scrollToTop) {
+                mDashboard.scrollToPosition(0);
+            }
+        } else {
+            mOnConditionsChangedCalled = true;
         }
     }
 
@@ -293,15 +311,14 @@
             return;
         }
 
-        // Temporary hack to wrap homepage category into a list. Soon we will create adapter
-        // API that takes a single category.
-        List<DashboardCategory> categories = new ArrayList<>();
-        categories.add(mDashboardFeatureProvider.getTilesForCategory(
-                CategoryKey.CATEGORY_HOMEPAGE));
+        final DashboardCategory category = mDashboardFeatureProvider.getTilesForCategory(
+                CategoryKey.CATEGORY_HOMEPAGE);
+        mSummaryLoader.updateSummaryToCache(category);
         if (suggestions != null) {
-            mAdapter.setCategoriesAndSuggestions(categories, suggestions);
+            mAdapter.setCategoriesAndSuggestions(category, suggestions);
         } else {
-            mAdapter.setCategory(categories);
+            mAdapter.setCategory(category);
         }
     }
+
 }
diff --git a/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java b/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java
index eb99fb3..97a5c35 100644
--- a/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java
+++ b/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java
@@ -20,7 +20,8 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 /**
  * PreferenceController for a dashboard_tile_placeholder, a special preference marking where
@@ -28,7 +29,8 @@
  * preference screen in xml. If not present, all dynamic dashboard tiles will be added to the
  * bottom of page.
  */
-class DashboardTilePlaceholderPreferenceController extends PreferenceController {
+class DashboardTilePlaceholderPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
 
     private static final String KEY_PLACEHOLDER = "dashboard_tile_placeholder";
 
diff --git a/src/com/android/settings/dashboard/RestrictedDashboardFragment.java b/src/com/android/settings/dashboard/RestrictedDashboardFragment.java
index c2176d7..99aaff4 100644
--- a/src/com/android/settings/dashboard/RestrictedDashboardFragment.java
+++ b/src/com/android/settings/dashboard/RestrictedDashboardFragment.java
@@ -49,7 +49,7 @@
  *
  * This fragment is a replacement of {@link RestrictedSettingsFragment} but extends
  * from {@link DashboardFragment}, so we could also use
- * {@link com.android.settings.core.PreferenceController} in this fragment.
+ * {@link com.android.settingslib.core.AbstractPreferenceController} in this fragment.
  */
 public abstract class RestrictedDashboardFragment extends DashboardFragment {
 
diff --git a/src/com/android/settings/dashboard/SummaryLoader.java b/src/com/android/settings/dashboard/SummaryLoader.java
index df21168..4586a55 100644
--- a/src/com/android/settings/dashboard/SummaryLoader.java
+++ b/src/com/android/settings/dashboard/SummaryLoader.java
@@ -34,7 +34,6 @@
 import com.android.settings.SettingsActivity;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.drawer.DashboardCategory;
-import com.android.settingslib.drawer.SettingsDrawerActivity;
 import com.android.settingslib.drawer.Tile;
 
 import java.lang.reflect.Field;
@@ -47,7 +46,8 @@
     public static final String SUMMARY_PROVIDER_FACTORY = "SUMMARY_PROVIDER_FACTORY";
 
     private final Activity mActivity;
-    private final ArrayMap<SummaryProvider, ComponentName> mSummaryMap = new ArrayMap<>();
+    private final ArrayMap<SummaryProvider, ComponentName> mSummaryProviderMap = new ArrayMap<>();
+    private final ArrayMap<String, CharSequence> mSummaryTextMap = new ArrayMap<>();
     private final DashboardFeatureProvider mDashboardFeatureProvider;
     private final String mCategoryKey;
 
@@ -111,13 +111,13 @@
     }
 
     public void setSummary(SummaryProvider provider, final CharSequence summary) {
-        final ComponentName component = mSummaryMap.get(provider);
+        final ComponentName component = mSummaryProviderMap.get(provider);
         mHandler.post(new Runnable() {
             @Override
             public void run() {
 
                 final Tile tile = getTileFromCategory(
-                    mDashboardFeatureProvider.getTilesForCategory(mCategoryKey), component);
+                        mDashboardFeatureProvider.getTilesForCategory(mCategoryKey), component);
 
                 if (tile == null) {
                     if (DEBUG) {
@@ -142,6 +142,7 @@
             }
             return;
         }
+        mSummaryTextMap.put(mDashboardFeatureProvider.getDashboardKeyForTile(tile), summary);
         tile.summary = summary;
         if (mSummaryConsumer != null) {
             mSummaryConsumer.notifySummaryChanged(tile);
@@ -223,11 +224,27 @@
         });
     }
 
+    /**
+     * Updates all tile's summary to latest cached version. This is necessary to handle the case
+     * where category is updated after summary change.
+     */
+    public void updateSummaryToCache(DashboardCategory category) {
+        if (category == null) {
+            return;
+        }
+        for (Tile tile : category.tiles) {
+            final String key = mDashboardFeatureProvider.getDashboardKeyForTile(tile);
+            if (mSummaryTextMap.containsKey(key)) {
+                tile.summary = mSummaryTextMap.get(key);
+            }
+        }
+    }
+
     private synchronized void setListeningW(boolean listening) {
         if (mWorkerListening == listening) return;
         mWorkerListening = listening;
         if (DEBUG) Log.d(TAG, "Listening " + listening);
-        for (SummaryProvider p : mSummaryMap.keySet()) {
+        for (SummaryProvider p : mSummaryProviderMap.keySet()) {
             try {
                 p.setListening(listening);
             } catch (Exception e) {
@@ -240,28 +257,10 @@
         SummaryProvider provider = getSummaryProvider(tile);
         if (provider != null) {
             if (DEBUG) Log.d(TAG, "Creating " + tile);
-            mSummaryMap.put(provider, tile.intent.getComponent());
+            mSummaryProviderMap.put(provider, tile.intent.getComponent());
         }
     }
 
-    private Tile getTileFromCategory(List<DashboardCategory> categories, ComponentName component) {
-        if (categories == null) {
-            if (DEBUG) {
-                Log.d(TAG, "Category is null, can't find tile");
-            }
-            return null;
-        }
-        final int categorySize = categories.size();
-        for (int i = 0; i < categorySize; i++) {
-            final DashboardCategory category = categories.get(i);
-            final Tile tile = getTileFromCategory(category, component);
-            if (tile != null) {
-                return tile;
-            }
-        }
-        return null;
-    }
-
     private Tile getTileFromCategory(DashboardCategory category, ComponentName component) {
         if (category == null || category.tiles == null) {
             return null;
@@ -276,6 +275,8 @@
         return null;
     }
 
+
+
     public interface SummaryProvider {
         void setListening(boolean listening);
     }
diff --git a/src/com/android/settings/dashboard/suggestions/EventStore.java b/src/com/android/settings/dashboard/suggestions/EventStore.java
index 43ed65b..cc3872e 100644
--- a/src/com/android/settings/dashboard/suggestions/EventStore.java
+++ b/src/com/android/settings/dashboard/suggestions/EventStore.java
@@ -82,7 +82,7 @@
     }
 
     private void writePref(String prefKey, long value) {
-        mSharedPrefs.edit().putLong(prefKey, value).commit();
+        mSharedPrefs.edit().putLong(prefKey, value).apply();
     }
 
     private long readPref(String prefKey, Long defaultValue) {
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
index 4539680..9182945 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
@@ -18,6 +18,7 @@
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
+import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -29,6 +30,7 @@
 import com.android.settings.dashboard.DashboardAdapter.IconCache;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.drawer.Tile;
+
 import java.util.List;
 import java.util.Objects;
 
@@ -65,11 +67,12 @@
     public void onBindViewHolder(DashboardItemHolder holder, int position) {
         final Tile suggestion = (Tile) mSuggestions.get(position);
         final String suggestionId = mSuggestionFeatureProvider.getSuggestionIdentifier(
-            mContext, suggestion);
+                mContext, suggestion);
         // This is for cases when a suggestion is dismissed and the next one comes to view
         if (!mSuggestionsShownLogged.contains(suggestionId)) {
             mMetricsFeatureProvider.action(
-                mContext, MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION, suggestionId);
+                    mContext, MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION, suggestionId,
+                    getSuggestionTaggedData());
             mSuggestionsShownLogged.add(suggestionId);
         }
         if (suggestion.remoteViews != null) {
@@ -96,12 +99,12 @@
         final View primaryAction = holder.itemView.findViewById(android.R.id.primary);
         if (primaryAction != null) {
             clickHandler = primaryAction;
-            // set the item view to disabled to remove any touch effects
-            holder.itemView.setEnabled(false);
         }
+
         clickHandler.setOnClickListener(v -> {
             mMetricsFeatureProvider.action(mContext,
-                MetricsEvent.ACTION_SETTINGS_SUGGESTION, suggestionId);
+                    MetricsEvent.ACTION_SETTINGS_SUGGESTION, suggestionId,
+                    getSuggestionTaggedData());
             ((SettingsActivity) mContext).startSuggestion(suggestion.intent);
         });
     }
@@ -126,7 +129,7 @@
 
     public Tile getSuggestion(int position) {
         final long itemId = getItemId(position);
-        for (Tile tile: mSuggestions) {
+        for (Tile tile : mSuggestions) {
             if (Objects.hash(tile.title) == itemId) {
                 return tile;
             }
@@ -138,4 +141,10 @@
         mSuggestions.remove(suggestion);
         notifyDataSetChanged();
     }
+
+    private Pair<Integer, Object>[] getSuggestionTaggedData() {
+        return SuggestionLogHelper.getSuggestionTaggedData(
+                mSuggestionFeatureProvider.isSmartSuggestionEnabled(mContext));
+    }
+
 }
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
index 5dc8892..d19a778 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
@@ -30,6 +30,11 @@
 public interface SuggestionFeatureProvider {
 
     /**
+     * Whether or not the whole suggestion feature is enabled.
+     */
+    boolean isSuggestionEnabled(Context context);
+
+    /**
      * Returns true if smart suggestion should be used instead of xml based SuggestionParser.
      */
     boolean isSmartSuggestionEnabled(Context context);
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
index 2171c2a..347e165 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
@@ -16,20 +16,24 @@
 
 package com.android.settings.dashboard.suggestions;
 
+import android.app.ActivityManager;
 import android.content.ComponentName;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.os.UserHandle;
-import android.provider.Settings;
+import android.provider.Settings.Secure;
 import android.support.annotation.NonNull;
+import android.support.annotation.VisibleForTesting;
 import android.util.Log;
+import android.util.Pair;
 
-import com.android.internal.logging.nano.MetricsProto;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.Settings.AmbientDisplayPickupSuggestionActivity;
 import com.android.settings.Settings.AmbientDisplaySuggestionActivity;
 import com.android.settings.Settings.DoubleTapPowerSuggestionActivity;
 import com.android.settings.Settings.DoubleTwistSuggestionActivity;
+import com.android.settings.Settings.NightDisplaySuggestionActivity;
 import com.android.settings.Settings.SwipeToNotificationSuggestionActivity;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.gestures.DoubleTapPowerPreferenceController;
@@ -42,6 +46,7 @@
 import com.android.settingslib.drawer.Tile;
 import com.android.settingslib.suggestions.SuggestionParser;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class SuggestionFeatureProviderImpl implements SuggestionFeatureProvider {
@@ -55,6 +60,13 @@
     private final MetricsFeatureProvider mMetricsFeatureProvider;
 
     @Override
+    public boolean isSuggestionEnabled(Context context) {
+        final ActivityManager am =
+                (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+        return !am.isLowRamDevice();
+    }
+
+    @Override
     public boolean isSmartSuggestionEnabled(Context context) {
         return false;
     }
@@ -62,6 +74,9 @@
     @Override
     public boolean isSuggestionCompleted(Context context, @NonNull ComponentName component) {
         final String className = component.getClassName();
+        if (className.equals(NightDisplaySuggestionActivity.class.getName())) {
+            return hasUsedNightDisplay(context);
+        }
         if (className.equals(NewDeviceIntroSuggestionActivity.class.getName())) {
             return NewDeviceIntroSuggestionActivity.isSuggestionComplete(context);
         } else if (className.equals(DoubleTapPowerSuggestionActivity.class.getName())) {
@@ -117,12 +132,14 @@
         if (parser == null || suggestion == null || context == null) {
             return;
         }
-        mMetricsFeatureProvider.action(
-                context, MetricsProto.MetricsEvent.ACTION_SETTINGS_DISMISS_SUGGESTION,
-                getSuggestionIdentifier(context, suggestion));
+        final Pair<Integer, Object>[] taggedData =
+                SuggestionLogHelper.getSuggestionTaggedData(isSmartSuggestionEnabled(context));
 
-        final boolean isSmartSuggestionEnabled = isSmartSuggestionEnabled(context);
-        if (!parser.dismissSuggestion(suggestion, isSmartSuggestionEnabled)) {
+        mMetricsFeatureProvider.action(
+                context, MetricsEvent.ACTION_SETTINGS_DISMISS_SUGGESTION,
+                getSuggestionIdentifier(context, suggestion),
+                taggedData);
+        if (!parser.dismissSuggestion(suggestion)) {
             return;
         }
         context.getPackageManager().setComponentEnabledSetting(
@@ -146,4 +163,10 @@
         return packageName;
     }
 
+    @VisibleForTesting
+    boolean hasUsedNightDisplay(Context context) {
+        final ContentResolver cr = context.getContentResolver();
+        return Secure.getInt(cr, Secure.NIGHT_DISPLAY_AUTO_MODE, 0) != 0
+                || Secure.getString(cr, Secure.NIGHT_DISPLAY_LAST_ACTIVATED_TIME) != null;
+    }
 }
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionLogHelper.java b/src/com/android/settings/dashboard/suggestions/SuggestionLogHelper.java
new file mode 100644
index 0000000..339392f
--- /dev/null
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionLogHelper.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.dashboard.suggestions;
+
+import android.util.Pair;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+
+public class SuggestionLogHelper {
+
+    public static Pair<Integer, Object>[] getSuggestionTaggedData(boolean enabled) {
+        return new Pair[]{
+                Pair.create(
+                        MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, enabled ? 1 : 0)};
+    }
+}
diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java
index d9643f2..36d9d0f 100644
--- a/src/com/android/settings/datausage/AppDataUsage.java
+++ b/src/com/android/settings/datausage/AppDataUsage.java
@@ -14,6 +14,8 @@
 
 package com.android.settings.datausage;
 
+import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
+
 import android.app.Activity;
 import android.app.LoaderManager;
 import android.content.Context;
@@ -30,6 +32,7 @@
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.os.UserHandle;
+import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
@@ -52,8 +55,6 @@
 import com.android.settingslib.net.UidDetail;
 import com.android.settingslib.net.UidDetailProvider;
 
-import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
-
 public class AppDataUsage extends DataUsageBase implements Preference.OnPreferenceChangeListener,
         DataSaverBackend.Listener {
 
@@ -117,8 +118,8 @@
                 : null;
         if (mTemplate == null) {
             Context context = getContext();
-            mTemplate = DataUsageSummary.getDefaultTemplate(context,
-                    DataUsageSummary.getDefaultSubscriptionId(context));
+            mTemplate = DataUsageUtils.getDefaultTemplate(context,
+                    DataUsageUtils.getDefaultSubscriptionId(context));
         }
         if (mAppItem == null) {
             int uid = (args != null) ? args.getInt(AppInfoBase.ARG_PACKAGE_UID, -1)
@@ -235,6 +236,7 @@
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         if (preference == mRestrictBackground) {
             mDataSaverBackend.setIsBlacklisted(mAppItem.key, mPackageName, !(Boolean) newValue);
+            updatePrefs();
             return true;
         } else if (preference == mUnrestrictedData) {
             mDataSaverBackend.setIsWhitelisted(mAppItem.key, mPackageName, (Boolean) newValue);
@@ -254,7 +256,8 @@
         return super.onPreferenceTreeClick(preference);
     }
 
-    private void updatePrefs() {
+    @VisibleForTesting
+    void updatePrefs() {
         updatePrefs(getAppRestrictBackground(), getUnrestrictData());
     }
 
@@ -338,9 +341,8 @@
                 .newInstance(activity, this, null /* header */)
                 .setRecyclerView(getListView(), getLifecycle())
                 .setUid(uid)
-                .setButtonActions(showInfoButton
-                                ? EntityHeaderController.ActionType.ACTION_APP_INFO
-                                : EntityHeaderController.ActionType.ACTION_NONE,
+                .setHasAppInfoLink(showInfoButton)
+                .setButtonActions(EntityHeaderController.ActionType.ACTION_NONE,
                         EntityHeaderController.ActionType.ACTION_NONE)
                 .setIcon(mIcon)
                 .setLabel(mLabel)
diff --git a/src/com/android/settings/datausage/BillingCyclePreference.java b/src/com/android/settings/datausage/BillingCyclePreference.java
index beb0ba1..202dc80 100644
--- a/src/com/android/settings/datausage/BillingCyclePreference.java
+++ b/src/com/android/settings/datausage/BillingCyclePreference.java
@@ -14,9 +14,10 @@
 
 package com.android.settings.datausage;
 
+import static android.net.NetworkPolicy.CYCLE_NONE;
+
 import android.content.Context;
 import android.content.Intent;
-import android.net.NetworkPolicy;
 import android.net.NetworkTemplate;
 import android.os.Bundle;
 import android.os.RemoteException;
@@ -32,7 +33,6 @@
 
     private NetworkTemplate mTemplate;
     private NetworkServices mServices;
-    private NetworkPolicy mPolicy;
     private int mSubId;
 
     public BillingCyclePreference(Context context, AttributeSet attrs) {
@@ -57,16 +57,18 @@
         mTemplate = template;
         mSubId = subId;
         mServices = services;
-        mPolicy = services.mPolicyEditor.getPolicy(mTemplate);
-        setSummary(getContext().getString(R.string.billing_cycle_fragment_summary, mPolicy != null
-                ? mPolicy.cycleDay
-                : "1"));
+        final int cycleDay = services.mPolicyEditor.getPolicyCycleDay(mTemplate);
+        if (cycleDay != CYCLE_NONE) {
+            setSummary(getContext().getString(R.string.billing_cycle_fragment_summary, cycleDay));
+        } else {
+            setSummary(null);
+        }
         setIntent(getIntent());
     }
 
     private void updateEnabled() {
         try {
-            setEnabled(mPolicy != null && mServices.mNetworkService.isBandwidthControlEnabled()
+            setEnabled(mServices.mNetworkService.isBandwidthControlEnabled()
                     && mServices.mTelephonyManager.getDataEnabled(mSubId)
                     && mServices.mUserManager.isAdminUser());
         } catch (RemoteException e) {
diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java
index 61ca09f..fb8119c 100644
--- a/src/com/android/settings/datausage/BillingCycleSettings.java
+++ b/src/com/android/settings/datausage/BillingCycleSettings.java
@@ -14,13 +14,18 @@
 
 package com.android.settings.datausage;
 
+import static android.net.NetworkPolicy.CYCLE_NONE;
+import static android.net.NetworkPolicy.LIMIT_DISABLED;
+import static android.net.NetworkPolicy.WARNING_DISABLED;
+
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.DialogFragment;
 import android.app.Fragment;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.Resources;
+import android.icu.text.MeasureFormat;
+import android.icu.util.MeasureUnit;
 import android.net.NetworkPolicy;
 import android.net.NetworkTemplate;
 import android.os.Bundle;
@@ -31,6 +36,7 @@
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.NumberPicker;
 import android.widget.Spinner;
@@ -42,9 +48,6 @@
 import com.android.settingslib.NetworkPolicyEditor;
 import com.android.settingslib.net.DataUsageController;
 
-import static android.net.NetworkPolicy.LIMIT_DISABLED;
-import static android.net.NetworkPolicy.WARNING_DISABLED;
-
 public class BillingCycleSettings extends DataUsageBase implements
         Preference.OnPreferenceChangeListener, DataUsageEditController {
 
@@ -100,11 +103,15 @@
     }
 
     private void updatePrefs() {
-        NetworkPolicy policy = services.mPolicyEditor.getPolicy(mNetworkTemplate);
-        mBillingCycle.setSummary(getString(R.string.billing_cycle_fragment_summary, policy != null ?
-                policy.cycleDay : 1));
-        if (policy != null && policy.warningBytes != WARNING_DISABLED) {
-            mDataWarning.setSummary(Formatter.formatFileSize(getContext(), policy.warningBytes));
+        final int cycleDay = services.mPolicyEditor.getPolicyCycleDay(mNetworkTemplate);
+        if (cycleDay != CYCLE_NONE) {
+            mBillingCycle.setSummary(getString(R.string.billing_cycle_fragment_summary, cycleDay));
+        } else {
+            mBillingCycle.setSummary(null);
+        }
+        final long warningBytes = services.mPolicyEditor.getPolicyWarningBytes(mNetworkTemplate);
+        if (warningBytes != WARNING_DISABLED) {
+            mDataWarning.setSummary(Formatter.formatFileSize(getContext(), warningBytes));
             mDataWarning.setEnabled(true);
             mEnableDataWarning.setChecked(true);
         } else {
@@ -112,8 +119,9 @@
             mDataWarning.setEnabled(false);
             mEnableDataWarning.setChecked(false);
         }
-        if (policy != null && policy.limitBytes != LIMIT_DISABLED) {
-            mDataLimit.setSummary(Formatter.formatFileSize(getContext(), policy.limitBytes));
+        final long limitBytes = services.mPolicyEditor.getPolicyLimitBytes(mNetworkTemplate);
+        if (limitBytes != LIMIT_DISABLED) {
+            mDataLimit.setSummary(Formatter.formatFileSize(getContext(), limitBytes));
             mDataLimit.setEnabled(true);
             mEnableDataLimit.setChecked(true);
         } else {
@@ -248,6 +256,17 @@
                     : editor.getPolicyWarningBytes(template);
             final long limitDisabled = isLimit ? LIMIT_DISABLED : WARNING_DISABLED;
 
+            final MeasureFormat formatter = MeasureFormat.getInstance(
+                    getContext().getResources().getConfiguration().locale,
+                    MeasureFormat.FormatWidth.SHORT);
+            final String[] unitNames = new String[] {
+                formatter.getUnitDisplayName(MeasureUnit.MEGABYTE),
+                formatter.getUnitDisplayName(MeasureUnit.GIGABYTE)
+            };
+            final ArrayAdapter<String> adapter = new ArrayAdapter<String>(
+                    getContext(), R.layout.data_usage_spinner_item, unitNames);
+            type.setAdapter(adapter);
+
             if (bytes > 1.5f * GB_IN_BYTES) {
                 final String bytesText = formatText(bytes / (float) GB_IN_BYTES);
                 bytesPicker.setText(bytesText);
@@ -305,7 +324,7 @@
     }
 
     /**
-     * Dialog to edit {@link NetworkPolicy#cycleDay}.
+     * Dialog to edit {@link NetworkPolicy}.
      */
     public static class CycleEditorFragment extends InstrumentedDialogFragment implements
             DialogInterface.OnClickListener {
diff --git a/src/com/android/settings/datausage/CycleAdapter.java b/src/com/android/settings/datausage/CycleAdapter.java
index 67e62cb..01ba0b5 100644
--- a/src/com/android/settings/datausage/CycleAdapter.java
+++ b/src/com/android/settings/datausage/CycleAdapter.java
@@ -15,17 +15,21 @@
 
 import android.content.Context;
 import android.net.NetworkPolicy;
+import android.net.NetworkPolicyManager;
 import android.net.NetworkStatsHistory;
 import android.text.format.DateUtils;
+import android.util.Pair;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
+
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settingslib.net.ChartData;
+
 import libcore.util.Objects;
 
-import static android.net.NetworkPolicyManager.computeLastCycleBoundary;
-import static android.net.NetworkPolicyManager.computeNextCycleBoundary;
+import java.time.ZonedDateTime;
+import java.util.Iterator;
 
 public class CycleAdapter extends ArrayAdapter<CycleAdapter.CycleItem> {
 
@@ -61,9 +65,9 @@
     }
 
     /**
-     * Rebuild list based on {@link NetworkPolicy#cycleDay}
-     * and available {@link NetworkStatsHistory} data. Always selects the newest
-     * item, updating the inspection range on chartData.
+     * Rebuild list based on {@link NetworkPolicy} and available
+     * {@link NetworkStatsHistory} data. Always selects the newest item,
+     * updating the inspection range on chartData.
      */
      public boolean updateCycleList(NetworkPolicy policy, ChartData chartData) {
         // stash away currently selected cycle to try restoring below
@@ -87,12 +91,12 @@
 
         boolean hasCycles = false;
         if (policy != null) {
-            // find the next cycle boundary
-            long cycleEnd = computeNextCycleBoundary(historyEnd, policy);
-
-            // walk backwards, generating all valid cycle ranges
-            while (cycleEnd > historyStart) {
-                final long cycleStart = computeLastCycleBoundary(cycleEnd, policy);
+            final Iterator<Pair<ZonedDateTime, ZonedDateTime>> it = NetworkPolicyManager
+                    .cycleIterator(policy);
+            while (it.hasNext()) {
+                final Pair<ZonedDateTime, ZonedDateTime> cycle = it.next();
+                final long cycleStart = cycle.first.toInstant().toEpochMilli();
+                final long cycleEnd = cycle.second.toInstant().toEpochMilli();
 
                 final boolean includeCycle;
                 if (chartData != null) {
@@ -106,7 +110,6 @@
                     add(new CycleAdapter.CycleItem(context, cycleStart, cycleEnd));
                     hasCycles = true;
                 }
-                cycleEnd = cycleStart;
             }
         }
 
diff --git a/res/drawable/ic_search_history.xml b/src/com/android/settings/datausage/DataPlanFeatureProvider.java
similarity index 60%
rename from res/drawable/ic_search_history.xml
rename to src/com/android/settings/datausage/DataPlanFeatureProvider.java
index 05384d2..eb5b48f 100644
--- a/res/drawable/ic_search_history.xml
+++ b/src/com/android/settings/datausage/DataPlanFeatureProvider.java
@@ -1,13 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
 /*
- * Copyright 2014, The Android Open Source Project
+ * Copyright (C) 2017 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,9 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
--->
 
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/ic_search_history_am"
-        android:autoMirrored="true"
-        />
+package com.android.settings.datausage;
+
+/**
+ * Feature provider for data plan feature.
+ */
+public interface DataPlanFeatureProvider {
+  /**
+   * @return whether data plan feature is enabled.
+   */
+  boolean isEnabled();
+}
diff --git a/src/com/android/settings/datausage/DataPlanFeatureProviderImpl.java b/src/com/android/settings/datausage/DataPlanFeatureProviderImpl.java
new file mode 100644
index 0000000..d5f435c
--- /dev/null
+++ b/src/com/android/settings/datausage/DataPlanFeatureProviderImpl.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.datausage;
+
+import android.os.SystemProperties;
+
+/**
+ * Impl for data plan feature provider.
+ */
+public final class DataPlanFeatureProviderImpl implements DataPlanFeatureProvider {
+  private static final String ENABLE_SETTINGS_DATA_PLAN = "enable.settings.data.plan";
+
+  @Override
+  public boolean isEnabled() {
+    return SystemProperties.getBoolean(ENABLE_SETTINGS_DATA_PLAN, false /* default */);
+  }
+}
diff --git a/src/com/android/settings/datausage/DataPlanSummaryPreference.java b/src/com/android/settings/datausage/DataPlanSummaryPreference.java
new file mode 100644
index 0000000..f48e04d
--- /dev/null
+++ b/src/com/android/settings/datausage/DataPlanSummaryPreference.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings.datausage;
+
+import android.content.Context;
+import android.support.annotation.ColorRes;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.util.AttributeSet;
+import android.widget.TextView;
+import com.android.settings.R;
+import com.android.settings.widget.DonutView;
+
+/**
+ * Provides a summary of data plans as preferences on settings page.
+ */
+public final class DataPlanSummaryPreference extends Preference {
+    private String mName;
+    private String mDescription;
+    private double mPercentageUsage;
+    private int mUsageTextColor;
+    private int mMeterBackgroundColor;
+    private int mMeterConsumedColor;
+
+    public DataPlanSummaryPreference(Context context) {
+        super(context);
+        setLayoutResource(R.layout.settings_data_plan_summary_preference);
+    }
+
+    public DataPlanSummaryPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setLayoutResource(R.layout.settings_data_plan_summary_preference);
+    }
+
+    public void setName(String planName) {
+        mName = planName;
+        notifyChanged();
+    }
+
+    public void setDescription(String planDescription) {
+        mDescription = planDescription;
+        notifyChanged();
+    }
+
+    public void setPercentageUsage(double percentageUsage) {
+        mPercentageUsage = percentageUsage;
+        notifyChanged();
+    }
+
+    public void setUsageTextColor(@ColorRes int planUsageTextColor) {
+        mUsageTextColor = planUsageTextColor;
+        notifyChanged();
+    }
+
+    public void setMeterBackgroundColor(@ColorRes int meterBackgroundColor) {
+        mMeterBackgroundColor = meterBackgroundColor;
+        notifyChanged();
+    }
+
+    public void setMeterConsumedColor(@ColorRes int meterConsumedColor) {
+        mMeterConsumedColor = meterConsumedColor;
+        notifyChanged();
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder holder) {
+        super.onBindViewHolder(holder);
+        holder.setDividerAllowedAbove(false);
+        TextView titleView = (TextView) holder.findViewById(android.R.id.title);
+        titleView.setTextColor(mUsageTextColor);
+        ((TextView) holder.findViewById(android.R.id.text1)).setText(mName);
+        ((TextView) holder.findViewById(android.R.id.text2)).setText(mDescription);
+        DonutView donutView = (DonutView) holder.findViewById(R.id.donut);
+        donutView.setPercentage(mPercentageUsage);
+        donutView.setMeterBackgroundColor(mMeterBackgroundColor);
+        donutView.setMeterConsumedColor(mMeterConsumedColor);
+    }
+}
diff --git a/src/com/android/settings/datausage/DataPlanUsageSummary.java b/src/com/android/settings/datausage/DataPlanUsageSummary.java
new file mode 100644
index 0000000..1905deb
--- /dev/null
+++ b/src/com/android/settings/datausage/DataPlanUsageSummary.java
@@ -0,0 +1,402 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings.datausage;
+
+import static android.net.NetworkPolicy.LIMIT_DISABLED;
+
+import android.annotation.IdRes;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.net.NetworkPolicy;
+import android.net.NetworkPolicyManager;
+import android.net.NetworkTemplate;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import android.os.Bundle;
+import android.os.UserManager;
+import android.provider.SearchIndexableResource;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceScreen;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.text.TextUtils;
+import android.text.format.Formatter;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settingslib.NetworkPolicyEditor;
+import com.android.settingslib.net.DataUsageController;
+import java.util.ArrayList;
+import java.util.List;
+
+public class DataPlanUsageSummary extends DataUsageBase implements Indexable {
+
+    public static final String KEY_DATA_PLAN_USAGE = "data_plan_usage";
+
+    public static final String KEY_STATUS_HEADER = "status_header";
+    public static final String KEY_LIMIT_SUMMARY = "plan_summary";
+
+    // Mobile data keys
+    public static final String KEY_MOBILE_USAGE_TITLE = "data_usage_mobile_category";
+    public static final String KEY_MOBILE_DATA_USAGE_TOGGLE = "data_usage_enable";
+
+    // Wifi keys
+    public static final String KEY_WIFI_USAGE_TITLE = "wifi_category";
+    public static final String KEY_WIFI_DATA_USAGE = "wifi_data_usage";
+    public static final String KEY_NETWORK_RESTRICTIONS = "network_restrictions";
+
+    private DataUsageController mDataUsageController;
+    private DataUsageInfoController mDataInfoController;
+    private List<DataPlanSummaryPreference> mDataPlanSummaryPreferenceList;
+    private Preference mLimitPreference;
+    private NetworkTemplate mDefaultTemplate;
+    private NetworkRestrictionsPreference mNetworkRestrictionPreference;
+    private WifiManager mWifiManager;
+    private NetworkPolicyEditor mPolicyEditor;
+
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_url_data_usage;
+    }
+
+    @Override
+    public void onCreate(Bundle bundle) {
+        super.onCreate(bundle);
+
+        final Context context = getContext();
+        NetworkPolicyManager policyManager = NetworkPolicyManager.from(context);
+        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+        mPolicyEditor = new NetworkPolicyEditor(policyManager);
+        mDataUsageController = new DataUsageController(context);
+        mDataInfoController = new DataUsageInfoController();
+
+        int defaultSubId = DataUsageUtils.getDefaultSubscriptionId(context);
+        boolean hasMobileData = DataUsageUtils.hasMobileData(context);
+        if (defaultSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            hasMobileData = false;
+        }
+        mDefaultTemplate = DataUsageUtils.getDefaultTemplate(context, defaultSubId);
+
+        if (hasMobileData) {
+            addDataPlanSection(defaultSubId);
+        }
+
+        if (DataUsageUtils.hasWifiRadio(context)) {
+            addWifiSection();
+        }
+
+        if (hasEthernet(context)) {
+            addEthernetSection();
+        }
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        if (UserManager.get(getContext()).isAdminUser()) {
+            inflater.inflate(R.menu.data_usage, menu);
+        }
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.data_usage_menu_cellular_networks: {
+                final Intent intent = new Intent(Settings.ACTION_NETWORK_OPERATOR_SETTINGS);
+                startActivity(intent);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private void addDataPlanSection(int defaultSubId) {
+        Context context = getPrefContext();
+        addPreferencesFromResource(R.xml.data_plan_usage);
+        PreferenceScreen screen = getPreferenceScreen();
+        screen.setTitle(context.getString(R.string.data_usage_summary_title));
+
+        PreferenceCategory preferenceCategory =
+                (PreferenceCategory) findPreference(KEY_DATA_PLAN_USAGE);
+        screen.addPreference(preferenceCategory);
+
+        Preference dataPlansSyncTimePreference = new Preference(context);
+        dataPlansSyncTimePreference.setLayoutResource(R.layout.data_plans_sync_time_preference);
+        dataPlansSyncTimePreference.setTitle(MockDataPlanUsage.SYNC_TIME);
+        preferenceCategory.addPreference(dataPlansSyncTimePreference);
+
+        mDataPlanSummaryPreferenceList = new ArrayList<>(MockDataPlanUsage.DATA_PLAN_USAGES.length);
+        for (int i = 0; i < MockDataPlanUsage.DATA_PLAN_USAGES.length; i++) {
+            DataPlanSummaryPreference dataPlanSummaryPreference =
+                    new DataPlanSummaryPreference(context);
+            dataPlanSummaryPreference.setKey(KEY_STATUS_HEADER + (i + 1));
+            mDataPlanSummaryPreferenceList.add(dataPlanSummaryPreference);
+            preferenceCategory.addPreference(dataPlanSummaryPreference);
+        }
+
+        Preference preference = new Preference(context);
+        preference.setLayoutResource(R.layout.manage_data_plans_preference);
+        preferenceCategory.addPreference(preference);
+        setPreferenceScreen(screen);
+
+        mLimitPreference = findPreference(KEY_LIMIT_SUMMARY);
+        List<SubscriptionInfo> subscriptions =
+                services.mSubscriptionManager.getActiveSubscriptionInfoList();
+
+        if (subscriptions == null || subscriptions.isEmpty()) {
+            addMobileSection(defaultSubId);
+        }
+
+        for (int i = 0, subscriptionsSize = subscriptions != null ? subscriptions.size() : 0;
+                i < subscriptionsSize; i++) {
+            SubscriptionInfo subInfo = subscriptions.get(i);
+            if (subscriptionsSize > 1) {
+                addMobileSection(subInfo.getSubscriptionId(), subInfo);
+            } else {
+                addMobileSection(subInfo.getSubscriptionId());
+            }
+        }
+    }
+
+    private void addMobileSection(int subId) {
+        addMobileSection(subId, null);
+    }
+
+    private void addMobileSection(int subId, SubscriptionInfo subInfo) {
+        TemplatePreferenceCategory category = (TemplatePreferenceCategory)
+                inflatePreferences(R.xml.data_plan_usage_cell_data_preference_screen);
+        category.setTemplate(getNetworkTemplate(subId), subId, services);
+        category.pushTemplates(services);
+        if (subInfo != null && !TextUtils.isEmpty(subInfo.getDisplayName())) {
+            Preference title = category.findPreference(KEY_MOBILE_USAGE_TITLE);
+            title.setTitle(subInfo.getDisplayName());
+        }
+    }
+
+    private void addWifiSection() {
+        TemplatePreferenceCategory category = (TemplatePreferenceCategory)
+                inflatePreferences(R.xml.data_usage_wifi);
+        category.setTemplate(NetworkTemplate.buildTemplateWifiWildcard(), 0 /* subId */, services);
+        mNetworkRestrictionPreference =
+                (NetworkRestrictionsPreference) category.findPreference(KEY_NETWORK_RESTRICTIONS);
+    }
+
+    private void addEthernetSection() {
+        TemplatePreferenceCategory category = (TemplatePreferenceCategory)
+                inflatePreferences(R.xml.data_usage_ethernet);
+        category.setTemplate(NetworkTemplate.buildTemplateEthernet(), 0 /* subId */, services);
+    }
+
+    private Preference inflatePreferences(@IdRes int resId) {
+        PreferenceScreen rootPreferences = getPreferenceManager().inflateFromResource(
+                getPrefContext(), resId, null);
+        Preference pref = rootPreferences.getPreference(0);
+        rootPreferences.removeAll();
+
+        PreferenceScreen screen = getPreferenceScreen();
+        pref.setOrder(screen.getPreferenceCount());
+        screen.addPreference(pref);
+
+        return pref;
+    }
+
+    private NetworkTemplate getNetworkTemplate(int subscriptionId) {
+        NetworkTemplate mobileAll = NetworkTemplate.buildTemplateMobileAll(
+                services.mTelephonyManager.getSubscriberId(subscriptionId));
+        return NetworkTemplate.normalize(mobileAll,
+                services.mTelephonyManager.getMergedSubscriberIds());
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        updateState();
+    }
+
+    private void updateState() {
+        DataUsageController.DataUsageInfo info = mDataUsageController.getDataUsageInfo(
+                mDefaultTemplate);
+
+        Context context = getContext();
+        mDataInfoController.updateDataLimit(info,
+                services.mPolicyEditor.getPolicy(mDefaultTemplate));
+
+        // TODO(b/63391323): Get rid of MockDataPlanUsage once we integrate with data plan APIs
+        if (mDataPlanSummaryPreferenceList != null && !mDataPlanSummaryPreferenceList.isEmpty()) {
+            MockDataPlanUsage[] dataPlanUsages = MockDataPlanUsage.getDataPlanUsage();
+            for (int i = 0; i < dataPlanUsages.length; i++) {
+                DataPlanSummaryPreference dataPlanSummaryPreference =
+                        mDataPlanSummaryPreferenceList.get(i);
+                MockDataPlanUsage dataPlanUsage = dataPlanUsages[i];
+                dataPlanSummaryPreference.setTitle(dataPlanUsage.mUsage);
+                dataPlanSummaryPreference.setUsageTextColor(dataPlanUsage.mUsageTextColor);
+                dataPlanSummaryPreference.setName(dataPlanUsage.mName);
+                dataPlanSummaryPreference.setPercentageUsage(dataPlanUsage.mPercentageUsage);
+                dataPlanSummaryPreference
+                        .setMeterBackgroundColor(dataPlanUsage.mMeterBackgroundColor);
+                dataPlanSummaryPreference.setMeterConsumedColor(dataPlanUsage.mMeterConsumedColor);
+                dataPlanSummaryPreference.setDescription(dataPlanUsage.mDescription);
+            }
+        }
+
+        if (mLimitPreference != null && (info.warningLevel > 0 || info.limitLevel > 0)) {
+            String warning = Formatter.formatFileSize(context, info.warningLevel);
+            String limit = Formatter.formatFileSize(context, info.limitLevel);
+            mLimitPreference.setSummary(getString(info.limitLevel <= 0 ? R.string.cell_warning_only
+                    : R.string.cell_warning_and_limit, warning, limit));
+        } else if (mLimitPreference != null) {
+            mLimitPreference.setSummary(null);
+        }
+
+        updateNetworkRestrictionSummary(mNetworkRestrictionPreference);
+
+        PreferenceScreen screen = getPreferenceScreen();
+        for (int i = 1, preferenceCount = screen.getPreferenceCount(); i < preferenceCount; i++) {
+            ((TemplatePreferenceCategory) screen.getPreference(i)).pushTemplates(services);
+        }
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.DATA_USAGE_SUMMARY;
+    }
+
+    @VisibleForTesting
+    void updateNetworkRestrictionSummary(NetworkRestrictionsPreference preference) {
+        if (preference == null) {
+            return;
+        }
+        mPolicyEditor.read();
+        int count = 0;
+        List<WifiConfiguration> configuredNetworks = mWifiManager.getConfiguredNetworks();
+        for (int i = 0, configuredNetworksSize = configuredNetworks.size();
+                i < configuredNetworksSize; i++) {
+            WifiConfiguration config = configuredNetworks.get(i);
+            if (isMetered(config)) {
+                count++;
+            }
+        }
+        preference.setSummary(getResources().getQuantityString(
+                R.plurals.network_restrictions_summary, count, count));
+    }
+
+    @VisibleForTesting
+    boolean isMetered(WifiConfiguration config) {
+        if (config.SSID == null) {
+            return false;
+        }
+        final String networkId = config.isPasspoint() ? config.providerFriendlyName : config.SSID;
+        final NetworkPolicy policy =
+                mPolicyEditor.getPolicyMaybeUnquoted(NetworkTemplate.buildTemplateWifi(networkId));
+        if (policy == null) {
+            return false;
+        }
+        if (policy.limitBytes != LIMIT_DISABLED) {
+            return true;
+        }
+        return policy.metered;
+    }
+
+    private static class SummaryProvider
+            implements SummaryLoader.SummaryProvider {
+
+        private final Activity mActivity;
+        private final SummaryLoader mSummaryLoader;
+        private final DataUsageController mDataController;
+
+        public SummaryProvider(Activity activity, SummaryLoader summaryLoader) {
+            mActivity = activity;
+            mSummaryLoader = summaryLoader;
+            mDataController = new DataUsageController(activity);
+        }
+
+        @Override
+        public void setListening(boolean listening) {
+            if (listening) {
+                DataUsageController.DataUsageInfo info = mDataController.getDataUsageInfo();
+                String used;
+                if (info == null) {
+                    used = Formatter.formatFileSize(mActivity, 0);
+                } else if (info.limitLevel <= 0) {
+                    used = Formatter.formatFileSize(mActivity, info.usageLevel);
+                } else {
+                    used = Utils.formatPercentage(info.usageLevel, info.limitLevel);
+                }
+                mSummaryLoader.setSummary(this,
+                        mActivity.getString(R.string.data_usage_summary_format, used));
+            }
+        }
+    }
+
+    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
+            = SummaryProvider::new;
+
+    /**
+     * For search
+     */
+    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+                        boolean enabled) {
+                    List<SearchIndexableResource> resources = new ArrayList<>();
+                    SearchIndexableResource resource = new SearchIndexableResource(context);
+                    resource.xmlResId = R.xml.data_usage;
+                    resources.add(resource);
+
+                    resource = new SearchIndexableResource(context);
+                    resource.xmlResId = R.xml.data_plan_usage_cell_data_preference_screen;
+                    resources.add(resource);
+
+                    resource = new SearchIndexableResource(context);
+                    resource.xmlResId = R.xml.data_usage_wifi;
+                    resources.add(resource);
+
+                    return resources;
+                }
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    List<String> keys = super.getNonIndexableKeys(context);
+
+                    if (!DataUsageUtils.hasMobileData(context)) {
+                        keys.add(KEY_MOBILE_USAGE_TITLE);
+                        keys.add(KEY_MOBILE_DATA_USAGE_TOGGLE);
+                    }
+
+                    if (!DataUsageUtils.hasWifiRadio(context)) {
+                        keys.add(KEY_WIFI_DATA_USAGE);
+                        keys.add(KEY_NETWORK_RESTRICTIONS);
+                    }
+
+                    keys.add(KEY_WIFI_USAGE_TITLE);
+
+                    return keys;
+                }
+            };
+}
+
diff --git a/src/com/android/settings/datausage/DataUsageBase.java b/src/com/android/settings/datausage/DataUsageBase.java
index ef565a1..f08d534 100644
--- a/src/com/android/settings/datausage/DataUsageBase.java
+++ b/src/com/android/settings/datausage/DataUsageBase.java
@@ -14,25 +14,31 @@
 
 package com.android.settings.datausage;
 
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settingslib.NetworkPolicyEditor;
+import static android.net.ConnectivityManager.TYPE_ETHERNET;
 
 import android.content.Context;
+import android.net.ConnectivityManager;
 import android.net.INetworkStatsService;
+import android.net.INetworkStatsSession;
 import android.net.NetworkPolicy;
 import android.net.NetworkPolicyManager;
+import android.net.NetworkTemplate;
+import android.net.TrafficStats;
 import android.os.Bundle;
 import android.os.INetworkManagementService;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+import android.os.SystemProperties;
 import android.os.UserManager;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.util.Log;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settingslib.NetworkPolicyEditor;
 
 public abstract class DataUsageBase extends SettingsPreferenceFragment {
-
     private static final String TAG = "DataUsageBase";
+    private static final String ETHERNET = "ethernet";
 
     protected final TemplatePreference.NetworkServices services =
             new TemplatePreference.NetworkServices();
@@ -85,8 +91,38 @@
         try {
             return services.mNetworkService.isBandwidthControlEnabled();
         } catch (RemoteException e) {
-            Log.w(TAG, "problem talking with INetworkManagementService: " + e);
+            Log.w(TAG, "problem talking with INetworkManagementService: ", e);
             return false;
         }
     }
+
+    /**
+     * Test if device has an ethernet network connection.
+     */
+    public boolean hasEthernet(Context context) {
+        if (DataUsageUtils.TEST_RADIOS) {
+            return SystemProperties.get(DataUsageUtils.TEST_RADIOS_PROP).contains(ETHERNET);
+        }
+
+        final ConnectivityManager conn = ConnectivityManager.from(context);
+        final boolean hasEthernet = conn.isNetworkSupported(TYPE_ETHERNET);
+
+        final long ethernetBytes;
+        try {
+            INetworkStatsSession statsSession = services.mStatsService.openSession();
+            if (statsSession != null) {
+                ethernetBytes = statsSession.getSummaryForNetwork(
+                        NetworkTemplate.buildTemplateEthernet(), Long.MIN_VALUE, Long.MAX_VALUE)
+                        .getTotalBytes();
+                TrafficStats.closeQuietly(statsSession);
+            } else {
+                ethernetBytes = 0;
+            }
+        } catch (RemoteException e) {
+            throw new RuntimeException(e);
+        }
+
+        // only show ethernet when both hardware present and traffic has occurred
+        return hasEthernet && ethernetBytes > 0;
+    }
 }
diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java
index de92154..e724d48 100644
--- a/src/com/android/settings/datausage/DataUsageList.java
+++ b/src/com/android/settings/datausage/DataUsageList.java
@@ -14,6 +14,12 @@
 
 package com.android.settings.datausage;
 
+import static android.net.ConnectivityManager.TYPE_MOBILE;
+import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
+import static android.net.TrafficStats.UID_REMOVED;
+import static android.net.TrafficStats.UID_TETHERING;
+import static android.telephony.TelephonyManager.SIM_STATE_READY;
+
 import android.app.ActivityManager;
 import android.app.LoaderManager.LoaderCallbacks;
 import android.content.Context;
@@ -46,28 +52,19 @@
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.Spinner;
-
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.datausage.CycleAdapter.SpinnerInterface;
+import com.android.settings.widget.LoadingViewController;
 import com.android.settingslib.AppItem;
 import com.android.settingslib.net.ChartData;
 import com.android.settingslib.net.ChartDataLoader;
 import com.android.settingslib.net.SummaryForAllUidLoader;
 import com.android.settingslib.net.UidDetailProvider;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import static android.net.ConnectivityManager.TYPE_MOBILE;
-import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
-import static android.net.TrafficStats.UID_REMOVED;
-import static android.net.TrafficStats.UID_TETHERING;
-import static android.telephony.TelephonyManager.SIM_STATE_READY;
-import static com.android.settings.datausage.DataUsageSummary.TEST_RADIOS;
-import static com.android.settings.datausage.DataUsageSummary.TEST_RADIOS_PROP;
-
 /**
  * Panel showing data usage history across various networks, including options
  * to inspect based on usage cycle and control through {@link NetworkPolicy}.
@@ -96,13 +93,13 @@
             };
 
     private INetworkStatsSession mStatsSession;
-
     private ChartDataUsagePreference mChart;
 
     private NetworkTemplate mTemplate;
     private int mSubId;
     private ChartData mChartData;
 
+    private LoadingViewController mLoadingViewController;
     private UidDetailProvider mUidDetailProvider;
     private CycleAdapter mCycleAdapter;
     private Spinner mCycleSpinner;
@@ -110,6 +107,7 @@
     private PreferenceGroup mApps;
     private View mHeader;
 
+
     @Override
     public int getMetricsCategory() {
         return MetricsEvent.DATA_USAGE_LIST;
@@ -176,7 +174,10 @@
                 mCycleSpinner.setSelection(position);
             }
         }, mCycleListener, true);
-        setLoading(true, false);
+
+        mLoadingViewController = new LoadingViewController(
+                getView().findViewById(R.id.loading_container), getListView());
+        mLoadingViewController.showLoadingViewDelayed();
     }
 
     @Override
@@ -437,8 +438,8 @@
      * Test if device has a mobile data radio with SIM in ready state.
      */
     public static boolean hasReadyMobileRadio(Context context) {
-        if (TEST_RADIOS) {
-            return SystemProperties.get(TEST_RADIOS_PROP).contains("mobile");
+        if (DataUsageUtils.TEST_RADIOS) {
+            return SystemProperties.get(DataUsageUtils.TEST_RADIOS_PROP).contains("mobile");
         }
 
         final ConnectivityManager conn = ConnectivityManager.from(context);
@@ -471,8 +472,8 @@
      * TODO: consider adding to TelephonyManager or SubscriptionManager.
      */
     public static boolean hasReadyMobileRadio(Context context, int subId) {
-        if (TEST_RADIOS) {
-            return SystemProperties.get(TEST_RADIOS_PROP).contains("mobile");
+        if (DataUsageUtils.TEST_RADIOS) {
+            return SystemProperties.get(DataUsageUtils.TEST_RADIOS_PROP).contains("mobile");
         }
 
         final ConnectivityManager conn = ConnectivityManager.from(context);
@@ -523,7 +524,7 @@
 
         @Override
         public void onLoadFinished(Loader<ChartData> loader, ChartData data) {
-            setLoading(false, true);
+            mLoadingViewController.showContent(false /* animate */);
             mChartData = data;
             mChart.setNetworkStats(mChartData.network);
 
diff --git a/src/com/android/settings/datausage/DataUsageMeteredSettings.java b/src/com/android/settings/datausage/DataUsageMeteredSettings.java
index c2a18e9..0afb894 100644
--- a/src/com/android/settings/datausage/DataUsageMeteredSettings.java
+++ b/src/com/android/settings/datausage/DataUsageMeteredSettings.java
@@ -14,20 +14,19 @@
 
 package com.android.settings.datausage;
 
+import static android.net.wifi.WifiInfo.removeDoubleQuotes;
+
 import android.app.backup.BackupManager;
 import android.content.Context;
 import android.content.res.Resources;
-import android.net.NetworkPolicy;
 import android.net.NetworkPolicyManager;
-import android.net.NetworkTemplate;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
-import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.DropDownPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
-import android.telephony.TelephonyManager;
-
+import android.text.TextUtils;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
@@ -35,22 +34,14 @@
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
 import com.android.settingslib.NetworkPolicyEditor;
-
 import java.util.ArrayList;
 import java.util.List;
 
-import static android.net.NetworkPolicy.LIMIT_DISABLED;
-import static android.net.wifi.WifiInfo.removeDoubleQuotes;
-import static com.android.settings.datausage.DataUsageList.hasReadyMobileRadio;
-import static com.android.settings.datausage.DataUsageSummary.hasWifiRadio;
-
 /**
- * Panel to configure {@link NetworkPolicy#metered} for networks.
+ * Panel to configure {@link WifiConfiguration#meteredOverride}.
  */
 public class DataUsageMeteredSettings extends SettingsPreferenceFragment implements Indexable {
 
-    private static final boolean SHOW_MOBILE_CATEGORY = false;
-
     private NetworkPolicyManager mPolicyManager;
     private WifiManager mWifiManager;
 
@@ -85,18 +76,14 @@
     }
 
     private void updateNetworks(Context context) {
-        if (SHOW_MOBILE_CATEGORY && hasReadyMobileRadio(context)) {
-            mMobileCategory.removeAll();
-            mMobileCategory.addPreference(buildMobilePref(context));
-        } else {
-            getPreferenceScreen().removePreference(mMobileCategory);
-        }
+        getPreferenceScreen().removePreference(mMobileCategory);
 
         mWifiCategory.removeAll();
-        if (hasWifiRadio(context) && mWifiManager.isWifiEnabled()) {
+        if (DataUsageUtils.hasWifiRadio(context) && mWifiManager.isWifiEnabled()) {
             for (WifiConfiguration config : mWifiManager.getConfiguredNetworks()) {
-                if (config.SSID != null) {
-                    mWifiCategory.addPreference(buildWifiPref(config));
+                final Preference pref = new MeteredPreference(getPrefContext(), config);
+                if (!TextUtils.isEmpty(pref.getTitle())) {
+                    mWifiCategory.addPreference(pref);
                 }
             }
         } else {
@@ -104,57 +91,40 @@
         }
     }
 
-    private Preference buildMobilePref(Context context) {
-        final TelephonyManager tele = TelephonyManager.from(context);
-        final NetworkTemplate template = NetworkTemplate.buildTemplateMobileAll(
-                tele.getSubscriberId());
-        final MeteredPreference pref = new MeteredPreference(getPrefContext(), template);
-        pref.setTitle(tele.getNetworkOperatorName());
-        return pref;
-    }
+    private class MeteredPreference extends DropDownPreference {
+        private final WifiConfiguration mConfig;
 
-    private Preference buildWifiPref(WifiConfiguration config) {
-        final String networkId = config.isPasspoint() ?
-                config.providerFriendlyName : config.SSID;
-        final NetworkTemplate template = NetworkTemplate.buildTemplateWifi(networkId);
-        final MeteredPreference pref = new MeteredPreference(getPrefContext(), template);
-        pref.setTitle(removeDoubleQuotes(networkId));
-        return pref;
-    }
-
-    private class MeteredPreference extends SwitchPreference {
-        private final NetworkTemplate mTemplate;
-        private boolean mBinding;
-
-        public MeteredPreference(Context context, NetworkTemplate template) {
+        public MeteredPreference(Context context, WifiConfiguration config) {
             super(context);
-            mTemplate = template;
+            mConfig = config;
 
             setPersistent(false);
+            setEntries(new CharSequence[] {
+                    getString(R.string.data_usage_metered_auto),
+                    getString(R.string.data_usage_metered_yes),
+                    getString(R.string.data_usage_metered_no),
+            });
+            setEntryValues(new CharSequence[] {
+                    Integer.toString(WifiConfiguration.METERED_OVERRIDE_NONE),
+                    Integer.toString(WifiConfiguration.METERED_OVERRIDE_METERED),
+                    Integer.toString(WifiConfiguration.METERED_OVERRIDE_NOT_METERED),
+            });
+            setValue(Integer.toString(mConfig.meteredOverride));
+            setTitle(NetworkPolicyManager.resolveNetworkId(mConfig));
+            setSummary(getEntries()[mConfig.meteredOverride]);
 
-            mBinding = true;
-            final NetworkPolicy policy = mPolicyEditor.getPolicyMaybeUnquoted(template);
-            if (policy != null) {
-                if (policy.limitBytes != LIMIT_DISABLED) {
-                    setChecked(true);
-                    setEnabled(false);
-                } else {
-                    setChecked(policy.metered);
+            setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+                @Override
+                public boolean onPreferenceChange(Preference preference, Object newValue) {
+                    mConfig.meteredOverride = Integer.parseInt((String) newValue);
+                    setSummary(getEntries()[mConfig.meteredOverride]);
+
+                    mWifiManager.updateNetwork(mConfig);
+                    // Stage the backup of the SettingsProvider package which backs this up
+                    BackupManager.dataChanged("com.android.providers.settings");
+                    return true;
                 }
-            } else {
-                setChecked(false);
-            }
-            mBinding = false;
-        }
-
-        @Override
-        protected void notifyChanged() {
-            super.notifyChanged();
-            if (!mBinding) {
-                mPolicyEditor.setPolicyMetered(mTemplate, isChecked());
-                // Stage the backup of the SettingsProvider package which backs this up
-                BackupManager.dataChanged("com.android.providers.settings");
-            }
+            });
         }
     }
 
@@ -180,21 +150,6 @@
                 data.screenTitle = res.getString(R.string.data_usage_menu_metered);
                 result.add(data);
 
-                if (SHOW_MOBILE_CATEGORY && hasReadyMobileRadio(context)) {
-                    // Mobile networks category
-                    data = new SearchIndexableRaw(context);
-                    data.title = res.getString(R.string.data_usage_metered_mobile);
-                    data.screenTitle = res.getString(R.string.data_usage_menu_metered);
-                    result.add(data);
-
-                    final TelephonyManager tele = TelephonyManager.from(context);
-
-                    data = new SearchIndexableRaw(context);
-                    data.title = tele.getNetworkOperatorName();
-                    data.screenTitle = res.getString(R.string.data_usage_menu_metered);
-                    result.add(data);
-                }
-
                 // Wi-Fi networks category
                 data = new SearchIndexableRaw(context);
                 data.title = res.getString(R.string.data_usage_metered_wifi);
@@ -203,7 +158,7 @@
 
                 final WifiManager wifiManager =
                         (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-                if (hasWifiRadio(context) && wifiManager.isWifiEnabled()) {
+                if (DataUsageUtils.hasWifiRadio(context) && wifiManager.isWifiEnabled()) {
                     for (WifiConfiguration config : wifiManager.getConfiguredNetworks()) {
                         if (config.SSID != null) {
                             final String networkId = config.SSID;
@@ -227,12 +182,8 @@
             @Override
             public List<String> getNonIndexableKeys(Context context) {
                 final List<String> result = super.getNonIndexableKeys(context);
-                if (!SHOW_MOBILE_CATEGORY || !hasReadyMobileRadio(context)) {
-                    result.add("mobile");
-                }
-
+                result.add("mobile");
                 return result;
             }
         };
-
 }
diff --git a/src/com/android/settings/datausage/DataUsagePreference.java b/src/com/android/settings/datausage/DataUsagePreference.java
index 0c7b33f..63f6054 100644
--- a/src/com/android/settings/datausage/DataUsagePreference.java
+++ b/src/com/android/settings/datausage/DataUsagePreference.java
@@ -19,14 +19,12 @@
 import android.net.NetworkTemplate;
 import android.os.Bundle;
 import android.support.v7.preference.Preference;
-import android.telephony.SubscriptionManager;
 import android.text.format.Formatter;
 import android.util.AttributeSet;
-
 import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settingslib.net.DataUsageController;
-import com.android.settings.R;
 
 public class DataUsagePreference extends Preference implements TemplatePreference {
 
diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java
index 417d74b..e37cc4a 100644
--- a/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
@@ -14,13 +14,14 @@
 
 package com.android.settings.datausage;
 
+import static android.net.ConnectivityManager.TYPE_ETHERNET;
+
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.net.INetworkStatsSession;
-import android.net.NetworkPolicy;
 import android.net.NetworkPolicyManager;
 import android.net.NetworkTemplate;
 import android.net.TrafficStats;
@@ -36,7 +37,6 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
 import android.text.BidiFormatter;
 import android.text.Spannable;
 import android.text.SpannableString;
@@ -55,29 +55,26 @@
 import com.android.settings.search.Indexable;
 import com.android.settingslib.NetworkPolicyEditor;
 import com.android.settingslib.net.DataUsageController;
-
 import java.util.ArrayList;
 import java.util.List;
 
-import static android.net.ConnectivityManager.TYPE_ETHERNET;
-import static android.net.ConnectivityManager.TYPE_WIFI;
-import static android.net.NetworkPolicy.LIMIT_DISABLED;
-
+/**
+ * Settings preference fragment that displays data usage summary.
+ *
+ * This class in deprecated use {@link DataPlanUsageSummary}.
+ */
+@Deprecated
 public class DataUsageSummary extends DataUsageBase implements Indexable, DataUsageEditController {
 
-    private static final String TAG = "DataUsageSummary";
     static final boolean LOGD = false;
 
-    public static final boolean TEST_RADIOS = false;
-    public static final String TEST_RADIOS_PROP = "test.radios";
-
     public static final String KEY_RESTRICT_BACKGROUND = "restrict_background";
 
     private static final String KEY_STATUS_HEADER = "status_header";
     private static final String KEY_LIMIT_SUMMARY = "limit_summary";
 
     // Mobile data keys
-    public static final String KEY_MOBILE_CATEGORY = "mobile_category";
+    public static final String KEY_MOBILE_USAGE_TITLE = "mobile_category";
     public static final String KEY_MOBILE_DATA_USAGE_TOGGLE = "data_usage_enable";
     public static final String KEY_MOBILE_DATA_USAGE = "cellular_data_usage";
     public static final String KEY_MOBILE_BILLING_CYCLE = "billing_preference";
@@ -94,9 +91,8 @@
     private Preference mLimitPreference;
     private NetworkTemplate mDefaultTemplate;
     private int mDataUsageTemplate;
-    private NetworkRestrictionsPreference mNetworkRestrcitionPreference;
+    private NetworkRestrictionsPreference mNetworkRestrictionPreference;
     private WifiManager mWifiManager;
-    private NetworkPolicyManager mPolicyManager;
     private NetworkPolicyEditor mPolicyEditor;
 
     @Override
@@ -109,20 +105,20 @@
         super.onCreate(icicle);
 
         final Context context = getContext();
-        mPolicyManager = NetworkPolicyManager.from(context);
+        NetworkPolicyManager policyManager = NetworkPolicyManager.from(context);
         mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-        mPolicyEditor = new NetworkPolicyEditor(mPolicyManager);
+        mPolicyEditor = new NetworkPolicyEditor(policyManager);
 
-        boolean hasMobileData = hasMobileData(context);
+        boolean hasMobileData = DataUsageUtils.hasMobileData(context);
         mDataUsageController = new DataUsageController(context);
         mDataInfoController = new DataUsageInfoController();
         addPreferencesFromResource(R.xml.data_usage);
 
-        int defaultSubId = getDefaultSubscriptionId(context);
+        int defaultSubId = DataUsageUtils.getDefaultSubscriptionId(context);
         if (defaultSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
             hasMobileData = false;
         }
-        mDefaultTemplate = getDefaultTemplate(context, defaultSubId);
+        mDefaultTemplate = DataUsageUtils.getDefaultTemplate(context, defaultSubId);
         mSummaryPreference = (SummaryPreference) findPreference(KEY_STATUS_HEADER);
 
         if (!hasMobileData || !isAdmin()) {
@@ -136,14 +132,19 @@
                 addMobileSection(defaultSubId);
             }
             for (int i = 0; subscriptions != null && i < subscriptions.size(); i++) {
-                addMobileSection(subscriptions.get(i).getSubscriptionId());
+                SubscriptionInfo subInfo = subscriptions.get(i);
+                if (subscriptions.size() > 1) {
+                    addMobileSection(subInfo.getSubscriptionId(), subInfo);
+                } else {
+                    addMobileSection(subInfo.getSubscriptionId());
+                }
             }
             mSummaryPreference.setSelectable(true);
         } else {
             removePreference(KEY_LIMIT_SUMMARY);
             mSummaryPreference.setSelectable(false);
         }
-        boolean hasWifiRadio = hasWifiRadio(context);
+        boolean hasWifiRadio = DataUsageUtils.hasWifiRadio(context);
         if (hasWifiRadio) {
             addWifiSection();
         }
@@ -189,17 +190,25 @@
     }
 
     private void addMobileSection(int subId) {
+        addMobileSection(subId, null);
+    }
+
+    private void addMobileSection(int subId, SubscriptionInfo subInfo) {
         TemplatePreferenceCategory category = (TemplatePreferenceCategory)
                 inflatePreferences(R.xml.data_usage_cellular);
         category.setTemplate(getNetworkTemplate(subId), subId, services);
         category.pushTemplates(services);
+        if (subInfo != null && !TextUtils.isEmpty(subInfo.getDisplayName())) {
+            Preference title  = category.findPreference(KEY_MOBILE_USAGE_TITLE);
+            title.setTitle(subInfo.getDisplayName());
+        }
     }
 
     private void addWifiSection() {
         TemplatePreferenceCategory category = (TemplatePreferenceCategory)
                 inflatePreferences(R.xml.data_usage_wifi);
         category.setTemplate(NetworkTemplate.buildTemplateWifiWildcard(), 0, services);
-        mNetworkRestrcitionPreference =
+        mNetworkRestrictionPreference =
             (NetworkRestrictionsPreference) category.findPreference(KEY_NETWORK_RESTRICTIONS);
     }
 
@@ -289,7 +298,7 @@
             mLimitPreference.setSummary(null);
         }
 
-        updateNetworkRestrictionSummary(mNetworkRestrcitionPreference);
+        updateNetworkRestrictionSummary(mNetworkRestrictionPreference);
 
         PreferenceScreen screen = getPreferenceScreen();
         for (int i = 1; i < screen.getPreferenceCount(); i++) {
@@ -317,83 +326,6 @@
         updateState();
     }
 
-    /**
-     * Test if device has an ethernet network connection.
-     */
-    public boolean hasEthernet(Context context) {
-        if (TEST_RADIOS) {
-            return SystemProperties.get(TEST_RADIOS_PROP).contains("ethernet");
-        }
-
-        final ConnectivityManager conn = ConnectivityManager.from(context);
-        final boolean hasEthernet = conn.isNetworkSupported(TYPE_ETHERNET);
-
-        final long ethernetBytes;
-        try {
-            INetworkStatsSession statsSession = services.mStatsService.openSession();
-            if (statsSession != null) {
-                ethernetBytes = statsSession.getSummaryForNetwork(
-                        NetworkTemplate.buildTemplateEthernet(), Long.MIN_VALUE, Long.MAX_VALUE)
-                        .getTotalBytes();
-                TrafficStats.closeQuietly(statsSession);
-            } else {
-                ethernetBytes = 0;
-            }
-        } catch (RemoteException e) {
-            throw new RuntimeException(e);
-        }
-
-        // only show ethernet when both hardware present and traffic has occurred
-        return hasEthernet && ethernetBytes > 0;
-    }
-
-    public static boolean hasMobileData(Context context) {
-        return ConnectivityManager.from(context).isNetworkSupported(
-                ConnectivityManager.TYPE_MOBILE);
-    }
-
-    /**
-     * Test if device has a Wi-Fi data radio.
-     */
-    public static boolean hasWifiRadio(Context context) {
-        if (TEST_RADIOS) {
-            return SystemProperties.get(TEST_RADIOS_PROP).contains("wifi");
-        }
-
-        final ConnectivityManager conn = ConnectivityManager.from(context);
-        return conn.isNetworkSupported(TYPE_WIFI);
-    }
-
-    public static int getDefaultSubscriptionId(Context context) {
-        SubscriptionManager subManager = SubscriptionManager.from(context);
-        if (subManager == null) {
-            return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
-        }
-        SubscriptionInfo subscriptionInfo = subManager.getDefaultDataSubscriptionInfo();
-        if (subscriptionInfo == null) {
-            List<SubscriptionInfo> list = subManager.getAllSubscriptionInfoList();
-            if (list.size() == 0) {
-                return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
-            }
-            subscriptionInfo = list.get(0);
-        }
-        return subscriptionInfo.getSubscriptionId();
-    }
-
-    public static NetworkTemplate getDefaultTemplate(Context context, int defaultSubId) {
-        if (hasMobileData(context) && defaultSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
-            TelephonyManager telephonyManager = TelephonyManager.from(context);
-            NetworkTemplate mobileAll = NetworkTemplate.buildTemplateMobileAll(
-                    telephonyManager.getSubscriberId(defaultSubId));
-            return NetworkTemplate.normalize(mobileAll,
-                    telephonyManager.getMergedSubscriberIds());
-        } else if (hasWifiRadio(context)) {
-            return NetworkTemplate.buildTemplateWifiWildcard();
-        } else {
-            return NetworkTemplate.buildTemplateEthernet();
-        }
-    }
-
     @VisibleForTesting
     void updateNetworkRestrictionSummary(NetworkRestrictionsPreference preference) {
         if (preference == null) {
@@ -402,7 +334,7 @@
         mPolicyEditor.read();
         int count = 0;
         for (WifiConfiguration config : mWifiManager.getConfiguredNetworks()) {
-            if (isMetered(config)) {
+            if (WifiConfiguration.isMetered(config, null)) {
                 count++;
             }
         }
@@ -410,23 +342,6 @@
             R.plurals.network_restrictions_summary, count, count));
     }
 
-    @VisibleForTesting
-    boolean isMetered(WifiConfiguration config) {
-        if (config.SSID == null) {
-            return false;
-        }
-        final String networkId = config.isPasspoint() ? config.providerFriendlyName : config.SSID;
-        final NetworkPolicy policy =
-            mPolicyEditor.getPolicyMaybeUnquoted(NetworkTemplate.buildTemplateWifi(networkId));
-        if (policy == null) {
-            return false;
-        }
-        if (policy.limitBytes != LIMIT_DISABLED) {
-            return true;
-        }
-        return policy.metered;
-    }
-
     private static class SummaryProvider
             implements SummaryLoader.SummaryProvider {
 
@@ -459,13 +374,7 @@
     }
 
     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);
-        }
-    };
+        = SummaryProvider::new;
 
     /**
      * For search
@@ -496,14 +405,14 @@
             public List<String> getNonIndexableKeys(Context context) {
                 List<String> keys = super.getNonIndexableKeys(context);
 
-                if (!hasMobileData(context)) {
-                    keys.add(KEY_MOBILE_CATEGORY);
+                if (!DataUsageUtils.hasMobileData(context)) {
+                    keys.add(KEY_MOBILE_USAGE_TITLE);
                     keys.add(KEY_MOBILE_DATA_USAGE_TOGGLE);
                     keys.add(KEY_MOBILE_DATA_USAGE);
                     keys.add(KEY_MOBILE_BILLING_CYCLE);
                 }
 
-                if (!hasWifiRadio(context)) {
+                if (!DataUsageUtils.hasWifiRadio(context)) {
                     keys.add(KEY_WIFI_DATA_USAGE);
                     keys.add(KEY_NETWORK_RESTRICTIONS);
                 }
diff --git a/src/com/android/settings/datausage/DataUsageUtils.java b/src/com/android/settings/datausage/DataUsageUtils.java
new file mode 100644
index 0000000..af2d257
--- /dev/null
+++ b/src/com/android/settings/datausage/DataUsageUtils.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings.datausage;
+
+import static android.net.ConnectivityManager.TYPE_WIFI;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkTemplate;
+import android.os.SystemProperties;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import java.util.List;
+
+/**
+ * Utility methods for data usage classes.
+ */
+public final class DataUsageUtils {
+    static final boolean TEST_RADIOS = false;
+    static final String TEST_RADIOS_PROP = "test.radios";
+
+    private DataUsageUtils() {
+    }
+
+    /**
+     * Returns whether device has mobile data.
+     * TODO: This is the opposite to Utils.isWifiOnly(), it should be refactored into 1 method.
+     */
+    public static boolean hasMobileData(Context context) {
+        ConnectivityManager connectivityManager = ConnectivityManager.from(context);
+        return connectivityManager != null && connectivityManager
+                .isNetworkSupported(ConnectivityManager.TYPE_MOBILE);
+    }
+
+    /**
+     * Whether device has a Wi-Fi data radio.
+     */
+    public static boolean hasWifiRadio(Context context) {
+        if (TEST_RADIOS) {
+            return SystemProperties.get(TEST_RADIOS_PROP).contains("wifi");
+        }
+
+        ConnectivityManager connectivityManager = ConnectivityManager.from(context);
+        return connectivityManager != null && connectivityManager.isNetworkSupported(TYPE_WIFI);
+    }
+
+    /**
+     * Returns the default subscription if available else returns
+     * SubscriptionManager#INVALID_SUBSCRIPTION_ID
+     */
+    public static int getDefaultSubscriptionId(Context context) {
+        SubscriptionManager subManager = SubscriptionManager.from(context);
+        if (subManager == null) {
+            return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+        }
+        SubscriptionInfo subscriptionInfo = subManager.getDefaultDataSubscriptionInfo();
+        if (subscriptionInfo == null) {
+            List<SubscriptionInfo> list = subManager.getAllSubscriptionInfoList();
+            if (list.size() == 0) {
+                return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+            }
+            subscriptionInfo = list.get(0);
+        }
+        return subscriptionInfo.getSubscriptionId();
+    }
+
+    /**
+     * Returns the default network template based on the availability of mobile data, Wifi. Returns
+     * ethernet template if both mobile data and Wifi are not available.
+     */
+    static NetworkTemplate getDefaultTemplate(Context context, int defaultSubId) {
+        if (hasMobileData(context) && defaultSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            TelephonyManager telephonyManager = TelephonyManager.from(context);
+            NetworkTemplate mobileAll = NetworkTemplate.buildTemplateMobileAll(
+                    telephonyManager.getSubscriberId(defaultSubId));
+            return NetworkTemplate.normalize(mobileAll,
+                    telephonyManager.getMergedSubscriberIds());
+        } else if (hasWifiRadio(context)) {
+            return NetworkTemplate.buildTemplateWifiWildcard();
+        } else {
+            return NetworkTemplate.buildTemplateEthernet();
+        }
+    }
+}
diff --git a/src/com/android/settings/datausage/MockDataPlanUsage.java b/src/com/android/settings/datausage/MockDataPlanUsage.java
new file mode 100644
index 0000000..e3aa97a
--- /dev/null
+++ b/src/com/android/settings/datausage/MockDataPlanUsage.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings.datausage;
+
+import android.graphics.Color;
+
+/**
+ * Mock data plan usage data.
+ */
+@Deprecated // This class is only needed because we don't have working API yet.
+final class MockDataPlanUsage {
+    static final MockDataPlanUsage[] DATA_PLAN_USAGES = new MockDataPlanUsage[3];
+    static final String SYNC_TIME = "Today 12:24pm";
+    final String mUsage;
+    final int mUsageTextColor;
+    final String mName;
+    final double mPercentageUsage;
+    final int mMeterBackgroundColor;
+    final int mMeterConsumedColor;
+    final String mDescription;
+
+    private MockDataPlanUsage(String usage, int usageTextColor, String name,
+            double percentageUsage, int meterBackgroundColor, int meterConsumedColor,
+            String description) {
+        mUsage = usage;
+        mUsageTextColor = usageTextColor;
+        mName = name;
+        mPercentageUsage = percentageUsage;
+        mMeterBackgroundColor = meterBackgroundColor;
+        mMeterConsumedColor = meterConsumedColor;
+        mDescription = description;
+    }
+
+    static MockDataPlanUsage[] getDataPlanUsage() {
+        DATA_PLAN_USAGES[0] = new MockDataPlanUsage("100 MB and 14 days left",
+                Color.parseColor("#FF5C94F1"), "GigaMaxLite / 1GB", 0.27D,
+                Color.parseColor("#FFDBDCDC"), Color.parseColor("#FF5C94F1"),
+                "Premium plan from Telekomsel");
+
+        DATA_PLAN_USAGES[1] = new MockDataPlanUsage("1.25 GB and 14 days left",
+                Color.parseColor("#FF673AB7"), "GigaMaxLite 4G / 5GB", 0.47D,
+                Color.parseColor("#FFDBDCDC"), Color.parseColor("#FF673AB7"),
+                "Plenty of 4G data");
+
+        DATA_PLAN_USAGES[2] = new MockDataPlanUsage("700 MB and 14 days left",
+                Color.parseColor("#FF4CAF50"), "GigaMaxLite Video / 7GB", 0.67D,
+                Color.parseColor("#FFDBDCDC"), Color.parseColor("#FF4CAF50"),
+                "Use certain video apps for free");
+        return DATA_PLAN_USAGES;
+    }
+}
diff --git a/src/com/android/settings/datetime/AutoTimePreferenceController.java b/src/com/android/settings/datetime/AutoTimePreferenceController.java
index fdeef29..0b70f45 100644
--- a/src/com/android/settings/datetime/AutoTimePreferenceController.java
+++ b/src/com/android/settings/datetime/AutoTimePreferenceController.java
@@ -20,12 +20,13 @@
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class AutoTimePreferenceController extends PreferenceController
-        implements Preference.OnPreferenceChangeListener {
+public class AutoTimePreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
 
     private static final String KEY_AUTO_TIME = "auto_time";
     private final UpdateTimeAndDateCallback mCallback;
diff --git a/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java b/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java
index b48e535..8a9568a 100644
--- a/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java
+++ b/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java
@@ -22,10 +22,11 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.Utils;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class AutoTimeZonePreferenceController extends PreferenceController
-        implements Preference.OnPreferenceChangeListener {
+public class AutoTimeZonePreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
 
     private static final String KEY_AUTO_TIME_ZONE = "auto_zone";
 
diff --git a/src/com/android/settings/datetime/DatePreferenceController.java b/src/com/android/settings/datetime/DatePreferenceController.java
index 2a06e5a..9582e9e 100644
--- a/src/com/android/settings/datetime/DatePreferenceController.java
+++ b/src/com/android/settings/datetime/DatePreferenceController.java
@@ -26,12 +26,13 @@
 import android.text.format.DateFormat;
 import android.widget.DatePicker;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.Calendar;
 
-public class DatePreferenceController extends PreferenceController implements
-        DatePickerDialog.OnDateSetListener {
+public class DatePreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, DatePickerDialog.OnDateSetListener {
 
     public interface DatePreferenceHost extends UpdateTimeAndDateCallback {
         void showDatePicker();
diff --git a/src/com/android/settings/datetime/TimeFormatPreferenceController.java b/src/com/android/settings/datetime/TimeFormatPreferenceController.java
index 75fc808..92b3716 100644
--- a/src/com/android/settings/datetime/TimeFormatPreferenceController.java
+++ b/src/com/android/settings/datetime/TimeFormatPreferenceController.java
@@ -25,12 +25,14 @@
 import android.text.TextUtils;
 import android.text.format.DateFormat;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.Calendar;
 import java.util.Date;
 
-public class TimeFormatPreferenceController extends PreferenceController {
+public class TimeFormatPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
 
     static final String HOURS_12 = "12";
     static final String HOURS_24 = "24";
diff --git a/src/com/android/settings/datetime/TimePreferenceController.java b/src/com/android/settings/datetime/TimePreferenceController.java
index 4862588..9bb5689 100644
--- a/src/com/android/settings/datetime/TimePreferenceController.java
+++ b/src/com/android/settings/datetime/TimePreferenceController.java
@@ -25,12 +25,13 @@
 import android.text.format.DateFormat;
 import android.widget.TimePicker;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.Calendar;
 
-public class TimePreferenceController extends PreferenceController implements
-        TimePickerDialog.OnTimeSetListener {
+public class TimePreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, TimePickerDialog.OnTimeSetListener {
 
     public interface TimePreferenceHost extends UpdateTimeAndDateCallback {
         void showTimePicker();
diff --git a/src/com/android/settings/datetime/TimeZonePreferenceController.java b/src/com/android/settings/datetime/TimeZonePreferenceController.java
index f0b604e..987132b 100644
--- a/src/com/android/settings/datetime/TimeZonePreferenceController.java
+++ b/src/com/android/settings/datetime/TimeZonePreferenceController.java
@@ -20,12 +20,14 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.datetime.ZoneGetter;
 
 import java.util.Calendar;
 
-public class TimeZonePreferenceController extends PreferenceController {
+public class TimeZonePreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
 
     private static final String KEY_TIMEZONE = "timezone";
 
diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java
new file mode 100644
index 0000000..261f66c
--- /dev/null
+++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java
@@ -0,0 +1,76 @@
+/**
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * <p>Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT 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.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.format.DateUtils;
+import android.text.format.Formatter;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+/**
+ * Handles the wall of text which appears below the options in the Storage Management settings drill
+ * down.
+ */
+public class AutomaticStorageManagerDescriptionPreferenceController
+        extends AbstractPreferenceController implements PreferenceControllerMixin {
+    private static final String KEY_FREED = "freed_bytes";
+
+    public AutomaticStorageManagerDescriptionPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_FREED;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        Preference preference = screen.findPreference(getPreferenceKey());
+        final Context context = preference.getContext();
+        ContentResolver cr = context.getContentResolver();
+        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 || !isStorageManagerEnabled(cr)) {
+            preference.setSummary(R.string.automatic_storage_manager_text);
+        } else {
+            preference.setSummary(
+                    context.getString(
+                            R.string.automatic_storage_manager_freed_bytes,
+                            Formatter.formatFileSize(context, freedBytes),
+                            DateUtils.formatDateTime(
+                                    context, lastRunMillis, DateUtils.FORMAT_SHOW_DATE)));
+        }
+    }
+
+    private boolean isStorageManagerEnabled(ContentResolver cr) {
+        return Settings.Secure.getInt(cr, Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED, 0)
+                != 0;
+    }
+}
diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
index f7b62b1..e38317a 100644
--- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
+++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
@@ -16,15 +16,13 @@
 
 package com.android.settings.deletionhelper;
 
-import android.app.Activity;
 import android.content.ContentResolver;
+import android.content.Context;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.support.v7.preference.DropDownPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
-import android.text.format.DateUtils;
-import android.text.format.Formatter;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -32,39 +30,34 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
 import com.android.settings.widget.SwitchBar;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * AutomaticStorageManagerSettings is the Settings screen for configuration and management of the
  * automatic storage manager.
  */
-public class AutomaticStorageManagerSettings extends SettingsPreferenceFragment
+public class AutomaticStorageManagerSettings extends DashboardFragment
         implements OnPreferenceChangeListener {
     private static final String KEY_DAYS = "days";
-    private static final String KEY_FREED = "freed_bytes";
-    private static final String STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY =
-            "ro.storage_manager.enabled";
 
     private AutomaticStorageManagerSwitchBarController mSwitchController;
     private DropDownPreference mDaysToRetain;
-    private Preference mFreedBytes;
     private SwitchBar mSwitchBar;
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        addPreferencesFromResource(R.xml.automatic_storage_management_settings);
-    }
-
-    @Override
     public View onCreateView(
             LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = super.onCreateView(inflater, container, savedInstanceState);
 
         initializeDaysToRetainPreference();
-        initializeFreedBytesPreference();
         initializeSwitchBar();
 
         return view;
@@ -98,35 +91,25 @@
                         getFragmentManager());
     }
 
-    private void initializeFreedBytesPreference() {
-        ContentResolver cr = getContentResolver();
-        mFreedBytes = findPreference(KEY_FREED);
-        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 {
-            final 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 isStorageManagerChecked =
-                Settings.Secure.getInt(getContentResolver(),
-                        Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED, 0) != 0;
-        mDaysToRetain.setEnabled(isStorageManagerChecked);
+        mDaysToRetain.setEnabled(isStorageManagerEnabled());
+    }
+
+    @Override
+    protected String getLogTag() {
+        return null;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.automatic_storage_management_settings;
+    }
+
+    @Override
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context);
     }
 
     @Override
@@ -168,4 +151,30 @@
         return indices.length - 1;
     }
 
+    private boolean isStorageManagerEnabled() {
+        return Settings.Secure.getInt(
+                        getContentResolver(), Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED, 0)
+                != 0;
+    }
+
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        controllers.add(new AutomaticStorageManagerDescriptionPreferenceController(context));
+        return controllers;
+    }
+
+    /** For Search. */
+    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+                @Override
+                protected boolean isPageSearchEnabled(Context context) {
+                    return false;
+                }
+
+                @Override
+                public List<AbstractPreferenceController> getPreferenceControllers(
+                        Context context) {
+                    return buildPreferenceControllers(context);
+                }
+            };
 }
diff --git a/src/com/android/settings/development/BugReportInPowerPreferenceController.java b/src/com/android/settings/development/BugReportInPowerPreferenceController.java
index 47b2d0d..4032826 100644
--- a/src/com/android/settings/development/BugReportInPowerPreferenceController.java
+++ b/src/com/android/settings/development/BugReportInPowerPreferenceController.java
@@ -25,9 +25,11 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class BugReportInPowerPreferenceController extends PreferenceController {
+public class BugReportInPowerPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
 
     private static final String KEY_BUGREPORT_IN_POWER = "bugreport_in_power";
 
diff --git a/src/com/android/settings/development/BugReportPreferenceController.java b/src/com/android/settings/development/BugReportPreferenceController.java
index 371fb73..015071f 100644
--- a/src/com/android/settings/development/BugReportPreferenceController.java
+++ b/src/com/android/settings/development/BugReportPreferenceController.java
@@ -21,9 +21,11 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class BugReportPreferenceController extends PreferenceController {
+public class BugReportPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
 
     private static final String KEY_BUGREPORT = "bugreport";
 
diff --git a/src/com/android/settings/development/CameraHalHdrplusPreferenceController.java b/src/com/android/settings/development/CameraHalHdrplusPreferenceController.java
new file mode 100644
index 0000000..84836bc
--- /dev/null
+++ b/src/com/android/settings/development/CameraHalHdrplusPreferenceController.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.widget.Toast;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+public class CameraHalHdrplusPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
+
+    private static final String KEY_CAMERA_HAL_HDRPLUS_SWITCH = "camera_hal_hdrplus_switch";
+    @VisibleForTesting
+    static final String BUILD_TYPE = "ro.build.type";
+    @VisibleForTesting
+    static final String PROPERTY_CAMERA_HAL_HDRPLUS = "persist.camera.hdrplus.enable";
+    @VisibleForTesting
+    static final String ENABLED = "1";
+    @VisibleForTesting
+    static final String DISABLED = "0";
+
+    private SwitchPreference mPreference;
+
+    public CameraHalHdrplusPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        if (isAvailable()) {
+            mPreference = (SwitchPreference) screen.findPreference(KEY_CAMERA_HAL_HDRPLUS_SWITCH);
+            mPreference.setChecked(isHalHdrplusEnabled());
+        }
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_CAMERA_HAL_HDRPLUS_SWITCH;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus);
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updatePreference();
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (KEY_CAMERA_HAL_HDRPLUS_SWITCH.equals(preference.getKey())) {
+            final SwitchPreference switchPreference = (SwitchPreference)preference;
+            SystemProperties.set(PROPERTY_CAMERA_HAL_HDRPLUS,
+                    switchPreference.isChecked() ? ENABLED : DISABLED);
+            Toast.makeText(mContext, R.string.camera_hal_hdrplus_toast,
+                    Toast.LENGTH_LONG).show();
+            return true;
+        }
+        return false;
+    }
+
+    public void enablePreference(boolean enabled) {
+        if (isAvailable()) {
+            mPreference.setEnabled(enabled);
+        }
+    }
+
+    public boolean updatePreference() {
+        if (!isAvailable()) {
+            return false;
+        }
+        final boolean enabled = isHalHdrplusEnabled();
+        mPreference.setChecked(enabled);
+        return enabled;
+    }
+
+    private boolean isHalHdrplusEnabled() {
+        return SystemProperties.getBoolean(PROPERTY_CAMERA_HAL_HDRPLUS, false);
+    }
+}
diff --git a/src/com/android/settings/development/CameraLaserSensorPreferenceController.java b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java
new file mode 100644
index 0000000..26bfc80
--- /dev/null
+++ b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.widget.Toast;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+public class CameraLaserSensorPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
+
+    private static final String KEY_CAMERA_LASER_SENSOR_SWITCH = "camera_laser_sensor_switch";
+    @VisibleForTesting
+    static final String BUILD_TYPE = "ro.build.type";
+    @VisibleForTesting
+    static final String PROPERTY_CAMERA_LASER_SENSOR = "persist.camera.stats.disablehaf";
+    @VisibleForTesting
+    static final int ENABLED = 0;
+    @VisibleForTesting
+    static final int DISABLED = 2;
+
+    private SwitchPreference mPreference;
+
+    public CameraLaserSensorPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = (SwitchPreference) screen.findPreference(KEY_CAMERA_LASER_SENSOR_SWITCH);
+        updatePreference();
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_CAMERA_LASER_SENSOR_SWITCH;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        String buildType = SystemProperties.get(BUILD_TYPE);
+        return mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor) &&
+               (buildType.equals("userdebug") || buildType.equals("eng"));
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updatePreference();
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (KEY_CAMERA_LASER_SENSOR_SWITCH.equals(preference.getKey())) {
+            final SwitchPreference switchPreference = (SwitchPreference)preference;
+            String value = Integer.toString(switchPreference.isChecked() ? ENABLED : DISABLED);
+            SystemProperties.set(PROPERTY_CAMERA_LASER_SENSOR, value);
+            return true;
+        }
+        return false;
+    }
+
+    public void enablePreference(boolean enabled) {
+        if (isAvailable()) {
+            mPreference.setEnabled(enabled);
+        }
+    }
+
+    public boolean updatePreference() {
+        if (!isAvailable()) {
+            return false;
+        }
+        final boolean enabled = isLaserSensorEnabled();
+        mPreference.setChecked(enabled);
+        return enabled;
+    }
+
+    private boolean isLaserSensorEnabled() {
+        String prop = SystemProperties.get(PROPERTY_CAMERA_LASER_SENSOR, Integer.toString(ENABLED));
+        return prop.equals(Integer.toString(ENABLED));
+    }
+}
diff --git a/src/com/android/settings/development/DevelopmentSettings.java b/src/com/android/settings/development/DevelopmentSettings.java
index 23cf4cc..1ffee1b 100644
--- a/src/com/android/settings/development/DevelopmentSettings.java
+++ b/src/com/android/settings/development/DevelopmentSettings.java
@@ -54,6 +54,7 @@
 import android.os.ServiceManager;
 import android.os.StrictMode;
 import android.os.SystemProperties;
+import android.os.UserHandle;
 import android.os.UserManager;
 import android.os.storage.IStorageManager;
 import android.provider.SearchIndexableResource;
@@ -61,6 +62,7 @@
 import android.service.oemlock.OemLockManager;
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
+import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
@@ -96,6 +98,7 @@
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.development.AbstractEnableAdbPreferenceController;
 import com.android.settingslib.drawer.CategoryKey;
 
 import java.util.ArrayList;
@@ -121,7 +124,6 @@
      */
     public static final String PREF_SHOW = "show";
 
-    private static final String ENABLE_ADB = "enable_adb";
     private static final String CLEAR_ADB_KEYS = "clear_adb_keys";
     private static final String ENABLE_TERMINAL = "enable_terminal";
     private static final String KEEP_SCREEN_ON = "keep_screen_on";
@@ -198,24 +200,33 @@
     private static final String FORCE_RESIZABLE_KEY = "force_resizable_activities";
     private static final String COLOR_TEMPERATURE_KEY = "color_temperature";
 
+    private static final String BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_KEY =
+            "bluetooth_show_devices_without_names";
+    private static final String BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY =
+            "persist.bluetooth.showdeviceswithoutnames";
     private static final String BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_KEY =
             "bluetooth_disable_absolute_volume";
     private static final String BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY =
             "persist.bluetooth.disableabsvol";
     private static final String BLUETOOTH_AVRCP_VERSION_PROPERTY =
                                     "persist.bluetooth.avrcpversion";
-    private static final String BLUETOOTH_ENABLE_INBAND_RINGING_PROPERTY =
-                                    "persist.bluetooth.enableinbandringing";
+    private static final String BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY =
+                                    "persist.bluetooth.disableinbandringing";
     private static final String BLUETOOTH_BTSNOOP_ENABLE_PROPERTY =
                                     "persist.bluetooth.btsnoopenable";
 
-    private static final String BLUETOOTH_ENABLE_INBAND_RINGING_KEY = "bluetooth_enable_inband_ringing";
+    static final String BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES_PROPERTY =
+            "persist.bluetooth.maxconnectedaudiodevices";
+
+    private static final String BLUETOOTH_DISABLE_INBAND_RINGING_KEY = "bluetooth_disable_inband_ringing";
     private static final String BLUETOOTH_SELECT_AVRCP_VERSION_KEY = "bluetooth_select_avrcp_version";
     private static final String BLUETOOTH_SELECT_A2DP_CODEC_KEY = "bluetooth_select_a2dp_codec";
     private static final String BLUETOOTH_SELECT_A2DP_SAMPLE_RATE_KEY = "bluetooth_select_a2dp_sample_rate";
     private static final String BLUETOOTH_SELECT_A2DP_BITS_PER_SAMPLE_KEY = "bluetooth_select_a2dp_bits_per_sample";
     private static final String BLUETOOTH_SELECT_A2DP_CHANNEL_MODE_KEY = "bluetooth_select_a2dp_channel_mode";
     private static final String BLUETOOTH_SELECT_A2DP_LDAC_PLAYBACK_QUALITY_KEY = "bluetooth_select_a2dp_ldac_playback_quality";
+    private static final String BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES_KEY =
+            "bluetooth_max_connected_audio_devices";
 
     private static final String PRIVATE_DNS_PREF_KEY = "select_private_dns_configuration";
 
@@ -260,7 +271,7 @@
 
     private boolean mHaveDebugSettings;
     private boolean mDontPokeProperties;
-    private SwitchPreference mEnableAdb;
+    private EnableAdbPreferenceController mEnableAdbController;
     private Preference mClearAdbKeys;
     private SwitchPreference mEnableTerminal;
     private RestrictedSwitchPreference mKeepScreenOn;
@@ -283,8 +294,9 @@
     private SwitchPreference mWifiAggressiveHandover;
     private SwitchPreference mMobileDataAlwaysOn;
     private SwitchPreference mTetheringHardwareOffload;
+    private SwitchPreference mBluetoothShowDevicesWithoutNames;
     private SwitchPreference mBluetoothDisableAbsVolume;
-    private SwitchPreference mBluetoothEnableInbandRinging;
+    private SwitchPreference mBluetoothDisableInbandRinging;
 
     private BluetoothA2dp mBluetoothA2dp;
     private final Object mBluetoothA2dpLock = new Object();
@@ -294,6 +306,7 @@
     private ListPreference mBluetoothSelectA2dpBitsPerSample;
     private ListPreference mBluetoothSelectA2dpChannelMode;
     private ListPreference mBluetoothSelectA2dpLdacPlaybackQuality;
+    private ListPreference mBluetoothSelectMaxConnectedAudioDevices;
 
     private SwitchPreference mOtaDisableAutomaticUpdate;
     private SwitchPreference mWifiAllowScansWithTraffic;
@@ -347,7 +360,6 @@
     // To track whether a confirmation dialog was clicked.
     private boolean mDialogClicked;
     private Dialog mEnableDialog;
-    private Dialog mAdbDialog;
 
     private Dialog mAdbKeysDialog;
     private boolean mUnavailable;
@@ -356,9 +368,14 @@
     private Dialog mLogpersistClearDialog;
     private DashboardFeatureProvider mDashboardFeatureProvider;
     private DevelopmentSettingsEnabler mSettingsEnabler;
+    private DevelopmentSwitchBarController mSwitchBarController;
     private BugReportPreferenceController mBugReportController;
     private BugReportInPowerPreferenceController mBugReportInPowerController;
     private TelephonyMonitorPreferenceController mTelephonyMonitorController;
+    private CameraHalHdrplusPreferenceController mCameraHalHdrplusController;
+    private CameraLaserSensorPreferenceController mCameraLaserSensorController;
+
+    private BroadcastReceiver mEnableAdbReceiver;
 
     public DevelopmentSettings() {
         super(UserManager.DISALLOW_DEBUGGING_FEATURES);
@@ -397,6 +414,8 @@
         mTelephonyMonitorController = new TelephonyMonitorPreferenceController(getActivity());
         mWebViewAppPrefController = new WebViewAppPreferenceController(getActivity());
         mVerifyAppsOverUsbController = new VerifyAppsOverUsbPreferenceController(getActivity());
+        mCameraHalHdrplusController = new CameraHalHdrplusPreferenceController(getActivity());
+        mCameraLaserSensorController = new CameraLaserSensorPreferenceController(getActivity());
 
         setIfOnlyAvailableForAdmins(true);
         if (isUiRestricted() || !Utils.isDeviceProvisioned(getActivity())) {
@@ -411,7 +430,7 @@
 
         final PreferenceGroup debugDebuggingCategory = (PreferenceGroup)
                 findPreference(DEBUG_DEBUGGING_CATEGORY_KEY);
-        mEnableAdb = findAndInitSwitchPref(ENABLE_ADB);
+        mEnableAdbController = new EnableAdbPreferenceController(getActivity());
         mClearAdbKeys = findPreference(CLEAR_ADB_KEYS);
         if (!SystemProperties.getBoolean("ro.adb.secure", false)) {
             if (debugDebuggingCategory != null) {
@@ -429,6 +448,10 @@
         mBugReportInPowerController.displayPreference(getPreferenceScreen());
         mTelephonyMonitorController.displayPreference(getPreferenceScreen());
         mWebViewAppPrefController.displayPreference(getPreferenceScreen());
+        mCameraHalHdrplusController.displayPreference(getPreferenceScreen());
+        mEnableAdbController.displayPreference(getPreferenceScreen());
+
+        mCameraLaserSensorController.displayPreference(getPreferenceScreen());
 
         mKeepScreenOn = (RestrictedSwitchPreference) findAndInitSwitchPref(KEEP_SCREEN_ON);
         mBtHciSnoopLog = findAndInitSwitchPref(BT_HCI_SNOOP_LOG);
@@ -444,7 +467,6 @@
         mAllPrefs.add(mPassword);
 
         if (!mUm.isAdminUser()) {
-            disableForUser(mEnableAdb);
             disableForUser(mClearAdbKeys);
             disableForUser(mEnableTerminal);
             disableForUser(mPassword);
@@ -494,11 +516,13 @@
             mLogpersist = null;
         }
         mUsbConfiguration = addListPreference(USB_CONFIGURATION_KEY);
+        mBluetoothShowDevicesWithoutNames =
+                findAndInitSwitchPref(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_KEY);
         mBluetoothDisableAbsVolume = findAndInitSwitchPref(BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_KEY);
-        mBluetoothEnableInbandRinging = findAndInitSwitchPref(BLUETOOTH_ENABLE_INBAND_RINGING_KEY);
+        mBluetoothDisableInbandRinging = findAndInitSwitchPref(BLUETOOTH_DISABLE_INBAND_RINGING_KEY);
         if (!BluetoothHeadset.isInbandRingingSupported(getContext())) {
-            removePreference(mBluetoothEnableInbandRinging);
-            mBluetoothEnableInbandRinging = null;
+            removePreference(mBluetoothDisableInbandRinging);
+            mBluetoothDisableInbandRinging = null;
         }
 
         mBluetoothSelectAvrcpVersion = addListPreference(BLUETOOTH_SELECT_AVRCP_VERSION_KEY);
@@ -507,6 +531,7 @@
         mBluetoothSelectA2dpBitsPerSample = addListPreference(BLUETOOTH_SELECT_A2DP_BITS_PER_SAMPLE_KEY);
         mBluetoothSelectA2dpChannelMode = addListPreference(BLUETOOTH_SELECT_A2DP_CHANNEL_MODE_KEY);
         mBluetoothSelectA2dpLdacPlaybackQuality = addListPreference(BLUETOOTH_SELECT_A2DP_LDAC_PLAYBACK_QUALITY_KEY);
+        mBluetoothSelectMaxConnectedAudioDevices = addListPreference(BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES_KEY);
         initBluetoothConfigurationValues();
 
         updatePrivateDnsSummary();
@@ -621,15 +646,9 @@
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        final SettingsActivity activity = (SettingsActivity) getActivity();
-
-        mSwitchBar = activity.getSwitchBar();
-        if (mUnavailable) {
-            mSwitchBar.setEnabled(false);
-            return;
-        }
-
-        mSwitchBar.addOnSwitchChangeListener(this);
+        mSwitchBar = ((SettingsActivity) getActivity()).getSwitchBar();
+        mSwitchBarController = new DevelopmentSwitchBarController(
+                this /* DevelopmentSettings */, mSwitchBar, !mUnavailable,  getLifecycle());
     }
 
     private boolean removePreferenceForProduction(Preference preference) {
@@ -651,9 +670,12 @@
             Preference pref = mAllPrefs.get(i);
             pref.setEnabled(enabled && !mDisabledPrefs.contains(pref));
         }
+        mEnableAdbController.enablePreference(enabled);
         mBugReportInPowerController.enablePreference(enabled);
         mTelephonyMonitorController.enablePreference(enabled);
         mWebViewAppPrefController.enablePreference(enabled);
+        mCameraHalHdrplusController.enablePreference(enabled);
+        mCameraLaserSensorController.enablePreference(enabled);
         updateAllOptions();
     }
 
@@ -733,6 +755,17 @@
             updateBluetoothA2dpConfigurationValues();
         }
 
+        mEnableAdbReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                mVerifyAppsOverUsbController.updatePreference();
+                updateBugreportOptions();
+            }
+        };
+        LocalBroadcastManager.getInstance(getContext())
+                .registerReceiver(mEnableAdbReceiver, new IntentFilter(
+                        AbstractEnableAdbPreferenceController.ACTION_ENABLE_ADB_STATE_CHANGED));
+
         return super.onCreateView(inflater, container, savedInstanceState);
     }
 
@@ -743,8 +776,6 @@
         if (mUnavailable) {
             return;
         }
-        mSwitchBar.removeOnSwitchChangeListener(this);
-        mSwitchBar.hide();
         getActivity().unregisterReceiver(mUsbReceiver);
         getActivity().unregisterReceiver(mBluetoothA2dpReceiver);
         BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
@@ -752,6 +783,11 @@
             adapter.closeProfileProxy(BluetoothProfile.A2DP, mBluetoothA2dp);
             mBluetoothA2dp = null;
         }
+
+        if (mEnableAdbReceiver != null) {
+            LocalBroadcastManager.getInstance(getContext()).unregisterReceiver(mEnableAdbReceiver);
+            mEnableAdbReceiver = null;
+        }
     }
 
     void updateSwitchPreference(SwitchPreference switchPreference, boolean value) {
@@ -763,8 +799,9 @@
         final Context context = getActivity();
         final ContentResolver cr = context.getContentResolver();
         mHaveDebugSettings = false;
-        updateSwitchPreference(mEnableAdb, Settings.Global.getInt(cr,
-                Settings.Global.ADB_ENABLED, 0) != 0);
+        final Preference enableAdb = findPreference(mEnableAdbController.getPreferenceKey());
+        mEnableAdbController.updateState(enableAdb);
+        mHaveDebugSettings |= mEnableAdbController.haveDebugSettings();
         if (mEnableTerminal != null) {
             updateSwitchPreference(mEnableTerminal,
                     context.getPackageManager().getApplicationEnabledSetting(TERMINAL_APP_PACKAGE)
@@ -772,6 +809,8 @@
         }
         mHaveDebugSettings |= mBugReportInPowerController.updatePreference();
         mHaveDebugSettings |= mTelephonyMonitorController.updatePreference();
+        mHaveDebugSettings |= mCameraHalHdrplusController.updatePreference();
+        mHaveDebugSettings |= mCameraLaserSensorController.updatePreference();
         updateSwitchPreference(mKeepScreenOn, Settings.Global.getInt(cr,
                 Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0) != 0);
         updateSwitchPreference(mBtHciSnoopLog, SystemProperties.getBoolean(
@@ -824,8 +863,9 @@
         if (mColorTemperaturePreference != null) {
             updateColorTemperature();
         }
+        updateBluetoothShowDevicesWithoutUserFriendlyNameOptions();
         updateBluetoothDisableAbsVolumeOptions();
-        updateBluetoothEnableInbandRingingOptions();
+        updateBluetoothDisableInbandRingingOptions();
         updateBluetoothA2dpConfigurationValues();
         updatePrivateDnsSummary();
     }
@@ -840,6 +880,7 @@
             }
         }
         mBugReportInPowerController.resetPreference();
+        mEnableAdbController.resetPreference();
         resetDebuggerOptions();
         writeLogpersistOption(null, true);
         writeLogdSizeOption(null);
@@ -878,14 +919,17 @@
     }
 
     private void updatePasswordSummary() {
-        try {
-            if (mBackupManager.hasBackupPassword()) {
-                mPassword.setSummary(R.string.local_backup_password_summary_change);
-            } else {
-                mPassword.setSummary(R.string.local_backup_password_summary_none);
+        mPassword.setEnabled(mBackupManager != null);
+        if (mBackupManager != null) {
+            try {
+                if (mBackupManager.hasBackupPassword()) {
+                    mPassword.setSummary(R.string.local_backup_password_summary_change);
+                } else {
+                    mPassword.setSummary(R.string.local_backup_password_summary_none);
+                }
+            } catch (RemoteException e) {
+                // Not much we can do here
             }
-        } catch (RemoteException e) {
-            // Not much we can do here
         }
     }
 
@@ -1025,8 +1069,19 @@
         return context.getSystemService(Context.OEM_LOCK_SERVICE) != null;
     }
 
+    /**
+     * Returns whether OEM unlock is allowed by the user and carrier.
+     *
+     * This does not take into account any restrictions imposed by the device policy.
+     */
+    private boolean isOemUnlockAllowedByUserAndCarrier() {
+        final UserHandle userHandle = UserHandle.of(UserHandle.myUserId());
+        return mOemLockManager.isOemUnlockAllowedByCarrier()
+                && !mUm.hasBaseUserRestriction(UserManager.DISALLOW_FACTORY_RESET, userHandle);
+    }
+
     private boolean enableOemUnlockPreference() {
-        return !isBootloaderUnlocked() && mOemLockManager.canUserAllowOemUnlock();
+        return !isBootloaderUnlocked() && isOemUnlockAllowedByUserAndCarrier();
     }
 
     private void updateOemUnlockOptions() {
@@ -1040,10 +1095,6 @@
                 // Check restriction, disable mEnableOemUnlock and apply policy transparency.
                 mEnableOemUnlock.checkRestrictionAndSetDisabled(UserManager.DISALLOW_FACTORY_RESET);
             }
-            if (mEnableOemUnlock.isEnabled()) {
-                // Check restriction, disable mEnableOemUnlock and apply policy transparency.
-                mEnableOemUnlock.checkRestrictionAndSetDisabled(UserManager.DISALLOW_OEM_UNLOCK);
-            }
         }
     }
 
@@ -1454,6 +1505,17 @@
         mWifiManager.setAllowScansWithTraffic(mWifiAllowScansWithTraffic.isChecked() ? 1 : 0);
     }
 
+    private void updateBluetoothShowDevicesWithoutUserFriendlyNameOptions() {
+        updateSwitchPreference(mBluetoothShowDevicesWithoutNames,
+                SystemProperties.getBoolean(
+                        BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, false));
+    }
+
+    private void writeBluetoothShowDevicesWithoutUserFriendlyNameOptions() {
+        SystemProperties.set(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY,
+                mBluetoothShowDevicesWithoutNames.isChecked() ? "true" : "false");
+    }
+
     private void updateBluetoothDisableAbsVolumeOptions() {
         updateSwitchPreference(mBluetoothDisableAbsVolume,
                 SystemProperties.getBoolean(BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY, false));
@@ -1464,17 +1526,17 @@
                 mBluetoothDisableAbsVolume.isChecked() ? "true" : "false");
     }
 
-    private void updateBluetoothEnableInbandRingingOptions() {
-        if (mBluetoothEnableInbandRinging != null) {
-            updateSwitchPreference(mBluetoothEnableInbandRinging,
-                SystemProperties.getBoolean(BLUETOOTH_ENABLE_INBAND_RINGING_PROPERTY, true));
+    private void updateBluetoothDisableInbandRingingOptions() {
+        if (mBluetoothDisableInbandRinging != null) {
+            updateSwitchPreference(mBluetoothDisableInbandRinging,
+                SystemProperties.getBoolean(BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY, false));
         }
     }
 
-    private void writeBluetoothEnableInbandRingingOptions() {
-        if (mBluetoothEnableInbandRinging != null) {
-            SystemProperties.set(BLUETOOTH_ENABLE_INBAND_RINGING_PROPERTY,
-                mBluetoothEnableInbandRinging.isChecked() ? "true" : "false");
+    private void writeBluetoothDisableInbandRingingOptions() {
+        if (mBluetoothDisableInbandRinging != null) {
+            SystemProperties.set(BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY,
+                mBluetoothDisableInbandRinging.isChecked() ? "true" : "false");
         }
     }
 
@@ -1803,6 +1865,13 @@
         index = 3;
         mBluetoothSelectA2dpLdacPlaybackQuality.setValue(values[index]);
         mBluetoothSelectA2dpLdacPlaybackQuality.setSummary(summaries[index]);
+
+        // Init the maximum connected devices - Default
+        values = getResources().getStringArray(R.array.bluetooth_max_connected_audio_devices_values);
+        summaries = getResources().getStringArray(R.array.bluetooth_max_connected_audio_devices);
+        index = 0;
+        mBluetoothSelectMaxConnectedAudioDevices.setValue(values[index]);
+        mBluetoothSelectMaxConnectedAudioDevices.setSummary(summaries[index]);
     }
 
     private void writeBluetoothAvrcpVersion(Object newValue) {
@@ -1971,6 +2040,15 @@
         }
     }
 
+    private void writeBluetoothMaxConnectedAudioDevices(Object newValue) {
+        SystemProperties.set(BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES_PROPERTY, newValue.toString());
+        int index = mBluetoothSelectMaxConnectedAudioDevices.findIndexOfValue(newValue.toString());
+        if (index >= 0) {
+            String[] titles = getResources().getStringArray(R.array.bluetooth_max_connected_audio_devices);
+            mBluetoothSelectMaxConnectedAudioDevices.setSummary(titles[index]);
+        }
+    }
+
     private void writeBluetoothConfigurationOption(Preference preference,
                                                    Object newValue) {
         String[] summaries;
@@ -2422,24 +2500,19 @@
             return true;
         }
 
-        if (preference == mEnableAdb) {
-            if (mEnableAdb.isChecked()) {
-                mDialogClicked = false;
-                if (mAdbDialog != null) dismissDialogs();
-                mAdbDialog = new AlertDialog.Builder(getActivity()).setMessage(
-                        getActivity().getResources().getString(R.string.adb_warning_message))
-                        .setTitle(R.string.adb_warning_title)
-                        .setPositiveButton(android.R.string.yes, this)
-                        .setNegativeButton(android.R.string.no, this)
-                        .show();
-                mAdbDialog.setOnDismissListener(this);
-            } else {
-                Settings.Global.putInt(getActivity().getContentResolver(),
-                        Settings.Global.ADB_ENABLED, 0);
-                mVerifyAppsOverUsbController.updatePreference();
-                updateBugreportOptions();
-            }
-        } else if (preference == mClearAdbKeys) {
+        if (mCameraHalHdrplusController.handlePreferenceTreeClick(preference)) {
+            return true;
+        }
+
+        if (mEnableAdbController.handlePreferenceTreeClick(preference)) {
+            return true;
+        }
+
+        if (mCameraLaserSensorController.handlePreferenceTreeClick(preference)) {
+            return true;
+        }
+
+        if (preference == mClearAdbKeys) {
             if (mAdbKeysDialog != null) dismissDialogs();
             mAdbKeysDialog = new AlertDialog.Builder(getActivity())
                     .setMessage(R.string.adb_keys_warning_message)
@@ -2534,10 +2607,12 @@
             writeUSBAudioOptions();
         } else if (preference == mForceResizable) {
             writeForceResizableOptions();
+        } else if (preference == mBluetoothShowDevicesWithoutNames) {
+            writeBluetoothShowDevicesWithoutUserFriendlyNameOptions();
         } else if (preference == mBluetoothDisableAbsVolume) {
             writeBluetoothDisableAbsVolumeOptions();
-        } else if (preference == mBluetoothEnableInbandRinging) {
-            writeBluetoothEnableInbandRingingOptions();
+        } else if (preference == mBluetoothDisableInbandRinging) {
+            writeBluetoothDisableInbandRingingOptions();
         } else if (SHORTCUT_MANAGER_RESET_KEY.equals(preference.getKey())) {
             resetShortcutManagerThrottling();
         } else {
@@ -2569,6 +2644,9 @@
                    (preference == mBluetoothSelectA2dpLdacPlaybackQuality)) {
             writeBluetoothConfigurationOption(preference, newValue);
             return true;
+        } else if (preference == mBluetoothSelectMaxConnectedAudioDevices) {
+            writeBluetoothMaxConnectedAudioDevices(newValue);
+            return true;
         } else if (preference == mLogdSize) {
             writeLogdSizeOption(newValue);
             return true;
@@ -2613,10 +2691,7 @@
     }
 
     private void dismissDialogs() {
-        if (mAdbDialog != null) {
-            mAdbDialog.dismiss();
-            mAdbDialog = null;
-        }
+        mEnableAdbController.dismissDialogs();
         if (mAdbKeysDialog != null) {
             mAdbKeysDialog.dismiss();
             mAdbKeysDialog = null;
@@ -2632,18 +2707,7 @@
     }
 
     public void onClick(DialogInterface dialog, int which) {
-        if (dialog == mAdbDialog) {
-            if (which == DialogInterface.BUTTON_POSITIVE) {
-                mDialogClicked = true;
-                Settings.Global.putInt(getActivity().getContentResolver(),
-                        Settings.Global.ADB_ENABLED, 1);
-                mVerifyAppsOverUsbController.updatePreference();
-                updateBugreportOptions();
-            } else {
-                // Reset the toggle
-                mEnableAdb.setChecked(false);
-            }
-        } else if (dialog == mAdbKeysDialog) {
+        if (dialog == mAdbKeysDialog) {
             if (which == DialogInterface.BUTTON_POSITIVE) {
                 try {
                     IBinder b = ServiceManager.getService(Context.USB_SERVICE);
@@ -2673,12 +2737,7 @@
 
     public void onDismiss(DialogInterface dialog) {
         // Assuming that onClick gets called first
-        if (dialog == mAdbDialog) {
-            if (!mDialogClicked) {
-                mEnableAdb.setChecked(false);
-            }
-            mAdbDialog = null;
-        } else if (dialog == mEnableDialog) {
+        if (dialog == mEnableDialog) {
             if (!mDialogClicked) {
                 mSwitchBar.setChecked(false);
             }
@@ -2827,7 +2886,7 @@
                 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 (!mOemLockManager.canUserAllowOemUnlock()) {
+            } else if (!isOemUnlockAllowedByUserAndCarrier()) {
                 // If the device isn't SIM-locked but OEM unlock is disallowed by some party, this
                 // means either some other carrier restriction is in place or the device hasn't been
                 // able to confirm which restrictions (SIM-lock or otherwise) apply.
diff --git a/src/com/android/settings/development/DevelopmentSettingsEnabler.java b/src/com/android/settings/development/DevelopmentSettingsEnabler.java
index 7132631..ed750e4 100644
--- a/src/com/android/settings/development/DevelopmentSettingsEnabler.java
+++ b/src/com/android/settings/development/DevelopmentSettingsEnabler.java
@@ -34,6 +34,7 @@
         mContext = context;
         mDevelopmentPreferences = context.getSharedPreferences(DevelopmentSettings.PREF_FILE,
                 Context.MODE_PRIVATE);
+        updateEnabledState();
         if (lifecycle != null) {
             lifecycle.addObserver(this);
         }
@@ -41,8 +42,7 @@
 
     @Override
     public void onResume() {
-        mLastEnabledState = Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;
+        updateEnabledState();
     }
 
     public static boolean enableDevelopmentSettings(Context context, SharedPreferences prefs) {
@@ -53,6 +53,11 @@
                 Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
     }
 
+    private void updateEnabledState() {
+        mLastEnabledState = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;
+    }
+
     public boolean getLastEnabledState() {
         return mLastEnabledState;
     }
diff --git a/src/com/android/settings/development/DevelopmentSwitchBarController.java b/src/com/android/settings/development/DevelopmentSwitchBarController.java
new file mode 100644
index 0000000..168f7c0
--- /dev/null
+++ b/src/com/android/settings/development/DevelopmentSwitchBarController.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import com.android.settings.Utils;
+import com.android.settings.widget.SwitchBar;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+public class DevelopmentSwitchBarController implements LifecycleObserver, OnStart, OnStop {
+
+    private final SwitchBar mSwitchBar;
+    private final boolean mIsAvailable;
+    private final DevelopmentSettings mSettings;
+
+    public DevelopmentSwitchBarController(DevelopmentSettings settings, SwitchBar switchBar,
+            boolean isAvailable, Lifecycle lifecycle) {
+        mSwitchBar = switchBar;
+        mIsAvailable = isAvailable && !Utils.isMonkeyRunning();
+        mSettings = settings;
+
+        if (mIsAvailable) {
+            lifecycle.addObserver(this);
+        } else {
+            mSwitchBar.setEnabled(false);
+        }
+    }
+
+    @Override
+    public void onStart() {
+        mSwitchBar.addOnSwitchChangeListener(mSettings);
+    }
+
+    @Override
+    public void onStop() {
+        mSwitchBar.removeOnSwitchChangeListener(mSettings);
+    }
+}
diff --git a/src/com/android/settings/development/EnableAdbPreferenceController.java b/src/com/android/settings/development/EnableAdbPreferenceController.java
new file mode 100644
index 0000000..a159f0a
--- /dev/null
+++ b/src/com/android/settings/development/EnableAdbPreferenceController.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.AbstractEnableAdbPreferenceController;
+
+public class EnableAdbPreferenceController extends AbstractEnableAdbPreferenceController
+        implements PreferenceControllerMixin {
+
+    private Dialog mAdbDialog;
+    private boolean mDialogClicked;
+
+    public EnableAdbPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void showConfirmationDialog(SwitchPreference preference) {
+        mDialogClicked = false;
+        dismissDialogs();
+        mAdbDialog = new AlertDialog.Builder(mContext).setMessage(
+                mContext.getString(R.string.adb_warning_message))
+                .setTitle(R.string.adb_warning_title)
+                .setPositiveButton(android.R.string.yes, (dialog, which) -> {
+                    mDialogClicked = true;
+                    writeAdbSetting(true);
+                })
+                .setNegativeButton(android.R.string.no, (dialog, which) -> {
+                    preference.setChecked(false);
+                })
+                .show();
+        mAdbDialog.setOnDismissListener(dialog -> {
+            // Assuming that onClick gets called first
+            if (!mDialogClicked) {
+                preference.setChecked(false);
+            }
+            mAdbDialog = null;
+        });
+    }
+
+    public void dismissDialogs() {
+        if (mAdbDialog != null) {
+            mAdbDialog.dismiss();
+            mAdbDialog = null;
+        }
+    }
+}
diff --git a/src/com/android/settings/development/OWNERS b/src/com/android/settings/development/OWNERS
new file mode 100644
index 0000000..9ffcc47
--- /dev/null
+++ b/src/com/android/settings/development/OWNERS
@@ -0,0 +1,8 @@
+# Default reviewers for this and subdirectories.
+asargent@google.com
+dling@google.com
+zhfan@google.com
+
+# Emergency approvers in case the above are not available
+asapperstein@google.com
+miket@google.com
diff --git a/src/com/android/settings/development/TelephonyMonitorPreferenceController.java b/src/com/android/settings/development/TelephonyMonitorPreferenceController.java
index c21ccda..fd6825e 100644
--- a/src/com/android/settings/development/TelephonyMonitorPreferenceController.java
+++ b/src/com/android/settings/development/TelephonyMonitorPreferenceController.java
@@ -24,10 +24,12 @@
 import android.widget.Toast;
 
 import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.R;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class TelephonyMonitorPreferenceController extends PreferenceController {
+public class TelephonyMonitorPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
 
     private static final String KEY_TELEPHONY_MONITOR_SWITCH = "telephony_monitor_switch";
     @VisibleForTesting
diff --git a/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java
index c0bb0c7..d7891c7 100644
--- a/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java
+++ b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java
@@ -27,17 +27,19 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.List;
 
 /**
  * Controller to manage the state of "Verify apps over USB" toggle.
  */
-public class VerifyAppsOverUsbPreferenceController extends PreferenceController {
+public class VerifyAppsOverUsbPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
     private static final String VERIFY_APPS_OVER_USB_KEY = "verify_apps_over_usb";
     private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive";
 
diff --git a/src/com/android/settings/deviceinfo/AdditionalSystemUpdatePreferenceController.java b/src/com/android/settings/deviceinfo/AdditionalSystemUpdatePreferenceController.java
index 8d35eca..06bdb3f 100644
--- a/src/com/android/settings/deviceinfo/AdditionalSystemUpdatePreferenceController.java
+++ b/src/com/android/settings/deviceinfo/AdditionalSystemUpdatePreferenceController.java
@@ -16,11 +16,12 @@
 package com.android.settings.deviceinfo;
 
 import android.content.Context;
-import android.support.v7.preference.Preference;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class AdditionalSystemUpdatePreferenceController extends PreferenceController {
+public class AdditionalSystemUpdatePreferenceController extends
+        AbstractPreferenceController implements PreferenceControllerMixin {
 
     private static final String KEY_UPDATE_SETTING = "additional_system_update_settings";
 
diff --git a/src/com/android/settings/deviceinfo/BasebandVersionPreferenceController.java b/src/com/android/settings/deviceinfo/BasebandVersionPreferenceController.java
index 1153d12..018a068 100644
--- a/src/com/android/settings/deviceinfo/BasebandVersionPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/BasebandVersionPreferenceController.java
@@ -21,9 +21,11 @@
 
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class BasebandVersionPreferenceController extends PreferenceController {
+public class BasebandVersionPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
 
     private static final String BASEBAND_PROPERTY = "gsm.version.baseband";
     private static final String KEY_BASEBAND_VERSION = "baseband_version";
diff --git a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
index 9232838..a25bb53 100644
--- a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
@@ -25,6 +25,7 @@
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
+import android.text.BidiFormatter;
 import android.text.TextUtils;
 import android.util.Pair;
 import android.widget.Toast;
@@ -32,19 +33,20 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.development.DevelopmentSettings;
 import com.android.settings.development.DevelopmentSettingsEnabler;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
-public class BuildNumberPreferenceController extends PreferenceController
-        implements LifecycleObserver, OnResume {
+public class BuildNumberPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin, LifecycleObserver, OnResume {
 
     static final int TAPS_TO_BE_A_DEVELOPER = 7;
     static final int REQUEST_CONFIRM_PASSWORD_FOR_DEV_PREF = 100;
@@ -80,7 +82,7 @@
         final Preference preference = screen.findPreference(KEY_BUILD_NUMBER);
         if (preference != null) {
             try {
-                preference.setSummary(Build.DISPLAY);
+                preference.setSummary(BidiFormatter.getInstance().unicodeWrap(Build.DISPLAY));
                 preference.setEnabled(true);
             } catch (Exception e) {
                 preference.setSummary(R.string.device_info_default);
@@ -115,6 +117,9 @@
         if (!TextUtils.equals(preference.getKey(), KEY_BUILD_NUMBER)) {
             return false;
         }
+        if (Utils.isMonkeyRunning()) {
+            return false;
+        }
         // Don't enable developer options for secondary users.
         if (!mUm.isAdminUser()) {
             mMetricsFeatureProvider.action(
diff --git a/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java b/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java
index ac3870a..f1dc415 100644
--- a/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java
@@ -22,10 +22,12 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.DeviceInfoUtils;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class DeviceModelPreferenceController extends PreferenceController {
+public class DeviceModelPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
 
     private static final String KEY_DEVICE_MODEL = "device_model";
 
diff --git a/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java b/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java
index 4f8de71..f3d7380 100644
--- a/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java
@@ -22,9 +22,11 @@
 import android.text.TextUtils;
 
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class FccEquipmentIdPreferenceController extends PreferenceController {
+public class FccEquipmentIdPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
 
 
     private static final String PROPERTY_EQUIPMENT_ID = "ro.ril.fccid";
diff --git a/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java b/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java
index ed61a92..2d8941d 100644
--- a/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java
@@ -21,10 +21,12 @@
 import android.support.v7.preference.Preference;
 import android.text.TextUtils;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.DeviceInfoUtils;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class FeedbackPreferenceController extends PreferenceController {
+public class FeedbackPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
     private static final String KEY_DEVICE_FEEDBACK = "device_feedback";
 
     private final Fragment mHost;
diff --git a/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceController.java b/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceController.java
index 1b56301..fd73ed5 100644
--- a/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceController.java
@@ -26,15 +26,16 @@
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
 
-public class FirmwareVersionPreferenceController extends PreferenceController
-        implements LifecycleObserver, OnResume {
+public class FirmwareVersionPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin, LifecycleObserver, OnResume {
 
     private static final String TAG = "FirmwareVersionPref";
     private static final String KEY_FIRMWARE_VERSION = "firmware_version";
diff --git a/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java b/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java
index 3a84c1e..5afed9c 100644
--- a/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java
@@ -18,10 +18,12 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.DeviceInfoUtils;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class KernelVersionPreferenceController extends PreferenceController {
+public class KernelVersionPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
 
     private static final String KEY_KERNEL_VERSION = "kernel_version";
 
diff --git a/src/com/android/settings/deviceinfo/ManualPreferenceController.java b/src/com/android/settings/deviceinfo/ManualPreferenceController.java
index dbaa00f..20464a5 100644
--- a/src/com/android/settings/deviceinfo/ManualPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/ManualPreferenceController.java
@@ -19,9 +19,11 @@
 import android.content.Context;
 
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class ManualPreferenceController extends PreferenceController {
+public class ManualPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
 
     private static final String KEY_MANUAL = "manual";
 
diff --git a/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceController.java b/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceController.java
index f82fd0b..c925c27 100644
--- a/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceController.java
@@ -19,9 +19,11 @@
 import android.content.Intent;
 import android.provider.Settings;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class RegulatoryInfoPreferenceController extends PreferenceController {
+public class RegulatoryInfoPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
 
     private static final String KEY_REGULATORY_INFO = "regulatory_info";
     private static final Intent INTENT_PROBE = new Intent(Settings.ACTION_SHOW_REGULATORY_INFO);
diff --git a/src/com/android/settings/deviceinfo/SELinuxStatusPreferenceController.java b/src/com/android/settings/deviceinfo/SELinuxStatusPreferenceController.java
index b8529d2..058992f 100644
--- a/src/com/android/settings/deviceinfo/SELinuxStatusPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/SELinuxStatusPreferenceController.java
@@ -23,9 +23,11 @@
 import android.text.TextUtils;
 
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class SELinuxStatusPreferenceController extends PreferenceController {
+public class SELinuxStatusPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
 
     private static final String PROPERTY_SELINUX_STATUS = "ro.build.selinux";
     private static final String KEY_SELINUX_STATUS = "selinux_status";
diff --git a/src/com/android/settings/deviceinfo/SafetyInfoPreferenceController.java b/src/com/android/settings/deviceinfo/SafetyInfoPreferenceController.java
index bde4dd0..10dbd19 100644
--- a/src/com/android/settings/deviceinfo/SafetyInfoPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/SafetyInfoPreferenceController.java
@@ -19,9 +19,11 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class SafetyInfoPreferenceController extends PreferenceController {
+public class SafetyInfoPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
 
     private static final Intent INTENT_PROBE =
             new Intent("android.settings.SHOW_SAFETY_AND_REGULATORY_INFO");
diff --git a/src/com/android/settings/deviceinfo/SafetyLegalPreferenceController.java b/src/com/android/settings/deviceinfo/SafetyLegalPreferenceController.java
index c158d64..c402046 100644
--- a/src/com/android/settings/deviceinfo/SafetyLegalPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/SafetyLegalPreferenceController.java
@@ -19,9 +19,11 @@
 import android.os.SystemProperties;
 import android.text.TextUtils;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class SafetyLegalPreferenceController extends PreferenceController {
+public class SafetyLegalPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
 
     private static final String KEY_SAFETY_LEGAL = "safetylegal";
     private static final String PROPERTY_URL_SAFETYLEGAL = "ro.url.safetylegal";
diff --git a/src/com/android/settings/deviceinfo/SecurityPatchPreferenceController.java b/src/com/android/settings/deviceinfo/SecurityPatchPreferenceController.java
index 64a1159..f38602a 100644
--- a/src/com/android/settings/deviceinfo/SecurityPatchPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/SecurityPatchPreferenceController.java
@@ -22,10 +22,12 @@
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.DeviceInfoUtils;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class SecurityPatchPreferenceController extends PreferenceController {
+public class SecurityPatchPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
 
     private static final String KEY_SECURITY_PATCH = "security_patch";
     private static final String TAG = "SecurityPatchPref";
diff --git a/src/com/android/settings/deviceinfo/SerialNumberPreferenceController.java b/src/com/android/settings/deviceinfo/SerialNumberPreferenceController.java
index 0362bbc..b69844d 100644
--- a/src/com/android/settings/deviceinfo/SerialNumberPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/SerialNumberPreferenceController.java
@@ -23,9 +23,11 @@
 import android.text.TextUtils;
 
 import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class SerialNumberPreferenceController extends PreferenceController {
+public class SerialNumberPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
 
     private static final String KEY_SERIAL_NUMBER = "serial_number";
 
diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java
index c3d3547..2cc76e7 100644
--- a/src/com/android/settings/deviceinfo/SimStatus.java
+++ b/src/com/android/settings/deviceinfo/SimStatus.java
@@ -406,6 +406,12 @@
         if (!mShowLatestAreaInfo) {
             removePreferenceFromScreen(KEY_LATEST_AREA_INFO);
         }
+
+        boolean hideSignalStrength = carrierConfig.getBoolean(
+                CarrierConfigManager.KEY_HIDE_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL);
+        if (hideSignalStrength) {
+            removePreferenceFromScreen(KEY_SIGNAL_STRENGTH);
+        }
     }
 
     private void updatePhoneInfos() {
diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java
index faa4134..228774f 100644
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -32,6 +32,7 @@
 import android.os.SystemClock;
 import android.os.SystemProperties;
 import android.os.UserManager;
+import android.provider.SearchIndexableResource;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 import android.telephony.CarrierConfigManager;
@@ -44,13 +45,17 @@
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
 
 import java.lang.ref.WeakReference;
+import java.util.Arrays;
+import java.util.List;
 
 import static android.content.Context.CONNECTIVITY_SERVICE;
 import static android.content.Context.WIFI_SERVICE;
 
-public class Status extends SettingsPreferenceFragment {
+public class Status extends SettingsPreferenceFragment implements Indexable {
 
     private static final String KEY_BATTERY_STATUS = "battery_status";
     private static final String KEY_BATTERY_LEVEL = "battery_level";
@@ -330,4 +335,19 @@
 
         return h + ":" + pad(m) + ":" + pad(s);
     }
+
+    /**
+     * For Search.
+     */
+    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(
+                        Context context, boolean enabled) {
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = R.xml.device_info_status;
+                    return Arrays.asList(sir);
+                }
+            };
 }
diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
index b5a7b3b..a63247c 100644
--- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
+++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
@@ -38,9 +38,9 @@
 import com.android.settings.applications.PackageManagerWrapperImpl;
 import com.android.settings.applications.UserManagerWrapper;
 import com.android.settings.applications.UserManagerWrapperImpl;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.deviceinfo.storage.AutomaticStorageManagementSwitchPreferenceController;
+import com.android.settings.deviceinfo.storage.CachedStorageValuesHelper;
 import com.android.settings.deviceinfo.storage.SecondaryUserController;
 import com.android.settings.deviceinfo.storage.StorageAsyncLoader;
 import com.android.settings.deviceinfo.storage.StorageItemPreferenceController;
@@ -50,6 +50,7 @@
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settingslib.applications.StorageStatsSource;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.deviceinfo.PrivateStorageInfo;
 import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
 
@@ -68,11 +69,12 @@
     private VolumeInfo mVolume;
     private PrivateStorageInfo mStorageInfo;
     private SparseArray<StorageAsyncLoader.AppsStorageResult> mAppsResult;
+    private CachedStorageValuesHelper mCachedStorageValuesHelper;
 
     private StorageSummaryDonutPreferenceController mSummaryController;
     private StorageItemPreferenceController mPreferenceController;
     private PrivateVolumeOptionMenuController mOptionMenuController;
-    private List<PreferenceController> mSecondaryUsers;
+    private List<AbstractPreferenceController> mSecondaryUsers;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -102,15 +104,17 @@
     @Override
     public void onViewCreated(View v, Bundle savedInstanceState) {
         super.onViewCreated(v, savedInstanceState);
-        setLoading(true, false);
+        initializeCacheProvider();
+        maybeSetLoading(isQuotaSupported());
     }
 
     @Override
     public void onResume() {
         super.onResume();
         getLoaderManager().restartLoader(STORAGE_JOB_ID, Bundle.EMPTY, this);
+        getLoaderManager()
+                .restartLoader(VOLUME_SIZE_JOB_ID, Bundle.EMPTY, new VolumeSizeCallbacks());
         getLoaderManager().initLoader(ICON_JOB_ID, Bundle.EMPTY, new IconLoaderCallbacks());
-        getLoaderManager().initLoader(VOLUME_SIZE_JOB_ID, Bundle.EMPTY, new VolumeSizeCallbacks());
     }
 
     @Override
@@ -119,21 +123,23 @@
     }
 
     private void onReceivedSizes() {
-        if (mStorageInfo == null || mAppsResult == null) {
-            return;
+        if (mStorageInfo != null) {
+            long privateUsedBytes = mStorageInfo.totalBytes - mStorageInfo.freeBytes;
+            mSummaryController.updateBytes(privateUsedBytes, mStorageInfo.totalBytes);
+            mPreferenceController.setVolume(mVolume);
+            mPreferenceController.setUsedSize(privateUsedBytes);
+            mPreferenceController.setTotalSize(mStorageInfo.totalBytes);
+            for (int i = 0, size = mSecondaryUsers.size(); i < size; i++) {
+                AbstractPreferenceController controller = mSecondaryUsers.get(i);
+                if (controller instanceof SecondaryUserController) {
+                    SecondaryUserController userController = (SecondaryUserController) controller;
+                    userController.setTotalSize(mStorageInfo.totalBytes);
+                }
+            }
         }
 
-        long privateUsedBytes = mStorageInfo.totalBytes - mStorageInfo.freeBytes;
-        mSummaryController.updateBytes(privateUsedBytes, mStorageInfo.totalBytes);
-        mPreferenceController.setVolume(mVolume);
-        mPreferenceController.setUsedSize(privateUsedBytes);
-        mPreferenceController.setTotalSize(mStorageInfo.totalBytes);
-        for (int i = 0, size = mSecondaryUsers.size(); i < size; i++) {
-            PreferenceController controller = mSecondaryUsers.get(i);
-            if (controller instanceof SecondaryUserController) {
-                SecondaryUserController userController = (SecondaryUserController) controller;
-                userController.setTotalSize(mStorageInfo.totalBytes);
-            }
+        if (mAppsResult == null) {
+            return;
         }
 
         mPreferenceController.onLoadFinished(mAppsResult, UserHandle.myUserId());
@@ -161,8 +167,8 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
-        final List<PreferenceController> controllers = new ArrayList<>();
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         mSummaryController = new StorageSummaryDonutPreferenceController(context);
         controllers.add(mSummaryController);
 
@@ -192,10 +198,10 @@
     /**
      * Updates the secondary user controller sizes.
      */
-    private void updateSecondaryUserControllers(List<PreferenceController> controllers,
+    private void updateSecondaryUserControllers(List<AbstractPreferenceController> controllers,
             SparseArray<StorageAsyncLoader.AppsStorageResult> stats) {
         for (int i = 0, size = controllers.size(); i < size; i++) {
-            PreferenceController controller = controllers.get(i);
+            AbstractPreferenceController controller = controllers.get(i);
             if (controller instanceof StorageAsyncLoader.ResultHandler) {
                 StorageAsyncLoader.ResultHandler userController =
                         (StorageAsyncLoader.ResultHandler) controller;
@@ -218,11 +224,11 @@
                 }
 
                 @Override
-                public List<PreferenceController> getPreferenceControllers(Context context) {
+                public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
                     final StorageManager sm = context.getSystemService(StorageManager.class);
                     final UserManagerWrapper userManager =
                             new UserManagerWrapperImpl(context.getSystemService(UserManager.class));
-                    final List<PreferenceController> controllers = new ArrayList<>();
+                    final List<AbstractPreferenceController> controllers = new ArrayList<>();
                     controllers.add(new StorageSummaryDonutPreferenceController(context));
                     controllers.add(new StorageItemPreferenceController(context, null /* host */,
                             null /* volume */, new StorageManagerVolumeProvider(sm)));
@@ -248,6 +254,7 @@
     public void onLoadFinished(Loader<SparseArray<StorageAsyncLoader.AppsStorageResult>> loader,
             SparseArray<StorageAsyncLoader.AppsStorageResult> data) {
         mAppsResult = data;
+        maybeCacheFreshValues();
         onReceivedSizes();
     }
 
@@ -255,6 +262,73 @@
     public void onLoaderReset(Loader<SparseArray<StorageAsyncLoader.AppsStorageResult>> loader) {
     }
 
+    @VisibleForTesting
+    public void setCachedStorageValuesHelper(CachedStorageValuesHelper helper) {
+        mCachedStorageValuesHelper = helper;
+    }
+
+    @VisibleForTesting
+    public PrivateStorageInfo getPrivateStorageInfo() {
+        return mStorageInfo;
+    }
+
+    @VisibleForTesting
+    public void setPrivateStorageInfo(PrivateStorageInfo info) {
+        mStorageInfo = info;
+    }
+
+    @VisibleForTesting
+    public SparseArray<StorageAsyncLoader.AppsStorageResult> getAppsStorageResult() {
+        return mAppsResult;
+    }
+
+    @VisibleForTesting
+    public void setAppsStorageResult(SparseArray<StorageAsyncLoader.AppsStorageResult> info) {
+        mAppsResult = info;
+    }
+
+    @VisibleForTesting
+    public void initializeCachedValues() {
+        PrivateStorageInfo info = mCachedStorageValuesHelper.getCachedPrivateStorageInfo();
+        SparseArray<StorageAsyncLoader.AppsStorageResult> loaderResult =
+                mCachedStorageValuesHelper.getCachedAppsStorageResult();
+        if (info == null || loaderResult == null) {
+            return;
+        }
+
+        mStorageInfo = info;
+        mAppsResult = loaderResult;
+    }
+
+    @VisibleForTesting
+    public void maybeSetLoading(boolean isQuotaSupported) {
+        // If we have fast stats, we load until both have loaded.
+        // If we have slow stats, we load when we get the total volume sizes.
+        if ((isQuotaSupported && (mStorageInfo == null || mAppsResult == null)) ||
+                (!isQuotaSupported && mStorageInfo == null)) {
+            setLoading(true /* loading */, false /* animate */);
+        }
+    }
+
+    private void initializeCacheProvider() {
+        mCachedStorageValuesHelper =
+                new CachedStorageValuesHelper(getContext(), UserHandle.myUserId());
+        initializeCachedValues();
+        onReceivedSizes();
+    }
+
+    private void maybeCacheFreshValues() {
+        if (mStorageInfo != null && mAppsResult != null) {
+            mCachedStorageValuesHelper.cacheResult(
+                    mStorageInfo, mAppsResult.get(UserHandle.myUserId()));
+        }
+    }
+
+    private boolean isQuotaSupported() {
+        final StorageStatsManager stats = getActivity().getSystemService(StorageStatsManager.class);
+        return stats.isQuotaSupported(mVolume.fsUuid);
+    }
+
     /**
      * IconLoaderCallbacks exists because StorageDashboardFragment already implements
      * LoaderCallbacks for a different type.
@@ -307,6 +381,7 @@
             }
 
             mStorageInfo = privateStorageInfo;
+            maybeCacheFreshValues();
             onReceivedSizes();
         }
     }
diff --git a/src/com/android/settings/deviceinfo/StorageItemPreference.java b/src/com/android/settings/deviceinfo/StorageItemPreference.java
index 3dcf935..d0114e3 100644
--- a/src/com/android/settings/deviceinfo/StorageItemPreference.java
+++ b/src/com/android/settings/deviceinfo/StorageItemPreference.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.icu.util.MeasureUnit;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
@@ -51,7 +52,7 @@
                 FileSizeFormatter.formatFileSize(
                         getContext(),
                         size,
-                        getGigabyteSuffix(getContext().getResources()),
+                        MeasureUnit.GIGABYTE,
                         FileSizeFormatter.GIGABYTE_IN_BYTES));
         if (total == 0) {
             mProgressPercent = 0;
@@ -75,8 +76,4 @@
         updateProgressBar();
         super.onBindViewHolder(view);
     }
-
-    private static int getGigabyteSuffix(Resources res) {
-        return res.getIdentifier("gigabyteShort", "string", "android");
-    }
 }
diff --git a/src/com/android/settings/deviceinfo/StorageProfileFragment.java b/src/com/android/settings/deviceinfo/StorageProfileFragment.java
index f5129ed..9f3ce0c 100644
--- a/src/com/android/settings/deviceinfo/StorageProfileFragment.java
+++ b/src/com/android/settings/deviceinfo/StorageProfileFragment.java
@@ -32,12 +32,12 @@
 import com.android.settings.Utils;
 import com.android.settings.applications.PackageManagerWrapperImpl;
 import com.android.settings.applications.UserManagerWrapperImpl;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.deviceinfo.storage.StorageAsyncLoader;
 import com.android.settings.deviceinfo.storage.StorageAsyncLoader.AppsStorageResult;
 import com.android.settings.deviceinfo.storage.StorageItemPreferenceController;
 import com.android.settingslib.applications.StorageStatsSource;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
 
 import java.util.ArrayList;
@@ -98,11 +98,16 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
-        final List<PreferenceController> controllers = new ArrayList<>();
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         final StorageManager sm = context.getSystemService(StorageManager.class);
-        mPreferenceController = new StorageItemPreferenceController(context, this,
-                mVolume, new StorageManagerVolumeProvider(sm));
+        mPreferenceController =
+                new StorageItemPreferenceController(
+                        context,
+                        this,
+                        mVolume,
+                        new StorageManagerVolumeProvider(sm),
+                        /* isWorkProfile */ true);
         controllers.add(mPreferenceController);
         return controllers;
     }
diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java
index db68bac..a3ed940 100644
--- a/src/com/android/settings/deviceinfo/StorageSettings.java
+++ b/src/com/android/settings/deviceinfo/StorageSettings.java
@@ -608,16 +608,6 @@
                     result.add(data);
 
                     data = new SearchIndexableRaw(context);
-                    data.title = context.getString(R.string.memory_downloads_usage);
-                    data.screenTitle = context.getString(R.string.storage_settings);
-                    result.add(data);
-
-                    data = new SearchIndexableRaw(context);
-                    data.title = context.getString(R.string.memory_media_cache_usage);
-                    data.screenTitle = context.getString(R.string.storage_settings);
-                    result.add(data);
-
-                    data = new SearchIndexableRaw(context);
                     data.title = context.getString(R.string.memory_media_misc_usage);
                     data.screenTitle = context.getString(R.string.storage_settings);
                     result.add(data);
diff --git a/src/com/android/settings/deviceinfo/SystemUpdatePreferenceController.java b/src/com/android/settings/deviceinfo/SystemUpdatePreferenceController.java
index c2e2ad8..d2ad6d8 100644
--- a/src/com/android/settings/deviceinfo/SystemUpdatePreferenceController.java
+++ b/src/com/android/settings/deviceinfo/SystemUpdatePreferenceController.java
@@ -28,11 +28,13 @@
 
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import static android.content.Context.CARRIER_CONFIG_SERVICE;
 
-public class SystemUpdatePreferenceController extends PreferenceController {
+public class SystemUpdatePreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
 
     private static final String TAG = "SysUpdatePrefContr";
 
diff --git a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
index 3e81fc7..717d765 100644
--- a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
@@ -16,25 +16,27 @@
 
 package com.android.settings.deviceinfo.storage;
 
+import android.app.ActivityManager;
 import android.app.FragmentManager;
 import android.content.Context;
 import android.os.SystemProperties;
 import android.provider.Settings;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.PreferenceScreen;
-
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.deletionhelper.ActivationWarningFragment;
 import com.android.settings.widget.MasterSwitchController;
 import com.android.settings.widget.MasterSwitchPreference;
 import com.android.settings.widget.SwitchWidgetController;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
-public class AutomaticStorageManagementSwitchPreferenceController extends PreferenceController
-        implements LifecycleObserver, OnResume, SwitchWidgetController.OnSwitchChangeListener {
+public class AutomaticStorageManagementSwitchPreferenceController extends
+        AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver,
+        OnResume, SwitchWidgetController.OnSwitchChangeListener {
     private static final String KEY_TOGGLE_ASM = "toggle_asm";
     @VisibleForTesting
     static final String STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY = "ro.storage_manager.enabled";
@@ -59,7 +61,7 @@
 
     @Override
     public boolean isAvailable() {
-        return true;
+        return !ActivityManager.isLowRamDeviceStatic();
     }
 
     @Override
@@ -69,6 +71,9 @@
 
     @Override
     public void onResume() {
+        if (!isAvailable()) {
+            return;
+        }
         boolean isStorageManagerEnabled = Settings.Secure.getInt(mContext.getContentResolver(),
                 Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED, 0) != 0;
         mSwitch.setChecked(isStorageManagerEnabled);
diff --git a/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelper.java b/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelper.java
new file mode 100644
index 0000000..8225db3
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelper.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo.storage;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.util.SparseArray;
+
+import com.android.settingslib.applications.StorageStatsSource;
+import com.android.settingslib.deviceinfo.PrivateStorageInfo;
+
+import java.util.concurrent.TimeUnit;
+
+public class CachedStorageValuesHelper {
+
+    @VisibleForTesting public static final String SHARED_PREFERENCES_NAME = "CachedStorageValues";
+    public static final String TIMESTAMP_KEY = "last_query_timestamp";
+    public static final String FREE_BYTES_KEY = "free_bytes";
+    public static final String TOTAL_BYTES_KEY = "total_bytes";
+    public static final String GAME_APPS_SIZE_KEY = "game_apps_size";
+    public static final String MUSIC_APPS_SIZE_KEY = "music_apps_size";
+    public static final String VIDEO_APPS_SIZE_KEY = "video_apps_size";
+    public static final String PHOTO_APPS_SIZE_KEY = "photo_apps_size";
+    public static final String OTHER_APPS_SIZE_KEY = "other_apps_size";
+    public static final String CACHE_APPS_SIZE_KEY = "cache_apps_size";
+    public static final String EXTERNAL_TOTAL_BYTES = "external_total_bytes";
+    public static final String EXTERNAL_AUDIO_BYTES = "external_audio_bytes";
+    public static final String EXTERNAL_VIDEO_BYTES = "external_video_bytes";
+    public static final String EXTERNAL_IMAGE_BYTES = "external_image_bytes";
+    public static final String EXTERNAL_APP_BYTES = "external_apps_bytes";
+    public static final String USER_ID_KEY = "user_id";
+    private final Long mClobberThreshold;
+    private final SharedPreferences mSharedPreferences;
+    private final int mUserId;
+    // This clock is used to provide the time. By default, it uses the system clock, but can be
+    // replaced for test purposes.
+    protected Clock mClock;
+
+    public CachedStorageValuesHelper(Context context, int userId) {
+        mSharedPreferences =
+                context.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE);
+        mClock = new Clock();
+        mUserId = userId;
+        mClobberThreshold =
+                Settings.Global.getLong(
+                        context.getContentResolver(),
+                        Settings.Global.STORAGE_SETTINGS_CLOBBER_THRESHOLD,
+                        TimeUnit.MINUTES.toMillis(5));
+    }
+
+    public PrivateStorageInfo getCachedPrivateStorageInfo() {
+        if (!isDataValid()) {
+            return null;
+        }
+        final long freeBytes = mSharedPreferences.getLong(FREE_BYTES_KEY, -1);
+        final long totalBytes = mSharedPreferences.getLong(TOTAL_BYTES_KEY, -1);
+        if (freeBytes < 0 || totalBytes < 0) {
+            return null;
+        }
+
+        return new PrivateStorageInfo(freeBytes, totalBytes);
+    }
+
+    public SparseArray<StorageAsyncLoader.AppsStorageResult> getCachedAppsStorageResult() {
+        if (!isDataValid()) {
+            return null;
+        }
+        final long gamesSize = mSharedPreferences.getLong(GAME_APPS_SIZE_KEY, -1);
+        final long musicAppsSize = mSharedPreferences.getLong(MUSIC_APPS_SIZE_KEY, -1);
+        final long videoAppsSize = mSharedPreferences.getLong(VIDEO_APPS_SIZE_KEY, -1);
+        final long photoAppSize = mSharedPreferences.getLong(PHOTO_APPS_SIZE_KEY, -1);
+        final long otherAppsSize = mSharedPreferences.getLong(OTHER_APPS_SIZE_KEY, -1);
+        final long cacheSize = mSharedPreferences.getLong(CACHE_APPS_SIZE_KEY, -1);
+        if (gamesSize < 0
+                || musicAppsSize < 0
+                || videoAppsSize < 0
+                || photoAppSize < 0
+                || otherAppsSize < 0
+                || cacheSize < 0) {
+            return null;
+        }
+
+        final long externalTotalBytes = mSharedPreferences.getLong(EXTERNAL_TOTAL_BYTES, -1);
+        final long externalAudioBytes = mSharedPreferences.getLong(EXTERNAL_AUDIO_BYTES, -1);
+        final long externalVideoBytes = mSharedPreferences.getLong(EXTERNAL_VIDEO_BYTES, -1);
+        final long externalImageBytes = mSharedPreferences.getLong(EXTERNAL_IMAGE_BYTES, -1);
+        final long externalAppBytes = mSharedPreferences.getLong(EXTERNAL_APP_BYTES, -1);
+        if (externalTotalBytes < 0
+                || externalAudioBytes < 0
+                || externalVideoBytes < 0
+                || externalImageBytes < 0
+                || externalAppBytes < 0) {
+            return null;
+        }
+
+        final StorageStatsSource.ExternalStorageStats externalStats =
+                new StorageStatsSource.ExternalStorageStats(
+                        externalTotalBytes,
+                        externalAudioBytes,
+                        externalVideoBytes,
+                        externalImageBytes,
+                        externalAppBytes);
+        final StorageAsyncLoader.AppsStorageResult result =
+                new StorageAsyncLoader.AppsStorageResult();
+        result.gamesSize = gamesSize;
+        result.musicAppsSize = musicAppsSize;
+        result.videoAppsSize = videoAppsSize;
+        result.photosAppsSize = photoAppSize;
+        result.otherAppsSize = otherAppsSize;
+        result.cacheSize = cacheSize;
+        result.externalStats = externalStats;
+        final SparseArray<StorageAsyncLoader.AppsStorageResult> resultArray = new SparseArray<>();
+        resultArray.append(mUserId, result);
+        return resultArray;
+    }
+
+    public void cacheResult(
+            PrivateStorageInfo storageInfo, StorageAsyncLoader.AppsStorageResult result) {
+        mSharedPreferences
+                .edit()
+                .putLong(FREE_BYTES_KEY, storageInfo.freeBytes)
+                .putLong(TOTAL_BYTES_KEY, storageInfo.totalBytes)
+                .putLong(GAME_APPS_SIZE_KEY, result.gamesSize)
+                .putLong(MUSIC_APPS_SIZE_KEY, result.musicAppsSize)
+                .putLong(VIDEO_APPS_SIZE_KEY, result.videoAppsSize)
+                .putLong(PHOTO_APPS_SIZE_KEY, result.photosAppsSize)
+                .putLong(OTHER_APPS_SIZE_KEY, result.otherAppsSize)
+                .putLong(CACHE_APPS_SIZE_KEY, result.cacheSize)
+                .putLong(EXTERNAL_TOTAL_BYTES, result.externalStats.totalBytes)
+                .putLong(EXTERNAL_AUDIO_BYTES, result.externalStats.audioBytes)
+                .putLong(EXTERNAL_VIDEO_BYTES, result.externalStats.videoBytes)
+                .putLong(EXTERNAL_IMAGE_BYTES, result.externalStats.imageBytes)
+                .putLong(EXTERNAL_APP_BYTES, result.externalStats.appBytes)
+                .putInt(USER_ID_KEY, mUserId)
+                .putLong(TIMESTAMP_KEY, mClock.getCurrentTime())
+                .apply();
+    }
+
+    private boolean isDataValid() {
+        final int cachedUserId = mSharedPreferences.getInt(USER_ID_KEY, -1);
+        if (cachedUserId != mUserId) {
+            return false;
+        }
+
+        final long lastQueryTime = mSharedPreferences.getLong(TIMESTAMP_KEY, Long.MAX_VALUE);
+        final long currentTime = mClock.getCurrentTime();
+        return currentTime - lastQueryTime < mClobberThreshold;
+    }
+
+    /** Clock provides the current time. */
+    static class Clock {
+        public long getCurrentTime() {
+            return System.currentTimeMillis();
+        }
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java b/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java
index dec0964..3c69ab1 100644
--- a/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java
+++ b/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java
@@ -28,8 +28,9 @@
 
 import com.android.settings.Utils;
 import com.android.settings.applications.UserManagerWrapper;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.deviceinfo.StorageItemPreference;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -38,8 +39,9 @@
  * SecondaryUserController controls the preferences on the Storage screen which had to do with
  * secondary users.
  */
-public class SecondaryUserController extends PreferenceController
-        implements StorageAsyncLoader.ResultHandler, UserIconLoader.UserIconHandler {
+public class SecondaryUserController extends AbstractPreferenceController implements
+        PreferenceControllerMixin, StorageAsyncLoader.ResultHandler,
+        UserIconLoader.UserIconHandler {
     // PreferenceGroupKey to try to add our preference onto.
     private static final String TARGET_PREFERENCE_GROUP_KEY = "pref_secondary_users";
     private static final String PREFERENCE_KEY_BASE = "pref_user_";
@@ -58,9 +60,9 @@
      * @param context Context for initializing the preference controllers.
      * @param userManager UserManagerWrapper for figuring out which controllers to add.
      */
-    public static List<PreferenceController> getSecondaryUserControllers(
+    public static List<AbstractPreferenceController> getSecondaryUserControllers(
             Context context, UserManagerWrapper userManager) {
-        List<PreferenceController> controllers = new ArrayList<>();
+        List<AbstractPreferenceController> controllers = new ArrayList<>();
         UserInfo primaryUser = userManager.getPrimaryUser();
         boolean addedUser = false;
         List<UserInfo> infos = userManager.getUsers();
@@ -89,7 +91,7 @@
 
     /**
      * Constructor for a given secondary user.
-     * @param context Context to initialize the underlying {@link PreferenceController}.
+     * @param context Context to initialize the underlying {@link AbstractPreferenceController}.
      * @param info {@link UserInfo} for the secondary user which this controllers covers.
      */
     @VisibleForTesting
@@ -175,7 +177,8 @@
         }
     }
 
-    private static class NoSecondaryUserController extends PreferenceController {
+    private static class NoSecondaryUserController extends AbstractPreferenceController implements
+            PreferenceControllerMixin {
         public NoSecondaryUserController(Context context) {
             super(context);
         }
diff --git a/src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java b/src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java
index 630df85..f92a24e 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java
@@ -18,6 +18,7 @@
 
 import static android.content.pm.ApplicationInfo.CATEGORY_AUDIO;
 import static android.content.pm.ApplicationInfo.CATEGORY_GAME;
+import static android.content.pm.ApplicationInfo.CATEGORY_IMAGE;
 import static android.content.pm.ApplicationInfo.CATEGORY_VIDEO;
 
 import android.content.Context;
@@ -134,6 +135,9 @@
                 case CATEGORY_VIDEO:
                     result.videoAppsSize += blamedSize;
                     break;
+                case CATEGORY_IMAGE:
+                    result.photosAppsSize += blamedSize;
+                    break;
                 default:
                     // The deprecated game flag does not set the category.
                     if ((app.flags & ApplicationInfo.FLAG_IS_GAME) != 0) {
@@ -163,6 +167,7 @@
     public static class AppsStorageResult {
         public long gamesSize;
         public long musicAppsSize;
+        public long photosAppsSize;
         public long videoAppsSize;
         public long otherAppsSize;
         public long cacheSize;
diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
index cebd114..7f2cc33 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
@@ -20,7 +20,6 @@
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.net.TrafficStats;
@@ -38,11 +37,12 @@
 import com.android.settings.Settings;
 import com.android.settings.Utils;
 import com.android.settings.applications.ManageApplications;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.deviceinfo.PrivateVolumeSettings.SystemInfoFragment;
 import com.android.settings.deviceinfo.StorageItemPreference;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.deviceinfo.StorageMeasurement;
 import com.android.settingslib.deviceinfo.StorageVolumeProvider;
 
@@ -54,10 +54,10 @@
  * StorageItemPreferenceController handles the storage line items which summarize the storage
  * categorization breakdown.
  */
-public class StorageItemPreferenceController extends PreferenceController {
+public class StorageItemPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
     private static final String TAG = "StorageItemPreference";
 
-    private static final String IMAGE_MIME_TYPE = "image/*";
     private static final String SYSTEM_FRAGMENT_TAG = "SystemInfo";
 
     @VisibleForTesting
@@ -91,6 +91,7 @@
     private StorageItemPreference mAppPreference;
     private StorageItemPreference mFilePreference;
     private StorageItemPreference mSystemPreference;
+    private boolean mIsWorkProfile;
 
     private static final String AUTHORITY_MEDIA = "com.android.providers.media.documents";
 
@@ -104,6 +105,16 @@
         mUserId = UserHandle.myUserId();
     }
 
+    public StorageItemPreferenceController(
+            Context context,
+            Fragment hostFragment,
+            VolumeInfo volume,
+            StorageVolumeProvider svp,
+            boolean isWorkProfile) {
+        this(context, hostFragment, volume, svp);
+        mIsWorkProfile = isWorkProfile;
+    }
+
     @Override
     public boolean isAvailable() {
         return true;
@@ -196,29 +207,24 @@
     public void setUserId(UserHandle userHandle) {
         mUserId = userHandle.getIdentifier();
 
-        PackageManager pm = mContext.getPackageManager();
-        badgePreference(pm, userHandle, mPhotoPreference);
-        badgePreference(pm, userHandle, mMoviesPreference);
-        badgePreference(pm, userHandle, mAudioPreference);
-        badgePreference(pm, userHandle, mGamePreference);
-        badgePreference(pm, userHandle, mAppPreference);
-        badgePreference(pm, userHandle, mSystemPreference);
-        badgePreference(pm, userHandle, mFilePreference);
+        tintPreference(mPhotoPreference);
+        tintPreference(mMoviesPreference);
+        tintPreference(mAudioPreference);
+        tintPreference(mGamePreference);
+        tintPreference(mAppPreference);
+        tintPreference(mSystemPreference);
+        tintPreference(mFilePreference);
     }
 
-    private void badgePreference(PackageManager pm, UserHandle userHandle, Preference preference) {
+    private void tintPreference(Preference preference) {
         if (preference != null) {
-            Drawable currentIcon = preference.getIcon();
-            // Sigh... Applying the badge to the icon clobbers the tint on the base drawable.
-            // For some reason, re-applying it here means the tint remains.
-            currentIcon = applyTint(mContext, currentIcon);
-            preference.setIcon(pm.getUserBadgedIcon(currentIcon, userHandle));
+            preference.setIcon(applyTint(mContext, preference.getIcon()));
         }
     }
 
     private static Drawable applyTint(Context context, Drawable icon) {
         TypedArray array =
-                context.obtainStyledAttributes(new int[]{android.R.attr.colorControlNormal});
+                context.obtainStyledAttributes(new int[] {android.R.attr.colorControlNormal});
         icon = icon.mutate();
         icon.setTint(array.getColor(0, 0));
         array.recycle();
@@ -246,7 +252,8 @@
         // TODO(b/35927909): Figure out how to split out apps which are only installed for work
         //       profiles in order to attribute those app's code bytes only to that profile.
         mPhotoPreference.setStorageSize(
-                data.externalStats.imageBytes + data.externalStats.videoBytes, mTotalSize);
+                data.photosAppsSize + data.externalStats.imageBytes + data.externalStats.videoBytes,
+                mTotalSize);
         mAudioPreference.setStorageSize(
                 data.musicAppsSize + data.externalStats.audioBytes, mTotalSize);
         mGamePreference.setStorageSize(data.gamesSize, mTotalSize);
@@ -267,10 +274,12 @@
             long attributedSize = 0;
             for (int i = 0; i < result.size(); i++) {
                 final StorageAsyncLoader.AppsStorageResult otherData = result.valueAt(i);
-                attributedSize += otherData.gamesSize
-                        + otherData.musicAppsSize
-                        + otherData.videoAppsSize
-                        + otherData.otherAppsSize;
+                attributedSize +=
+                        otherData.gamesSize
+                                + otherData.musicAppsSize
+                                + otherData.videoAppsSize
+                                + otherData.photosAppsSize
+                                + otherData.otherAppsSize;
                 attributedSize += otherData.externalStats.totalBytes
                         - otherData.externalStats.appBytes;
             }
@@ -304,12 +313,21 @@
     }
 
     private Intent getPhotosIntent() {
-        Intent intent = new Intent();
-        intent.setAction(android.content.Intent.ACTION_VIEW);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
-        intent.setType(IMAGE_MIME_TYPE);
-        intent.putExtra(Intent.EXTRA_FROM_STORAGE, true);
-        return intent;
+        Bundle args = getWorkAnnotatedBundle(2);
+        args.putString(
+                ManageApplications.EXTRA_CLASSNAME, Settings.PhotosStorageActivity.class.getName());
+        args.putInt(
+                ManageApplications.EXTRA_STORAGE_TYPE,
+                ManageApplications.STORAGE_TYPE_PHOTOS_VIDEOS);
+        return Utils.onBuildStartFragmentIntent(
+                mContext,
+                ManageApplications.class.getName(),
+                args,
+                null,
+                R.string.storage_photos_videos,
+                null,
+                false,
+                mMetricsFeatureProvider.getMetricsCategory(mFragment));
     }
 
     private Intent getAudioIntent() {
@@ -317,7 +335,7 @@
             return null;
         }
 
-        Bundle args = new Bundle();
+        Bundle args = getWorkAnnotatedBundle(4);
         args.putString(ManageApplications.EXTRA_CLASSNAME,
                 Settings.StorageUseActivity.class.getName());
         args.putString(ManageApplications.EXTRA_VOLUME_UUID, mVolume.getFsUuid());
@@ -333,7 +351,7 @@
             return null;
         }
 
-        Bundle args = new Bundle();
+        Bundle args = getWorkAnnotatedBundle(3);
         args.putString(ManageApplications.EXTRA_CLASSNAME,
                 Settings.StorageUseActivity.class.getName());
         args.putString(ManageApplications.EXTRA_VOLUME_UUID, mVolume.getFsUuid());
@@ -344,7 +362,7 @@
     }
 
     private Intent getGamesIntent() {
-        Bundle args = new Bundle(1);
+        Bundle args = getWorkAnnotatedBundle(1);
         args.putString(ManageApplications.EXTRA_CLASSNAME,
                 Settings.GamesStorageActivity.class.getName());
         return Utils.onBuildStartFragmentIntent(mContext,
@@ -353,7 +371,7 @@
     }
 
     private Intent getMoviesIntent() {
-        Bundle args = new Bundle(1);
+        Bundle args = getWorkAnnotatedBundle(1);
         args.putString(ManageApplications.EXTRA_CLASSNAME,
                 Settings.MoviesStorageActivity.class.getName());
         return Utils.onBuildStartFragmentIntent(mContext,
@@ -361,6 +379,13 @@
                 null, false, mMetricsFeatureProvider.getMetricsCategory(mFragment));
     }
 
+    private Bundle getWorkAnnotatedBundle(int additionalCapacity) {
+        Bundle args = new Bundle(2 + additionalCapacity);
+        args.putBoolean(ManageApplications.EXTRA_WORK_ONLY, mIsWorkProfile);
+        args.putInt(ManageApplications.EXTRA_WORK_ID, mUserId);
+        return args;
+    }
+
     private Intent getFilesIntent() {
         return mSvp.findEmulatedForPrivate(mVolume).buildBrowseIntent();
     }
diff --git a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java
index 91c4a6b..24fd2ee 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java
@@ -24,14 +24,16 @@
 import android.text.format.Formatter;
 
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.deviceinfo.StorageVolumeProvider;
 
 /**
  * StorgaeSummaryPreferenceController updates the donut storage summary preference to have the
  * correct sizes showing.
  */
-public class StorageSummaryDonutPreferenceController extends PreferenceController {
+public class StorageSummaryDonutPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
     private long mUsedBytes;
     private long mTotalBytes;
     private StorageSummaryDonutPreference mSummary;
diff --git a/src/com/android/settings/deviceinfo/storage/UserProfileController.java b/src/com/android/settings/deviceinfo/storage/UserProfileController.java
index fc297ca..cf1e360 100644
--- a/src/com/android/settings/deviceinfo/storage/UserProfileController.java
+++ b/src/com/android/settings/deviceinfo/storage/UserProfileController.java
@@ -19,6 +19,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.UserInfo;
+import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.storage.VolumeInfo;
@@ -30,14 +31,17 @@
 import com.android.internal.util.Preconditions;
 import com.android.settings.Utils;
 import com.android.settings.applications.UserManagerWrapper;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.deviceinfo.StorageItemPreference;
 import com.android.settings.deviceinfo.StorageProfileFragment;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.drawer.SettingsDrawerActivity;
 
-/** Defines a {@link PreferenceController} which handles a single profile of the primary user. */
-public class UserProfileController extends PreferenceController
-        implements StorageAsyncLoader.ResultHandler, UserIconLoader.UserIconHandler {
+/** Defines a {@link AbstractPreferenceController} which handles a single profile of the primary
+ *  user. */
+public class UserProfileController extends AbstractPreferenceController implements
+        PreferenceControllerMixin, StorageAsyncLoader.ResultHandler,
+        UserIconLoader.UserIconHandler {
     private static final String PREFERENCE_KEY_BASE = "pref_profile_";
     private StorageItemPreference mStoragePreference;
     private UserManagerWrapper mUserManager;
@@ -123,7 +127,14 @@
     public void handleUserIcons(SparseArray<Drawable> fetchedIcons) {
         Drawable userIcon = fetchedIcons.get(mUser.id);
         if (userIcon != null) {
-            mStoragePreference.setIcon(userIcon);
+            mStoragePreference.setIcon(applyTint(mContext, userIcon));
         }
     }
+
+    private static Drawable applyTint(Context context, Drawable icon) {
+        icon = icon.mutate();
+        icon.setTint(Utils.getColorAttr(context, android.R.attr.colorControlNormal));
+        return icon;
+    }
+
 }
diff --git a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
index b80f655..280098d 100644
--- a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
+++ b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
@@ -24,13 +24,15 @@
 
 import com.android.internal.hardware.AmbientDisplayConfiguration;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.search.DatabaseIndexingUtils;
 import com.android.settings.search.InlineSwitchPayload;
 import com.android.settings.search.ResultPayload;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class AmbientDisplayAlwaysOnPreferenceController extends PreferenceController
-        implements Preference.OnPreferenceChangeListener {
+public class AmbientDisplayAlwaysOnPreferenceController extends
+        AbstractPreferenceController implements PreferenceControllerMixin,
+        Preference.OnPreferenceChangeListener {
 
     private final int ON = 1;
     private final int OFF = 0;
diff --git a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
index ac99d71..c1af133 100644
--- a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
+++ b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
@@ -23,17 +23,19 @@
 
 import com.android.internal.hardware.AmbientDisplayConfiguration;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.search.DatabaseIndexingUtils;
 import com.android.settings.search.InlineSwitchPayload;
 import com.android.settings.search.ResultPayload;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import static android.provider.Settings.Secure.DOZE_ENABLED;
 import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_AMBIENT_DISPLAY;
 
-public class AmbientDisplayNotificationsPreferenceController extends PreferenceController
-        implements Preference.OnPreferenceChangeListener {
+public class AmbientDisplayNotificationsPreferenceController extends
+        AbstractPreferenceController implements PreferenceControllerMixin,
+        Preference.OnPreferenceChangeListener {
 
     private final int ON = 1;
     private final int OFF = 0;
diff --git a/src/com/android/settings/display/AmbientDisplayPreferenceController.java b/src/com/android/settings/display/AmbientDisplayPreferenceController.java
index f3e3046..62223b0 100644
--- a/src/com/android/settings/display/AmbientDisplayPreferenceController.java
+++ b/src/com/android/settings/display/AmbientDisplayPreferenceController.java
@@ -19,12 +19,13 @@
 import android.os.UserHandle;
 import android.support.v7.preference.Preference;
 
-import com.android.internal.app.NightDisplayController;
 import com.android.internal.hardware.AmbientDisplayConfiguration;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class AmbientDisplayPreferenceController extends PreferenceController {
+public class AmbientDisplayPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
 
     private static final int MY_USER_ID = UserHandle.myUserId();
 
diff --git a/src/com/android/settings/display/AmbientDisplaySettings.java b/src/com/android/settings/display/AmbientDisplaySettings.java
index 666d47a6..24aede0 100644
--- a/src/com/android/settings/display/AmbientDisplaySettings.java
+++ b/src/com/android/settings/display/AmbientDisplaySettings.java
@@ -17,20 +17,19 @@
 package com.android.settings.display;
 
 import android.content.Context;
-import android.os.Bundle;
 import android.os.UserHandle;
 import android.provider.SearchIndexableResource;
 
 import com.android.internal.hardware.AmbientDisplayConfiguration;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.gestures.DoubleTapScreenPreferenceController;
 import com.android.settings.gestures.PickupGesturePreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
@@ -49,11 +48,11 @@
     private static final String KEY_AMBIENT_DISPLAY_PICK_UP = "ambient_display_pick_up";
     private static final String KEY_AMBIENT_DISPLAY_NOTIFICATION = "ambient_display_notification";
 
-    private static List<PreferenceController> buildPreferenceControllers(Context context,
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
             Lifecycle lifecycle, AmbientDisplayConfiguration config,
             MetricsFeatureProvider metricsFeatureProvider,
             AmbientDisplayAlwaysOnPreferenceController.OnPreferenceChangedCallback aodCallback) {
-        final List<PreferenceController> controllers = new ArrayList<>();
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new AmbientDisplayNotificationsPreferenceController(context, config,
                 metricsFeatureProvider));
         controllers.add(new AmbientDisplayAlwaysOnPreferenceController(context, config,
@@ -77,7 +76,7 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
         return buildPreferenceControllers(context, getLifecycle(),
                 new AmbientDisplayConfiguration(context), mMetricsFeatureProvider,
                 () -> { updatePreferenceStates(); });
@@ -102,7 +101,7 @@
                 }
 
                 @Override
-                public List<PreferenceController> getPreferenceControllers(Context context) {
+                public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
                     return buildPreferenceControllers(context, null,
                             new AmbientDisplayConfiguration(context), null, null);
                 }
diff --git a/src/com/android/settings/display/AutoBrightnessPreferenceController.java b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
index 12f3a8b..e74a1a0 100644
--- a/src/com/android/settings/display/AutoBrightnessPreferenceController.java
+++ b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
@@ -20,19 +20,20 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.DisplaySettings;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.search.DatabaseIndexingUtils;
 import com.android.settings.search.InlineSwitchPayload;
 import com.android.settings.search.ResultPayload;
 import com.android.settings.R;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
 import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
 import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
 
 
-public class AutoBrightnessPreferenceController extends PreferenceController implements
-        Preference.OnPreferenceChangeListener {
+public class AutoBrightnessPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
 
     private final String mAutoBrightnessKey;
 
diff --git a/src/com/android/settings/display/AutoRotatePreferenceController.java b/src/com/android/settings/display/AutoRotatePreferenceController.java
index a39cde5..c7f6af1 100644
--- a/src/com/android/settings/display/AutoRotatePreferenceController.java
+++ b/src/com/android/settings/display/AutoRotatePreferenceController.java
@@ -19,16 +19,18 @@
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.view.RotationPolicy;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
-public class AutoRotatePreferenceController extends PreferenceController implements
-        Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause {
+public class AutoRotatePreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin, Preference.OnPreferenceChangeListener, LifecycleObserver,
+        OnResume, OnPause {
 
     private static final String KEY_AUTO_ROTATE = "auto_rotate";
     private final MetricsFeatureProvider mMetricsFeatureProvider;
diff --git a/src/com/android/settings/display/BatteryPercentagePreferenceController.java b/src/com/android/settings/display/BatteryPercentagePreferenceController.java
index 4968957..4493158 100644
--- a/src/com/android/settings/display/BatteryPercentagePreferenceController.java
+++ b/src/com/android/settings/display/BatteryPercentagePreferenceController.java
@@ -20,7 +20,8 @@
 import android.support.v7.preference.Preference;
 import android.support.v14.preference.SwitchPreference;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import static android.provider.Settings.System.SHOW_BATTERY_PERCENT;
 
@@ -28,8 +29,8 @@
  * A controller to manage the switch for showing battery percentage in the status bar.
  */
 
-public class BatteryPercentagePreferenceController extends PreferenceController
-        implements Preference.OnPreferenceChangeListener {
+public class BatteryPercentagePreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
 
     private static final String KEY_BATTERY_PERCENTAGE = "battery_percentage";
 
diff --git a/src/com/android/settings/display/BrightnessLevelPreferenceController.java b/src/com/android/settings/display/BrightnessLevelPreferenceController.java
index a8ad8c6..78fec32 100644
--- a/src/com/android/settings/display/BrightnessLevelPreferenceController.java
+++ b/src/com/android/settings/display/BrightnessLevelPreferenceController.java
@@ -30,16 +30,17 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.util.Log;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnPause;
-import com.android.settingslib.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
 
 import java.text.NumberFormat;
 
-public class BrightnessLevelPreferenceController extends PreferenceController implements
-        LifecycleObserver, OnResume, OnPause {
+public class BrightnessLevelPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop {
 
     private static final String TAG = "BrightnessPrefCtrl";
     private static final String KEY_BRIGHTNESS = "brightness";
@@ -112,7 +113,7 @@
     }
 
     @Override
-    public void onResume() {
+    public void onStart() {
         mContentResolver.registerContentObserver(BRIGHTNESS_MODE_URI, false, mBrightnessObserver);
         mContentResolver.registerContentObserver(BRIGHTNESS_URI, false, mBrightnessObserver);
         mContentResolver.registerContentObserver(BRIGHTNESS_FOR_VR_URI, false, mBrightnessObserver);
@@ -120,7 +121,7 @@
     }
 
     @Override
-    public void onPause() {
+    public void onStop() {
         mContentResolver.unregisterContentObserver(mBrightnessObserver);
     }
 
diff --git a/src/com/android/settings/display/CameraGesturePreferenceController.java b/src/com/android/settings/display/CameraGesturePreferenceController.java
index 1b60721..d991302 100644
--- a/src/com/android/settings/display/CameraGesturePreferenceController.java
+++ b/src/com/android/settings/display/CameraGesturePreferenceController.java
@@ -19,12 +19,13 @@
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import static android.provider.Settings.Secure.CAMERA_GESTURE_DISABLED;
 
-public class CameraGesturePreferenceController extends PreferenceController implements
-        Preference.OnPreferenceChangeListener {
+public class CameraGesturePreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
 
     private static final String KEY_CAMERA_GESTURE = "camera_gesture";
 
diff --git a/src/com/android/settings/display/ColorModePreferenceController.java b/src/com/android/settings/display/ColorModePreferenceController.java
index 9574016..2d669d0 100644
--- a/src/com/android/settings/display/ColorModePreferenceController.java
+++ b/src/com/android/settings/display/ColorModePreferenceController.java
@@ -23,10 +23,11 @@
 import android.support.v7.preference.TwoStatePreference;
 import android.util.Log;
 import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class ColorModePreferenceController extends PreferenceController implements
-        Preference.OnPreferenceChangeListener {
+public class ColorModePreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
     private static final String TAG = "ColorModePreference";
 
     private static final String KEY_COLOR_MODE = "color_mode";
diff --git a/src/com/android/settings/display/ConversationMessageView.java b/src/com/android/settings/display/ConversationMessageView.java
index 06e7b9b..b054444 100644
--- a/src/com/android/settings/display/ConversationMessageView.java
+++ b/src/com/android/settings/display/ConversationMessageView.java
@@ -29,7 +29,6 @@
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-
 import com.android.settings.R;
 
 /**
@@ -76,7 +75,7 @@
         mIconTextColor = a.getColor(R.styleable.ConversationMessageView_iconTextColor, 0);
         mIconBackgroundColor = a.getColor(R.styleable.ConversationMessageView_iconBackgroundColor,
                 0);
-
+        a.recycle();
         LayoutInflater.from(context).inflate(R.layout.conversation_message_icon, this);
         LayoutInflater.from(context).inflate(R.layout.conversation_message_content, this);
     }
@@ -252,7 +251,7 @@
 
     private static Drawable getTintedDrawable(final Context context, final Drawable drawable,
             final int color) {
-        // For some reason occassionally drawables on JB has a null constant state
+        // For some reason occasionally drawables on JB has a null constant state
         final Drawable.ConstantState constantStateDrawable = drawable.getConstantState();
         final Drawable retDrawable = (constantStateDrawable != null)
                 ? constantStateDrawable.newDrawable(context.getResources()).mutate()
diff --git a/src/com/android/settings/display/FontSizePreferenceController.java b/src/com/android/settings/display/FontSizePreferenceController.java
index 7528f18..a8b4e9f 100644
--- a/src/com/android/settings/display/FontSizePreferenceController.java
+++ b/src/com/android/settings/display/FontSizePreferenceController.java
@@ -20,9 +20,11 @@
 
 import com.android.settings.R;
 import com.android.settings.accessibility.ToggleFontSizePreferenceFragment;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class FontSizePreferenceController extends PreferenceController {
+public class FontSizePreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
 
     private static final String KEY_FONT_SIZE = "font_size";
 
diff --git a/src/com/android/settings/display/LiftToWakePreferenceController.java b/src/com/android/settings/display/LiftToWakePreferenceController.java
index e8be936..7c2206b 100644
--- a/src/com/android/settings/display/LiftToWakePreferenceController.java
+++ b/src/com/android/settings/display/LiftToWakePreferenceController.java
@@ -20,12 +20,13 @@
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import static android.provider.Settings.Secure.WAKE_GESTURE_ENABLED;
 
-public class LiftToWakePreferenceController extends PreferenceController implements
-        Preference.OnPreferenceChangeListener {
+public class LiftToWakePreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
 
     private static final String KEY_LIFT_TO_WAKE = "lift_to_wake";
 
diff --git a/src/com/android/settings/display/NightDisplayPreference.java b/src/com/android/settings/display/NightDisplayPreference.java
index 38b57a2..b966530 100644
--- a/src/com/android/settings/display/NightDisplayPreference.java
+++ b/src/com/android/settings/display/NightDisplayPreference.java
@@ -22,6 +22,7 @@
 import com.android.settings.R;
 
 import java.text.DateFormat;
+import java.time.LocalTime;
 import java.util.Calendar;
 import java.util.TimeZone;
 
@@ -58,11 +59,11 @@
         mController.setListener(null);
     }
 
-    private String getFormattedTimeString(NightDisplayController.LocalTime localTime) {
+    private String getFormattedTimeString(LocalTime localTime) {
         final Calendar c = Calendar.getInstance();
         c.setTimeZone(mTimeFormatter.getTimeZone());
-        c.set(Calendar.HOUR_OF_DAY, localTime.hourOfDay);
-        c.set(Calendar.MINUTE, localTime.minute);
+        c.set(Calendar.HOUR_OF_DAY, localTime.getHour());
+        c.set(Calendar.MINUTE, localTime.getMinute());
         c.set(Calendar.SECOND, 0);
         c.set(Calendar.MILLISECOND, 0);
         return mTimeFormatter.format(c.getTime());
@@ -116,12 +117,12 @@
     }
 
     @Override
-    public void onCustomStartTimeChanged(NightDisplayController.LocalTime startTime) {
+    public void onCustomStartTimeChanged(LocalTime startTime) {
         updateSummary();
     }
 
     @Override
-    public void onCustomEndTimeChanged(NightDisplayController.LocalTime endTime) {
+    public void onCustomEndTimeChanged(LocalTime endTime) {
         updateSummary();
     }
 }
diff --git a/src/com/android/settings/display/NightDisplayPreferenceController.java b/src/com/android/settings/display/NightDisplayPreferenceController.java
index 4b18778..f42e324 100644
--- a/src/com/android/settings/display/NightDisplayPreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayPreferenceController.java
@@ -14,12 +14,13 @@
 package com.android.settings.display;
 
 import android.content.Context;
-import android.support.v7.preference.Preference;
 
 import com.android.internal.app.NightDisplayController;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class NightDisplayPreferenceController extends PreferenceController {
+public class NightDisplayPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
 
     private static final String KEY_NIGHT_DISPLAY = "night_display";
 
diff --git a/src/com/android/settings/display/NightDisplaySettings.java b/src/com/android/settings/display/NightDisplaySettings.java
index 23ddf07..f9568fb 100644
--- a/src/com/android/settings/display/NightDisplaySettings.java
+++ b/src/com/android/settings/display/NightDisplaySettings.java
@@ -32,6 +32,7 @@
 import com.android.settings.SettingsPreferenceFragment;
 
 import java.text.DateFormat;
+import java.time.LocalTime;
 import java.util.Calendar;
 import java.util.TimeZone;
 
@@ -144,7 +145,7 @@
     @Override
     public Dialog onCreateDialog(final int dialogId) {
         if (dialogId == DIALOG_START_TIME || dialogId == DIALOG_END_TIME) {
-            final NightDisplayController.LocalTime initialTime;
+            final LocalTime initialTime;
             if (dialogId == DIALOG_START_TIME) {
                 initialTime = mController.getCustomStartTime();
             } else {
@@ -156,15 +157,14 @@
             return new TimePickerDialog(context, new TimePickerDialog.OnTimeSetListener() {
                 @Override
                 public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
-                    final NightDisplayController.LocalTime time =
-                            new NightDisplayController.LocalTime(hourOfDay, minute);
+                    final LocalTime time = LocalTime.of(hourOfDay, minute);
                     if (dialogId == DIALOG_START_TIME) {
                         mController.setCustomStartTime(time);
                     } else {
                         mController.setCustomEndTime(time);
                     }
                 }
-            }, initialTime.hourOfDay, initialTime.minute, use24HourFormat);
+            }, initialTime.getHour(), initialTime.getMinute(), use24HourFormat);
         }
         return super.onCreateDialog(dialogId);
     }
@@ -201,11 +201,11 @@
         mTemperaturePreference.setProgress(convertTemperature(colorTemperature));
     }
 
-    private String getFormattedTimeString(NightDisplayController.LocalTime localTime) {
+    private String getFormattedTimeString(LocalTime localTime) {
         final Calendar c = Calendar.getInstance();
         c.setTimeZone(mTimeFormatter.getTimeZone());
-        c.set(Calendar.HOUR_OF_DAY, localTime.hourOfDay);
-        c.set(Calendar.MINUTE, localTime.minute);
+        c.set(Calendar.HOUR_OF_DAY, localTime.getHour());
+        c.set(Calendar.MINUTE, localTime.getMinute());
         c.set(Calendar.SECOND, 0);
         c.set(Calendar.MILLISECOND, 0);
         return mTimeFormatter.format(c.getTime());
@@ -221,12 +221,12 @@
     }
 
     @Override
-    public void onCustomStartTimeChanged(NightDisplayController.LocalTime startTime) {
+    public void onCustomStartTimeChanged(LocalTime startTime) {
         mStartTimePreference.setSummary(getFormattedTimeString(startTime));
     }
 
     @Override
-    public void onCustomEndTimeChanged(NightDisplayController.LocalTime endTime) {
+    public void onCustomEndTimeChanged(LocalTime endTime) {
         mEndTimePreference.setSummary(getFormattedTimeString(endTime));
     }
 
diff --git a/src/com/android/settings/display/NightModePreferenceController.java b/src/com/android/settings/display/NightModePreferenceController.java
index 2eb64c0..7e9701b 100644
--- a/src/com/android/settings/display/NightModePreferenceController.java
+++ b/src/com/android/settings/display/NightModePreferenceController.java
@@ -20,12 +20,13 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.util.Log;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import static android.content.Context.UI_MODE_SERVICE;
 
-public class NightModePreferenceController extends PreferenceController
-        implements Preference.OnPreferenceChangeListener {
+public class NightModePreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
 
     private static final String TAG = "NightModePrefContr";
     private static final String KEY_NIGHT_MODE = "night_mode";
diff --git a/src/com/android/settings/display/ScreenSaverPreferenceController.java b/src/com/android/settings/display/ScreenSaverPreferenceController.java
index 7a10802..6866f39 100644
--- a/src/com/android/settings/display/ScreenSaverPreferenceController.java
+++ b/src/com/android/settings/display/ScreenSaverPreferenceController.java
@@ -16,10 +16,12 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.dream.DreamSettings;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class ScreenSaverPreferenceController extends PreferenceController {
+public class ScreenSaverPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
 
     private static final String KEY_SCREEN_SAVER = "screensaver";
 
diff --git a/src/com/android/settings/display/TapToWakePreferenceController.java b/src/com/android/settings/display/TapToWakePreferenceController.java
index 1f24d74..c5a387d 100644
--- a/src/com/android/settings/display/TapToWakePreferenceController.java
+++ b/src/com/android/settings/display/TapToWakePreferenceController.java
@@ -18,10 +18,11 @@
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class TapToWakePreferenceController extends PreferenceController implements
-        Preference.OnPreferenceChangeListener {
+public class TapToWakePreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
 
     private static final String KEY_TAP_TO_WAKE = "tap_to_wake";
 
diff --git a/src/com/android/settings/display/ThemePreferenceController.java b/src/com/android/settings/display/ThemePreferenceController.java
index c38ed28..3bb58b1 100644
--- a/src/com/android/settings/display/ThemePreferenceController.java
+++ b/src/com/android/settings/display/ThemePreferenceController.java
@@ -28,9 +28,10 @@
 import android.text.TextUtils;
 
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import libcore.util.Objects;
 
@@ -39,8 +40,8 @@
 
 import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_THEME;
 
-public class ThemePreferenceController extends PreferenceController implements
-        Preference.OnPreferenceChangeListener {
+public class ThemePreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
 
     private static final String KEY_THEME = "theme";
 
diff --git a/src/com/android/settings/display/TimeoutPreferenceController.java b/src/com/android/settings/display/TimeoutPreferenceController.java
index b2890c2..6b282ef 100644
--- a/src/com/android/settings/display/TimeoutPreferenceController.java
+++ b/src/com/android/settings/display/TimeoutPreferenceController.java
@@ -22,13 +22,14 @@
 
 import com.android.settings.R;
 import com.android.settings.TimeoutListPreference;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
 
-public class TimeoutPreferenceController extends PreferenceController implements
-        Preference.OnPreferenceChangeListener {
+public class TimeoutPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
 
     private static final String TAG = "TimeoutPrefContr";
 
diff --git a/src/com/android/settings/display/VrDisplayPreferenceController.java b/src/com/android/settings/display/VrDisplayPreferenceController.java
index 4fef987..7fdb19f 100644
--- a/src/com/android/settings/display/VrDisplayPreferenceController.java
+++ b/src/com/android/settings/display/VrDisplayPreferenceController.java
@@ -20,9 +20,11 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class VrDisplayPreferenceController extends PreferenceController {
+public class VrDisplayPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
 
     private static final String KEY_VR_DISPLAY_PREF = "vr_display_pref";
 
diff --git a/src/com/android/settings/display/WallpaperPreferenceController.java b/src/com/android/settings/display/WallpaperPreferenceController.java
index b2e0f7b..9410b5a 100644
--- a/src/com/android/settings/display/WallpaperPreferenceController.java
+++ b/src/com/android/settings/display/WallpaperPreferenceController.java
@@ -24,15 +24,17 @@
 import android.util.Log;
 
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedPreference;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import static android.os.UserManager.DISALLOW_SET_WALLPAPER;
 
 import java.util.List;
 
-public class WallpaperPreferenceController extends PreferenceController {
+public class WallpaperPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
 
     private static final String TAG = "WallpaperPrefController";
 
diff --git a/src/com/android/settings/dream/CurrentDreamPreferenceController.java b/src/com/android/settings/dream/CurrentDreamPreferenceController.java
index 5b448f8..86143dd 100644
--- a/src/com/android/settings/dream/CurrentDreamPreferenceController.java
+++ b/src/com/android/settings/dream/CurrentDreamPreferenceController.java
@@ -18,13 +18,15 @@
 
 import android.content.Context;
 import android.support.v7.preference.Preference;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.widget.GearPreference;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.dream.DreamBackend;
 import com.android.settingslib.dream.DreamBackend.DreamInfo;
 import java.util.Optional;
 
-public class CurrentDreamPreferenceController extends PreferenceController {
+public class CurrentDreamPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
     private final DreamBackend mBackend;
     private final static String TAG = "CurrentDreamPreferenceController";
     private final static String CURRENT_SCREENSAVER = "current_screensaver";
diff --git a/src/com/android/settings/dream/DreamSettings.java b/src/com/android/settings/dream/DreamSettings.java
index 8c10d45..94ec149 100644
--- a/src/com/android/settings/dream/DreamSettings.java
+++ b/src/com/android/settings/dream/DreamSettings.java
@@ -16,15 +16,20 @@
 
 package com.android.settings.dream;
 
+import static com.android.settingslib.dream.DreamBackend.EITHER;
+import static com.android.settingslib.dream.DreamBackend.NEVER;
+import static com.android.settingslib.dream.DreamBackend.WHILE_CHARGING;
+import static com.android.settingslib.dream.DreamBackend.WHILE_DOCKED;
+
 import android.content.Context;
 import android.provider.SearchIndexableResource;
 import android.support.annotation.VisibleForTesting;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.dream.DreamBackend;
 import com.android.settingslib.dream.DreamBackend.WhenToDream;
 
@@ -32,11 +37,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import static com.android.settingslib.dream.DreamBackend.EITHER;
-import static com.android.settingslib.dream.DreamBackend.NEVER;
-import static com.android.settingslib.dream.DreamBackend.WHILE_CHARGING;
-import static com.android.settingslib.dream.DreamBackend.WHILE_DOCKED;
-
 public class DreamSettings extends DashboardFragment {
 
     private static final String TAG = "DreamSettings";
@@ -109,7 +109,7 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
         return buildPreferenceControllers(context);
     }
 
@@ -127,8 +127,8 @@
         }
     }
 
-    private static List<PreferenceController> buildPreferenceControllers(Context context) {
-        List<PreferenceController> controllers = new ArrayList<>();
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
+        List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new CurrentDreamPreferenceController(context));
         controllers.add(new WhenToDreamPreferenceController(context));
         controllers.add(new StartNowPreferenceController(context));
@@ -146,7 +146,7 @@
                 }
 
                 @Override
-                public List<PreferenceController> getPreferenceControllers(Context context) {
+                public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
                     return buildPreferenceControllers(context);
                 }
             };
diff --git a/src/com/android/settings/dream/StartNowPreferenceController.java b/src/com/android/settings/dream/StartNowPreferenceController.java
index 994b70b..256961b 100644
--- a/src/com/android/settings/dream/StartNowPreferenceController.java
+++ b/src/com/android/settings/dream/StartNowPreferenceController.java
@@ -22,10 +22,12 @@
 import android.widget.Button;
 import com.android.settings.R;
 import com.android.settings.applications.LayoutPreference;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.dream.DreamBackend;
 
-public class StartNowPreferenceController extends PreferenceController {
+public class StartNowPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
     private static final String TAG = "StartNowPreferenceController";
     private static final String PREF_KEY = "dream_start_now_button_container";
     private final DreamBackend mBackend;
diff --git a/src/com/android/settings/dream/WhenToDreamPreferenceController.java b/src/com/android/settings/dream/WhenToDreamPreferenceController.java
index 0d870fd..c4c6ed8 100644
--- a/src/com/android/settings/dream/WhenToDreamPreferenceController.java
+++ b/src/com/android/settings/dream/WhenToDreamPreferenceController.java
@@ -18,10 +18,12 @@
 
 import android.content.Context;
 import android.support.v7.preference.Preference;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.dream.DreamBackend;
 
-public class WhenToDreamPreferenceController extends PreferenceController {
+public class WhenToDreamPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
 
     private static final String WHEN_TO_START = "when_to_start";
     private final DreamBackend mBackend;
diff --git a/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java b/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java
index f6bd4c1..05e9519 100644
--- a/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java
+++ b/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java
@@ -19,12 +19,14 @@
 import android.text.format.DateUtils;
 
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.Date;
 
-public abstract class AdminActionPreferenceControllerBase extends PreferenceController {
+public abstract class AdminActionPreferenceControllerBase extends
+        AbstractPreferenceController implements PreferenceControllerMixin {
 
     protected final EnterprisePrivacyFeatureProvider mFeatureProvider;
 
diff --git a/src/com/android/settings/enterprise/ApplicationListFragment.java b/src/com/android/settings/enterprise/ApplicationListFragment.java
index ff68a8b..7425a30 100644
--- a/src/com/android/settings/enterprise/ApplicationListFragment.java
+++ b/src/com/android/settings/enterprise/ApplicationListFragment.java
@@ -22,9 +22,9 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.applications.ApplicationFeatureProvider;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -49,8 +49,8 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
-        final List controllers = new ArrayList<>();
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         ApplicationListPreferenceController controller = new ApplicationListPreferenceController(
                 context, this, context.getPackageManager(), this);
         controllers.add(controller);
diff --git a/src/com/android/settings/enterprise/ApplicationListPreferenceController.java b/src/com/android/settings/enterprise/ApplicationListPreferenceController.java
index f9fefa1..eee9b33 100644
--- a/src/com/android/settings/enterprise/ApplicationListPreferenceController.java
+++ b/src/com/android/settings/enterprise/ApplicationListPreferenceController.java
@@ -25,7 +25,8 @@
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.applications.UserAppInfo;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.List;
 
@@ -33,8 +34,8 @@
  * PreferenceController that builds a dynamic list of applications provided by
  * {@link ApplicationListBuilder} instance.
  */
-public class ApplicationListPreferenceController extends PreferenceController
-        implements ApplicationFeatureProvider.ListOfAppsCallback {
+public class ApplicationListPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin, ApplicationFeatureProvider.ListOfAppsCallback {
     private final PackageManager mPm;
     private SettingsPreferenceFragment mParent;
 
diff --git a/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java b/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java
new file mode 100644
index 0000000..30da907
--- /dev/null
+++ b/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings.enterprise;
+
+import android.content.Context;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.R;
+
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+public class CaCertsCurrentUserPreferenceController extends CaCertsPreferenceControllerBase {
+
+    @VisibleForTesting
+    static final String CA_CERTS_CURRENT_USER = "ca_certs_current_user";
+
+    public CaCertsCurrentUserPreferenceController(Context context,
+            Lifecycle lifecycle) {
+        super(context, lifecycle);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return CA_CERTS_CURRENT_USER;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        preference.setTitle(mFeatureProvider.isInCompMode()
+                ? R.string.enterprise_privacy_ca_certs_personal
+                : R.string.enterprise_privacy_ca_certs_device);
+    }
+
+    @Override
+    protected int getNumberOfCaCerts() {
+        return mFeatureProvider.getNumberOfOwnerInstalledCaCertsForCurrentUser();
+    }
+}
diff --git a/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java b/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java
new file mode 100644
index 0000000..2b4e72d
--- /dev/null
+++ b/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings.enterprise;
+
+import android.content.Context;
+import android.support.annotation.VisibleForTesting;
+
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+public class CaCertsManagedProfilePreferenceController extends CaCertsPreferenceControllerBase {
+
+    @VisibleForTesting
+    static final String CA_CERTS_MANAGED_PROFILE = "ca_certs_managed_profile";
+
+    public CaCertsManagedProfilePreferenceController(Context context,
+            Lifecycle lifecycle) {
+        super(context, lifecycle);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return CA_CERTS_MANAGED_PROFILE;
+    }
+
+    @Override
+    protected int getNumberOfCaCerts() {
+        return mFeatureProvider.getNumberOfOwnerInstalledCaCertsForManagedProfile();
+    }
+}
diff --git a/src/com/android/settings/enterprise/CaCertsPreferenceController.java b/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java
similarity index 67%
rename from src/com/android/settings/enterprise/CaCertsPreferenceController.java
rename to src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java
index 65c109c..8009caf 100644
--- a/src/com/android/settings/enterprise/CaCertsPreferenceController.java
+++ b/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java
@@ -15,7 +15,6 @@
 package com.android.settings.enterprise;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
@@ -23,12 +22,12 @@
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
-public class CaCertsPreferenceController extends DynamicAvailabilityPreferenceController {
+public abstract class CaCertsPreferenceControllerBase
+        extends DynamicAvailabilityPreferenceController {
 
-    private static final String CA_CERTS = "ca_certs";
-    private final EnterprisePrivacyFeatureProvider mFeatureProvider;
+    protected final EnterprisePrivacyFeatureProvider mFeatureProvider;
 
-    public CaCertsPreferenceController(Context context, Lifecycle lifecycle) {
+    public CaCertsPreferenceControllerBase(Context context, Lifecycle lifecycle) {
         super(context, lifecycle);
         mFeatureProvider = FeatureFactory.getFactory(context)
                 .getEnterprisePrivacyFeatureProvider(context);
@@ -36,23 +35,17 @@
 
     @Override
     public void updateState(Preference preference) {
-        final int certs =
-                mFeatureProvider.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile();
+        final int certs = getNumberOfCaCerts();
         preference.setSummary(mContext.getResources().getQuantityString(
                 R.plurals.enterprise_privacy_number_ca_certs, certs, certs));
     }
 
     @Override
     public boolean isAvailable() {
-        final boolean available =
-                mFeatureProvider.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile()
-                        > 0;
+        final boolean available = getNumberOfCaCerts() > 0;
         notifyOnAvailabilityUpdate(available);
         return available;
     }
 
-    @Override
-    public String getPreferenceKey() {
-        return CA_CERTS;
-    }
+    protected abstract int getNumberOfCaCerts();
 }
diff --git a/src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java b/src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java
index 8605b2e..ede241a 100644
--- a/src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java
+++ b/src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java
@@ -18,6 +18,7 @@
 
 import android.annotation.NonNull;
 import android.content.ComponentName;
+import android.content.Intent;
 import android.os.UserHandle;
 import android.support.annotation.Nullable;
 
@@ -150,4 +151,11 @@
      * @see android.app.admin.DevicePolicyManager#isUninstallInQueue
      */
     boolean isUninstallInQueue(String packageName);
+
+    /**
+     * Calls {@code DevicePolicyManager.createAdminSupportIntent()}.
+     *
+     * @see android.app.admin.DevicePolicyManager#createAdminSupportIntent
+     */
+    Intent createAdminSupportIntent(String restriction);
 }
diff --git a/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java b/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java
index e11aaf6..69ee272 100644
--- a/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java
+++ b/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java
@@ -19,6 +19,7 @@
 import android.annotation.NonNull;
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
+import android.content.Intent;
 import android.os.UserHandle;
 import android.support.annotation.Nullable;
 
@@ -116,4 +117,9 @@
     public boolean isUninstallInQueue(String packageName) {
         return mDpm.isUninstallInQueue(packageName);
     }
+
+    @Override
+    public Intent createAdminSupportIntent(@NonNull String restriction) {
+        return mDpm.createAdminSupportIntent(restriction);
+    }
 }
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java
index 391db83..048782e 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java
@@ -109,9 +109,15 @@
 
     /**
      * Returns the number of CA certificates that the Device Owner or Profile Owner installed in
-     * the current user and the user's managed profile (if any).
+     * current user.
      */
-    int getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile();
+    int getNumberOfOwnerInstalledCaCertsForCurrentUser();
+
+    /**
+     * Returns the number of CA certificates that the Device Owner or Profile Owner installed in
+     * the current user's managed profile  (if any).
+     */
+    int getNumberOfOwnerInstalledCaCertsForManagedProfile();
 
     /**
      * Returns the number of Device Admin apps active in the current user and the user's managed
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
index a5e2f3c..159f57b 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
@@ -200,20 +200,25 @@
     }
 
     @Override
-    public int getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile() {
-        int num = 0;
-        List<String> certs = mDpm.getOwnerInstalledCaCerts(new UserHandle(MY_USER_ID));
-        if (certs != null) {
-            num += certs.size();
+    public int getNumberOfOwnerInstalledCaCertsForCurrentUser() {
+        final List<String> certs = mDpm.getOwnerInstalledCaCerts(new UserHandle(MY_USER_ID));
+        if (certs == null) {
+            return 0;
         }
+        return certs.size();
+    }
+
+    @Override
+    public int getNumberOfOwnerInstalledCaCertsForManagedProfile() {
         final int userId = getManagedProfileUserId();
-        if (userId != UserHandle.USER_NULL) {
-            certs = mDpm.getOwnerInstalledCaCerts(new UserHandle(userId));
-            if (certs != null) {
-                num += certs.size();
-            }
+        if (userId == UserHandle.USER_NULL) {
+            return 0;
         }
-        return num;
+        final List<String> certs = mDpm.getOwnerInstalledCaCerts(new UserHandle(userId));
+        if (certs == null) {
+            return 0;
+        }
+        return certs.size();
     }
 
     @Override
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
index 54f0508..4caec30 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
@@ -21,10 +21,11 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.DynamicAvailabilityPreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
@@ -51,17 +52,18 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
         return buildPreferenceControllers(context, getLifecycle(), true /* async */);
     }
 
-    private static List<PreferenceController> buildPreferenceControllers(Context context,
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
             Lifecycle lifecycle, boolean async) {
-        final List controllers = new ArrayList<PreferenceController>();
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new NetworkLogsPreferenceController(context));
         controllers.add(new BugReportsPreferenceController(context));
         controllers.add(new SecurityLogsPreferenceController(context));
-        final List exposureChangesCategoryControllers = new ArrayList<PreferenceController>();
+        final List<DynamicAvailabilityPreferenceController> exposureChangesCategoryControllers =
+                new ArrayList<>();
         exposureChangesCategoryControllers.add(new EnterpriseInstalledPackagesPreferenceController(
                 context, lifecycle, async));
         exposureChangesCategoryControllers.add(
@@ -80,7 +82,10 @@
         exposureChangesCategoryControllers.add(new ImePreferenceController(context, lifecycle));
         exposureChangesCategoryControllers.add(new GlobalHttpProxyPreferenceController(context,
                 lifecycle));
-        exposureChangesCategoryControllers.add(new CaCertsPreferenceController(context, lifecycle));
+        exposureChangesCategoryControllers.add(new CaCertsCurrentUserPreferenceController(
+                context, lifecycle));
+        exposureChangesCategoryControllers.add(new CaCertsManagedProfilePreferenceController(
+                context, lifecycle));
         controllers.addAll(exposureChangesCategoryControllers);
         controllers.add(new ExposureChangesCategoryPreferenceController(context, lifecycle,
                 exposureChangesCategoryControllers, async));
@@ -112,7 +117,7 @@
             }
 
             @Override
-            public List<PreferenceController> getPreferenceControllers(Context context) {
+            public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
                 return buildPreferenceControllers(context, null /* lifecycle */, false /* async */);
                 }
             };
diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragment.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragment.java
index 6f173f1..a1c61de 100644
--- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragment.java
+++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragment.java
@@ -20,8 +20,8 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -48,8 +48,8 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
-        final List controllers = new ArrayList<PreferenceController>();
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         final EnterpriseSetDefaultAppsListPreferenceController controller =
                 new EnterpriseSetDefaultAppsListPreferenceController(
                         context, this, context.getPackageManager());
diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
index 51b60b8..03a78ea 100644
--- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
@@ -32,9 +32,10 @@
 import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.applications.EnterpriseDefaultApps;
 import com.android.settings.applications.UserAppInfo;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.users.UserFeatureProvider;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -45,7 +46,8 @@
 /**
  * PreferenceController that builds a dynamic list of default apps set by device or profile owner.
  */
-public class EnterpriseSetDefaultAppsListPreferenceController extends PreferenceController {
+public class EnterpriseSetDefaultAppsListPreferenceController extends
+        AbstractPreferenceController implements PreferenceControllerMixin {
     private final PackageManager mPm;
     private final SettingsPreferenceFragment mParent;
     private final ApplicationFeatureProvider mApplicationFeatureProvider;
diff --git a/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java b/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java
index 6317afe..6f35641 100644
--- a/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java
+++ b/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java
@@ -14,14 +14,15 @@
 package com.android.settings.enterprise;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class ManageDeviceAdminPreferenceController extends PreferenceController {
+public class ManageDeviceAdminPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
 
     private static final String KEY_MANAGE_DEVICE_ADMIN = "manage_device_admin";
     private final EnterprisePrivacyFeatureProvider mFeatureProvider;
diff --git a/src/com/android/settings/enterprise/OWNERS b/src/com/android/settings/enterprise/OWNERS
new file mode 100644
index 0000000..bab2fe2
--- /dev/null
+++ b/src/com/android/settings/enterprise/OWNERS
@@ -0,0 +1,4 @@
+# Default reviewers for this and subdirectories.
+sandness@google.com
+
+# Emergency approvers in case the above are not available
\ No newline at end of file
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
index e85a38e..66a9948 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
@@ -95,7 +95,7 @@
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.fingerprint_enroll_enrolling);
-        setHeaderText(R.string.security_settings_fingerprint_enroll_start_title);
+        setHeaderText(R.string.security_settings_fingerprint_enroll_repeat_title);
         mStartMessage = (TextView) findViewById(R.id.start_message);
         mRepeatMessage = (TextView) findViewById(R.id.repeat_message);
         mErrorText = (TextView) findViewById(R.id.error_text);
@@ -289,12 +289,9 @@
 
     private void updateDescription() {
         if (mSidecar.getEnrollmentSteps() == -1) {
-            setHeaderText(R.string.security_settings_fingerprint_enroll_start_title);
             mStartMessage.setVisibility(View.VISIBLE);
             mRepeatMessage.setVisibility(View.INVISIBLE);
         } else {
-            setHeaderText(R.string.security_settings_fingerprint_enroll_repeat_title,
-                    true /* force */);
             mStartMessage.setVisibility(View.INVISIBLE);
             mRepeatMessage.setVisibility(View.VISIBLE);
         }
@@ -345,6 +342,9 @@
             animateProgress(progress);
         } else {
             mProgressBar.setProgress(progress);
+            if (progress >= PROGRESS_BAR_MAX) {
+                mDelayedFinishRunnable.run();
+            }
         }
     }
 
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
index 1902a52..65be08a 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
@@ -139,14 +139,18 @@
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.skip_button:
-                setResult(RESULT_SKIP);
-                finish();
+                onSkipButtonClick();
                 break;
             default:
                 super.onClick(v);
         }
     }
 
+    protected void onSkipButtonClick() {
+        setResult(RESULT_SKIP);
+        finish();
+    }
+
     private void proceedToEnrolling(boolean cancelEnrollment) {
         if (mSidecar != null) {
             if (cancelEnrollment) {
diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java
index a2ce9b2..6a8a1fd 100644
--- a/src/com/android/settings/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/fingerprint/FingerprintSettings.java
@@ -36,6 +36,7 @@
 import android.os.Handler;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.support.v7.preference.Preference.OnPreferenceClickListener;
@@ -48,7 +49,6 @@
 import android.text.TextPaint;
 import android.text.TextUtils;
 import android.text.style.URLSpan;
-import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
 import android.view.WindowManager;
@@ -66,6 +66,7 @@
 import com.android.settingslib.HelpUtils;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.TwoTargetPreference;
 import com.android.settingslib.widget.FooterPreference;
 
 import java.util.HashMap;
@@ -127,8 +128,7 @@
     }
 
     public static class FingerprintSettingsFragment extends SettingsPreferenceFragment
-        implements OnPreferenceChangeListener {
-        private static final int MAX_RETRY_ATTEMPTS = 20;
+            implements OnPreferenceChangeListener, FingerprintPreference.OnDeleteClickListener {
         private static final int RESET_HIGHLIGHT_DELAY_MS = 500;
 
         private static final String TAG = "FingerprintSettings";
@@ -173,7 +173,7 @@
             @Override
             public void onAuthenticationFailed() {
                 mHandler.obtainMessage(MSG_FINGER_AUTH_FAIL).sendToTarget();
-            };
+            }
 
             @Override
             public void onAuthenticationError(int errMsgId, CharSequence errString) {
@@ -195,6 +195,7 @@
                         fingerprint.getFingerId(), 0).sendToTarget();
                 updateDialog();
             }
+
             public void onRemovalError(Fingerprint fp, int errMsgId, CharSequence errString) {
                 final Activity activity = getActivity();
                 if (activity != null) {
@@ -202,11 +203,12 @@
                 }
                 updateDialog();
             }
+
             private void updateDialog() {
-                RenameDeleteDialog renameDeleteDialog = (RenameDeleteDialog)getFragmentManager().
-                        findFragmentByTag(RenameDeleteDialog.class.getName());
-                if (renameDeleteDialog != null) {
-                    renameDeleteDialog.enableDelete();
+                RenameDialog renameDialog = (RenameDialog) getFragmentManager().
+                        findFragmentByTag(RenameDialog.class.getName());
+                if (renameDialog != null) {
+                    renameDialog.enableDelete();
                 }
             }
         };
@@ -236,7 +238,7 @@
                     }
                     break;
                 }
-            };
+            }
         };
 
         private void stopFingerprint() {
@@ -282,6 +284,11 @@
                     || 0 == mFingerprintManager.getEnrolledFingerprints(mUserId).size()) {
                 return;
             }
+            // Don't start authentication if ChooseLockGeneric is showing, otherwise if the user
+            // is in FP lockout, a toast will show on top
+            if (mLaunchedConfirm) {
+                return;
+            }
             if (!mInFingerprintLockout) {
                 mFingerprintCancel = new CancellationSignal();
                 mFingerprintManager.authenticate(null, mFingerprintCancel, 0 /* flags */,
@@ -311,10 +318,10 @@
             mRemovalSidecar.setFingerprintManager(mFingerprintManager);
             mRemovalSidecar.setListener(mRemovalListener);
 
-            RenameDeleteDialog renameDeleteDialog = (RenameDeleteDialog)getFragmentManager().
-                    findFragmentByTag(RenameDeleteDialog.class.getName());
-            if (renameDeleteDialog != null) {
-               renameDeleteDialog.setDeleteInProgress(mRemovalSidecar.inProgress());
+            RenameDialog renameDialog = (RenameDialog) getFragmentManager().
+                    findFragmentByTag(RenameDialog.class.getName());
+            if (renameDialog != null) {
+                renameDialog.setDeleteInProgress(mRemovalSidecar.inProgress());
             }
 
             mFingerprintsRenaming = new HashMap<Integer, String>();
@@ -381,7 +388,8 @@
             final int fingerprintCount = items.size();
             for (int i = 0; i < fingerprintCount; i++) {
                 final Fingerprint item = items.get(i);
-                FingerprintPreference pref = new FingerprintPreference(root.getContext());
+                FingerprintPreference pref = new FingerprintPreference(root.getContext(),
+                        this /* onDeleteClickListener */);
                 pref.setKey(genKey(item.getFingerId()));
                 pref.setTitle(item.getName());
                 pref.setFingerprint(item);
@@ -399,7 +407,7 @@
             Preference addPreference = new Preference(root.getContext());
             addPreference.setKey(KEY_FINGERPRINT_ADD);
             addPreference.setTitle(R.string.fingerprint_add_title);
-            addPreference.setIcon(R.drawable.ic_add_24dp);
+            addPreference.setIcon(R.drawable.ic_menu_add);
             root.addPreference(addPreference);
             addPreference.setOnPreferenceChangeListener(this);
             updateAddPreference();
@@ -429,6 +437,7 @@
         @Override
         public void onResume() {
             super.onResume();
+            mInFingerprintLockout = false;
             // Make sure we reload the preference hierarchy since fingerprints may be added,
             // deleted or renamed.
             updatePreferences();
@@ -472,14 +481,40 @@
             } else if (pref instanceof FingerprintPreference) {
                 FingerprintPreference fpref = (FingerprintPreference) pref;
                 final Fingerprint fp = fpref.getFingerprint();
-                showRenameDeleteDialog(fp);
-                return super.onPreferenceTreeClick(pref);
+                showRenameDialog(fp);
             }
-            return true;
+            return super.onPreferenceTreeClick(pref);
         }
 
-        private void showRenameDeleteDialog(final Fingerprint fp) {
-            RenameDeleteDialog renameDeleteDialog = new RenameDeleteDialog();
+        @Override
+        public void onDeleteClick(FingerprintPreference p) {
+            final boolean hasMultipleFingerprint =
+                    mFingerprintManager.getEnrolledFingerprints(mUserId).size() > 1;
+            final Fingerprint fp = p.getFingerprint();
+
+            if (hasMultipleFingerprint) {
+                if (mRemovalSidecar.inProgress()) {
+                    Log.d(TAG, "Fingerprint delete in progress, skipping");
+                    return;
+                }
+                DeleteFingerprintDialog.newInstance(fp, this /* target */)
+                        .show(getFragmentManager(), DeleteFingerprintDialog.class.getName());
+            } else {
+                ConfirmLastDeleteDialog lastDeleteDialog = new ConfirmLastDeleteDialog();
+                final boolean isProfileChallengeUser =
+                        UserManager.get(getContext()).isManagedProfile(mUserId);
+                final Bundle args = new Bundle();
+                args.putParcelable("fingerprint", fp);
+                args.putBoolean("isProfileChallengeUser", isProfileChallengeUser);
+                lastDeleteDialog.setArguments(args);
+                lastDeleteDialog.setTargetFragment(this, 0);
+                lastDeleteDialog.show(getFragmentManager(),
+                        ConfirmLastDeleteDialog.class.getName());
+            }
+        }
+
+        private void showRenameDialog(final Fingerprint fp) {
+            RenameDialog renameDialog = new RenameDialog();
             Bundle args = new Bundle();
             if (mFingerprintsRenaming.containsKey(fp.getFingerId())) {
                 final Fingerprint f = new Fingerprint(mFingerprintsRenaming.get(fp.getFingerId()),
@@ -488,10 +523,10 @@
             } else {
                 args.putParcelable("fingerprint", fp);
             }
-            renameDeleteDialog.setDeleteInProgress(mRemovalSidecar.inProgress());
-            renameDeleteDialog.setArguments(args);
-            renameDeleteDialog.setTargetFragment(this, 0);
-            renameDeleteDialog.show(getFragmentManager(), RenameDeleteDialog.class.getName());
+            renameDialog.setDeleteInProgress(mRemovalSidecar.inProgress());
+            renameDialog.setArguments(args);
+            renameDialog.setTargetFragment(this, 0);
+            renameDialog.show(getFragmentManager(), RenameDialog.class.getName());
         }
 
         @Override
@@ -516,6 +551,7 @@
             super.onActivityResult(requestCode, resultCode, data);
             if (requestCode == CHOOSE_LOCK_GENERIC_REQUEST
                     || requestCode == CONFIRM_REQUEST) {
+                mLaunchedConfirm = false;
                 if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) {
                     // The lock pin/pattern/password was set. Start enrolling!
                     if (data != null) {
@@ -599,7 +635,8 @@
             }
         }
 
-        private void deleteFingerPrint(Fingerprint fingerPrint) {
+        @VisibleForTesting
+        void deleteFingerPrint(Fingerprint fingerPrint) {
             mRemovalSidecar.startRemove(fingerPrint, mUserId);
             String name = genKey(fingerPrint.getFingerId());
             Preference prefToRemove = findPreference(name);
@@ -623,7 +660,60 @@
             }
         };
 
-        public static class RenameDeleteDialog extends InstrumentedDialogFragment {
+        public static class DeleteFingerprintDialog extends InstrumentedDialogFragment
+                implements DialogInterface.OnClickListener {
+
+            private static final String KEY_FINGERPRINT = "fingerprint";
+            private Fingerprint mFp;
+            private AlertDialog mAlertDialog;
+
+            public static DeleteFingerprintDialog newInstance(Fingerprint fp,
+                    FingerprintSettingsFragment target) {
+                final DeleteFingerprintDialog dialog = new DeleteFingerprintDialog();
+                final Bundle bundle = new Bundle();
+                bundle.putParcelable(KEY_FINGERPRINT, fp);
+                dialog.setArguments(bundle);
+                dialog.setTargetFragment(target, 0 /* requestCode */);
+                return dialog;
+            }
+
+            @Override
+            public int getMetricsCategory() {
+                return MetricsEvent.DIALOG_FINGERPINT_EDIT;
+            }
+
+            @Override
+            public Dialog onCreateDialog(Bundle savedInstanceState) {
+                mFp = getArguments().getParcelable(KEY_FINGERPRINT);
+                final String title = getString(R.string.fingerprint_delete_title, mFp.getName());
+
+                mAlertDialog = new AlertDialog.Builder(getActivity())
+                        .setTitle(title)
+                        .setMessage(R.string.fingerprint_delete_message)
+                        .setPositiveButton(
+                                R.string.security_settings_fingerprint_enroll_dialog_delete,
+                                this /* onClickListener */)
+                        .setNegativeButton(R.string.cancel, null /* onClickListener */)
+                        .create();
+                return mAlertDialog;
+            }
+
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                if (which == DialogInterface.BUTTON_POSITIVE) {
+                    final int fingerprintId = mFp.getFingerId();
+                    Log.v(TAG, "Removing fpId=" + fingerprintId);
+                    mMetricsFeatureProvider.action(getContext(),
+                            MetricsEvent.ACTION_FINGERPRINT_DELETE,
+                            fingerprintId);
+                    FingerprintSettingsFragment parent
+                            = (FingerprintSettingsFragment) getTargetFragment();
+                    parent.deleteFingerPrint(mFp);
+                }
+            }
+        }
+
+        public static class RenameDialog extends InstrumentedDialogFragment {
 
             private Fingerprint mFp;
             private EditText mDialogTextField;
@@ -637,6 +727,7 @@
             public void setDeleteInProgress(boolean deleteInProgress) {
                 mDeleteInProgress = deleteInProgress;
             }
+
             @Override
             public Dialog onCreateDialog(Bundle savedInstanceState) {
                 mFp = getArguments().getParcelable("fingerprint");
@@ -655,10 +746,8 @@
                                         final String newName =
                                                 mDialogTextField.getText().toString();
                                         final CharSequence name = mFp.getName();
-                                        if (!newName.equals(name)) {
-                                            if (DEBUG) {
-                                                Log.v(TAG, "rename " + name + " to " + newName);
-                                            }
+                                        if (!TextUtils.equals(newName, name)) {
+                                            Log.d(TAG, "rename " + name + " to " + newName);
                                             mMetricsFeatureProvider.action(getContext(),
                                                     MetricsEvent.ACTION_FINGERPRINT_RENAME,
                                                     mFp.getFingerId());
@@ -671,14 +760,6 @@
                                         dialog.dismiss();
                                     }
                                 })
-                        .setNegativeButton(
-                                R.string.security_settings_fingerprint_enroll_dialog_delete,
-                                new DialogInterface.OnClickListener() {
-                                    @Override
-                                    public void onClick(DialogInterface dialog, int which) {
-                                        onDeleteClick(dialog);
-                                    }
-                                })
                         .create();
                 mAlertDialog.setOnShowListener(new DialogInterface.OnShowListener() {
                     @Override
@@ -712,29 +793,6 @@
                 }
             }
 
-            private void onDeleteClick(DialogInterface dialog) {
-                if (DEBUG) Log.v(TAG, "Removing fpId=" + mFp.getFingerId());
-                mMetricsFeatureProvider.action(getContext(), MetricsEvent.ACTION_FINGERPRINT_DELETE,
-                        mFp.getFingerId());
-                FingerprintSettingsFragment parent
-                        = (FingerprintSettingsFragment) getTargetFragment();
-                final boolean isProfileChallengeUser =
-                        UserManager.get(getContext()).isManagedProfile(parent.mUserId);
-                if (parent.mFingerprintManager.getEnrolledFingerprints(parent.mUserId).size() > 1) {
-                    parent.deleteFingerPrint(mFp);
-                } else {
-                    ConfirmLastDeleteDialog lastDeleteDialog = new ConfirmLastDeleteDialog();
-                    Bundle args = new Bundle();
-                    args.putParcelable("fingerprint", mFp);
-                    args.putBoolean("isProfileChallengeUser", isProfileChallengeUser);
-                    lastDeleteDialog.setArguments(args);
-                    lastDeleteDialog.setTargetFragment(getTargetFragment(), 0);
-                    lastDeleteDialog.show(getFragmentManager(),
-                            ConfirmLastDeleteDialog.class.getName());
-                }
-                dialog.dismiss();
-            }
-
             @Override
             public void onSaveInstanceState(Bundle outState) {
                 super.onSaveInstanceState(outState);
@@ -795,27 +853,26 @@
         }
     }
 
-    public static class FingerprintPreference extends Preference {
+    public static class FingerprintPreference extends TwoTargetPreference {
+
+        private final OnDeleteClickListener mOnDeleteClickListener;
+
         private Fingerprint mFingerprint;
         private View mView;
+        private View mDeleteView;
 
-        public FingerprintPreference(Context context, AttributeSet attrs, int defStyleAttr,
-                int defStyleRes) {
-            super(context, attrs, defStyleAttr, defStyleRes);
-        }
-        public FingerprintPreference(Context context, AttributeSet attrs, int defStyleAttr) {
-            super(context, attrs, defStyleAttr);
+        public interface OnDeleteClickListener {
+            void onDeleteClick(FingerprintPreference p);
         }
 
-        public FingerprintPreference(Context context, AttributeSet attrs) {
-            super(context, attrs);
-        }
-
-        public FingerprintPreference(Context context) {
+        public FingerprintPreference(Context context, OnDeleteClickListener onDeleteClickListener) {
             super(context);
+            mOnDeleteClickListener = onDeleteClickListener;
         }
 
-        public View getView() { return mView; }
+        public View getView() {
+            return mView;
+        }
 
         public void setFingerprint(Fingerprint item) {
             mFingerprint = item;
@@ -826,11 +883,25 @@
         }
 
         @Override
+        protected int getSecondTargetResId() {
+            return R.layout.preference_widget_delete;
+        }
+
+        @Override
         public void onBindViewHolder(PreferenceViewHolder view) {
             super.onBindViewHolder(view);
             mView = view.itemView;
+            mDeleteView = view.itemView.findViewById(R.id.delete_button);
+            mDeleteView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (mOnDeleteClickListener != null) {
+                        mOnDeleteClickListener.onDeleteClick(FingerprintPreference.this);
+                    }
+                }
+            });
         }
-    };
+    }
 
     private static class LearnMoreSpan extends URLSpan {
         private static final String TAG = "LearnMoreSpan";
diff --git a/src/com/android/settings/fingerprint/OWNERS b/src/com/android/settings/fingerprint/OWNERS
new file mode 100644
index 0000000..937b303
--- /dev/null
+++ b/src/com/android/settings/fingerprint/OWNERS
@@ -0,0 +1,5 @@
+# Default reviewers for this and subdirectories.
+jaggies@google.com
+yukl@google.com
+
+# Emergency approvers in case the above are not available
\ No newline at end of file
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
index f62b701..2137130 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
@@ -16,12 +16,21 @@
 
 package com.android.settings.fingerprint;
 
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.FragmentManager;
+import android.content.DialogInterface;
 import android.content.Intent;
+import android.os.Bundle;
 import android.os.UserHandle;
+import android.support.annotation.NonNull;
 
+import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settings.password.ChooseLockSettingsHelper;
 
 public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSensor {
@@ -43,7 +52,53 @@
     }
 
     @Override
+    protected void onSkipButtonClick() {
+        new SkipFingerprintDialog().show(getFragmentManager());
+    }
+
+    @Override
     public int getMetricsCategory() {
         return MetricsEvent.FINGERPRINT_FIND_SENSOR_SETUP;
     }
+
+    public static class SkipFingerprintDialog extends InstrumentedDialogFragment
+            implements DialogInterface.OnClickListener {
+        private static final String TAG_SKIP_DIALOG = "skip_dialog";
+
+        @Override
+        public int getMetricsCategory() {
+            return MetricsProto.MetricsEvent.DIALOG_FINGERPRINT_SKIP_SETUP;
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            return onCreateDialogBuilder().create();
+        }
+
+        @NonNull
+        public AlertDialog.Builder onCreateDialogBuilder() {
+            return new AlertDialog.Builder(getContext())
+                    .setTitle(R.string.setup_fingerprint_enroll_skip_title)
+                    .setPositiveButton(R.string.skip_anyway_button_label, this)
+                    .setNegativeButton(R.string.go_back_button_label, this)
+                    .setMessage(R.string.setup_fingerprint_enroll_skip_after_adding_lock_text);
+        }
+
+        @Override
+        public void onClick(DialogInterface dialog, int button) {
+            switch (button) {
+                case DialogInterface.BUTTON_POSITIVE:
+                    Activity activity = getActivity();
+                    if (activity != null) {
+                        activity.setResult(RESULT_SKIP);
+                        activity.finish();
+                    }
+                    break;
+            }
+        }
+
+        public void show(FragmentManager manager) {
+            show(manager, TAG_SKIP_DIALOG);
+        }
+    }
 }
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
index 59907cf..5656a27 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
@@ -32,6 +32,7 @@
 import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;
 import com.android.settings.password.SetupChooseLockGeneric;
 import com.android.settings.password.SetupSkipDialog;
+import com.android.settings.password.StorageManagerWrapper;
 
 public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntroduction {
     private static final String KEY_LOCK_SCREEN_PRESENT = "wasLockScreenPresent";
@@ -56,11 +57,14 @@
 
     @Override
     protected Intent getChooseLockIntent() {
-        Intent intent = new Intent(this, SetupChooseLockGeneric.class)
-                .putExtra(
-                        LockPatternUtils.PASSWORD_TYPE_KEY,
-                        DevicePolicyManager.PASSWORD_QUALITY_NUMERIC);
-        intent.putExtra(ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, true);
+        Intent intent = new Intent(this, SetupChooseLockGeneric.class);
+
+        if (StorageManagerWrapper.isFileEncryptedNativeOrEmulated()) {
+            intent.putExtra(
+                    LockPatternUtils.PASSWORD_TYPE_KEY,
+                    DevicePolicyManager.PASSWORD_QUALITY_NUMERIC);
+            intent.putExtra(ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, true);
+        }
         SetupWizardUtils.copySetupExtras(getIntent(), intent);
         return intent;
     }
diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
index 9a37879..3b83fa5 100644
--- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
@@ -31,6 +31,7 @@
 import android.support.v14.preference.PreferenceFragment;
 import android.support.v7.preference.Preference;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -41,7 +42,6 @@
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
 import com.android.settings.applications.LayoutPreference;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.enterprise.DevicePolicyManagerWrapper;
 import com.android.settings.enterprise.DevicePolicyManagerWrapperImpl;
@@ -52,6 +52,7 @@
 import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -113,16 +114,16 @@
     private List<Anomaly> mAnomalies;
     private String mPackageName;
 
-    public static void startBatteryDetailPage(SettingsActivity caller, PreferenceFragment fragment,
-            BatteryStatsHelper helper, int which, BatteryEntry entry, String usagePercent,
-            List<Anomaly> anomalies) {
+    @VisibleForTesting
+    static void startBatteryDetailPage(SettingsActivity caller, BatteryUtils batteryUtils,
+            PreferenceFragment fragment, BatteryStatsHelper helper, int which, BatteryEntry entry,
+            String usagePercent, List<Anomaly> anomalies) {
         // Initialize mStats if necessary.
         helper.getStats();
 
         final Bundle args = new Bundle();
         final BatterySipper sipper = entry.sipper;
         final BatteryStats.Uid uid = sipper.uidObj;
-        final BatteryUtils batteryUtils = BatteryUtils.getInstance(caller);
         final boolean isTypeApp = sipper.drainType == BatterySipper.DrainType.APP;
 
         final long foregroundTimeMs = isTypeApp ? batteryUtils.getProcessTimeMs(
@@ -155,10 +156,23 @@
     }
 
     public static void startBatteryDetailPage(SettingsActivity caller, PreferenceFragment fragment,
+            BatteryStatsHelper helper, int which, BatteryEntry entry, String usagePercent,
+            List<Anomaly> anomalies) {
+        startBatteryDetailPage(caller, BatteryUtils.getInstance(caller), fragment, helper, which,
+                entry, usagePercent, anomalies);
+    }
+
+    public static void startBatteryDetailPage(SettingsActivity caller, PreferenceFragment fragment,
             String packageName) {
-        final Bundle args = new Bundle(2);
+        final Bundle args = new Bundle(3);
+        final PackageManager packageManager = caller.getPackageManager();
         args.putString(EXTRA_PACKAGE_NAME, packageName);
         args.putString(EXTRA_POWER_USAGE_PERCENT, Utils.formatPercentage(0));
+        try {
+            args.putInt(EXTRA_UID, packageManager.getPackageUid(packageName, 0 /* no flag */));
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.e(TAG, "Cannot find package: " + packageName, e);
+        }
 
         caller.startPreferencePanelAsUser(fragment, AdvancedPowerUsageDetail.class.getName(), args,
                 R.string.battery_details_title, null, new UserHandle(UserHandle.myUserId()));
@@ -290,8 +304,8 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
-        final List<PreferenceController> controllers = new ArrayList<>();
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         final Bundle bundle = getArguments();
         final int uid = bundle.getInt(EXTRA_UID, 0);
         final String packageName = bundle.getString(EXTRA_PACKAGE_NAME);
diff --git a/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java b/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
index 6b4c8a9..b889cfd 100644
--- a/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
@@ -50,13 +50,14 @@
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
 import com.android.settings.applications.LayoutPreference;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.enterprise.DevicePolicyManagerWrapper;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnDestroy;
@@ -76,9 +77,9 @@
  * {@link #handleActivityResult(int, int, Intent)} in this controller.
  */
 //TODO(b/35810915): Make InstalledAppDetails use this controller
-public class AppButtonsPreferenceController extends PreferenceController implements
-        LifecycleObserver, OnResume, OnPause, OnDestroy, View.OnClickListener,
-        ApplicationsState.Callbacks {
+public class AppButtonsPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause, OnDestroy,
+        View.OnClickListener, ApplicationsState.Callbacks {
     public static final String APP_CHG = "chg";
 
     private static final String TAG = "AppButtonsPrefCtl";
@@ -380,7 +381,7 @@
         // We don't allow uninstalling DO/PO on *any* users, because if it's a system app,
         // "uninstall" is actually "downgrade to the system version + disable", and "downgrade"
         // will clear data on all users.
-        if (isProfileOrDeviceOwner(mPackageInfo.packageName)) {
+        if (Utils.isProfileOrDeviceOwner(mUserManager, mDpm, mPackageInfo.packageName)) {
             enabled = false;
         }
 
@@ -580,21 +581,6 @@
                 || (mUserManager.isSplitSystemUser() && userCount == 2);
     }
 
-    /** Returns if the supplied package is device owner or profile owner of at least one user */
-    private boolean isProfileOrDeviceOwner(String packageName) {
-        List<UserInfo> userInfos = mUserManager.getUsers();
-        if (mDpm.isDeviceOwnerAppOnAnyUser(packageName)) {
-            return true;
-        }
-        for (int i = 0, size = userInfos.size(); i < size; i++) {
-            ComponentName cn = mDpm.getProfileOwnerAsUser(userInfos.get(i).id);
-            if (cn != null && cn.getPackageName().equals(packageName)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     private final BroadcastReceiver mCheckKillProcessesReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
diff --git a/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java b/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java
index 60a94dd..4d1cf77 100644
--- a/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java
@@ -15,37 +15,49 @@
 package com.android.settings.fuelgauge;
 
 import android.app.AppOpsManager;
+import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
+import android.os.UserManager;
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 import android.util.Log;
 
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.Utils;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.enterprise.DevicePolicyManagerWrapper;
+import com.android.settings.enterprise.DevicePolicyManagerWrapperImpl;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 /**
  * Controller to control whether an app can run in the background
  */
-public class BackgroundActivityPreferenceController extends PreferenceController implements
-        Preference.OnPreferenceChangeListener {
+public class BackgroundActivityPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
 
     private static final String TAG = "BgActivityPrefContr";
     private static final String KEY_BACKGROUND_ACTIVITY = "background_activity";
 
     private final PackageManager mPackageManager;
     private final AppOpsManager mAppOpsManager;
+    private final UserManager mUserManager;
     private final String[] mPackages;
     private final int mUid;
+    @VisibleForTesting
+    DevicePolicyManagerWrapper mDpm;
 
     private String mTargetPackage;
 
     public BackgroundActivityPreferenceController(Context context, int uid) {
         super(context);
         mPackageManager = context.getPackageManager();
+        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        mDpm = new DevicePolicyManagerWrapperImpl(
+                (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE));
         mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
         mUid = uid;
         mPackages = mPackageManager.getPackagesForUid(mUid);
@@ -55,12 +67,15 @@
     public void updateState(Preference preference) {
         final int mode = mAppOpsManager
                 .checkOpNoThrow(AppOpsManager.OP_RUN_IN_BACKGROUND, mUid, mTargetPackage);
-        if (mode == AppOpsManager.MODE_ERRORED) {
-            preference.setEnabled(false);
-        } else {
+        // Set checked or not before we may set it disabled
+        if (mode != AppOpsManager.MODE_ERRORED) {
             final boolean checked = mode != AppOpsManager.MODE_IGNORED;
             ((SwitchPreference) preference).setChecked(checked);
         }
+        if (mode == AppOpsManager.MODE_ERRORED
+                || Utils.isProfileOrDeviceOwner(mUserManager, mDpm, mTargetPackage)) {
+            preference.setEnabled(false);
+        }
 
         updateSummary(preference);
     }
diff --git a/src/com/android/settings/fuelgauge/BatteryEntry.java b/src/com/android/settings/fuelgauge/BatteryEntry.java
index aa71252..7a18cd0 100644
--- a/src/com/android/settings/fuelgauge/BatteryEntry.java
+++ b/src/com/android/settings/fuelgauge/BatteryEntry.java
@@ -26,6 +26,7 @@
 import android.content.pm.UserInfo;
 import android.graphics.drawable.Drawable;
 import android.os.Handler;
+import android.os.Process;
 import android.os.RemoteException;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -47,6 +48,7 @@
     public static final int MSG_REPORT_FULLY_DRAWN = 2;
 
     private static final String TAG = "BatteryEntry";
+    private static final String PACKAGE_SYSTEM = "android";
 
     static final HashMap<String,UidToDetail> sUidCache = new HashMap<String,UidToDetail>();
 
@@ -268,9 +270,11 @@
         if (sipper.mPackages == null) {
             sipper.mPackages = pm.getPackagesForUid(uid);
         }
-        if (sipper.mPackages != null) {
-            String[] packageLabels = new String[sipper.mPackages.length];
-            System.arraycopy(sipper.mPackages, 0, packageLabels, 0, sipper.mPackages.length);
+
+        final String[] packages = extractPackagesFromSipper(sipper);
+        if (packages != null) {
+            String[] packageLabels = new String[packages.length];
+            System.arraycopy(packages, 0, packageLabels, 0, packages.length);
 
             // Convert package names to user-facing labels where possible
             IPackageManager ipm = AppGlobals.getPackageManager();
@@ -289,7 +293,7 @@
                         packageLabels[i] = label.toString();
                     }
                     if (ai.icon != 0) {
-                        defaultPackageName = sipper.mPackages[i];
+                        defaultPackageName = packages[i];
                         icon = ai.loadIcon(pm);
                         break;
                     }
@@ -303,7 +307,7 @@
                 name = packageLabels[0];
             } else {
                 // Look for an official name for this UID.
-                for (String pkgName : sipper.mPackages) {
+                for (String pkgName : packages) {
                     try {
                         final PackageInfo pi = ipm.getPackageInfo(pkgName, 0 /* no flags */, userId);
                         if (pi == null) {
@@ -349,4 +353,11 @@
             sHandler.sendMessage(sHandler.obtainMessage(MSG_UPDATE_NAME_ICON, this));
         }
     }
+
+    String[] extractPackagesFromSipper(BatterySipper sipper) {
+        // Only use system package if uid is system uid, so it could find a consistent name and icon
+        return sipper.getUid() == Process.SYSTEM_UID
+                ? new String[]{PACKAGE_SYSTEM}
+                : sipper.mPackages;
+    }
 }
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
index 079ab29..139c8f4 100644
--- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
@@ -29,9 +29,10 @@
 
 import com.android.settings.R;
 import com.android.settings.applications.LayoutPreference;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.Utils;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
@@ -39,8 +40,8 @@
 /**
  * Controller that update the battery header view
  */
-public class BatteryHeaderPreferenceController extends PreferenceController
-        implements LifecycleObserver, OnStart {
+public class BatteryHeaderPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver, OnStart {
     @VisibleForTesting
     static final String KEY_BATTERY_HEADER = "battery_header";
 
diff --git a/src/com/android/settings/fuelgauge/BatteryInfo.java b/src/com/android/settings/fuelgauge/BatteryInfo.java
index a0e56c1..7a0cd27 100644
--- a/src/com/android/settings/fuelgauge/BatteryInfo.java
+++ b/src/com/android/settings/fuelgauge/BatteryInfo.java
@@ -219,10 +219,8 @@
                 CharSequence timeString = Utils.formatElapsedTime(context,
                         BatteryUtils.convertUsToMs(drainTimeUs), false /* withSeconds */);
                 info.remainingLabel = TextUtils.expandTemplate(context.getText(shortString ?
-                        (basedOnUsage ?
-                                R.string.power_remaining_duration_only_short_enhanced :
-                                R.string.power_remaining_duration_only_short) :
-                        (basedOnUsage ?
+                                R.string.power_remaining_duration_only_short :
+                         (basedOnUsage ?
                                 R.string.power_remaining_duration_only_enhanced :
                                 R.string.power_remaining_duration_only)), timeString);
                 info.chargeLabel = TextUtils.expandTemplate(context.getText(
@@ -245,8 +243,7 @@
                 info.remainingTimeUs = chargeTime;
                 CharSequence timeString = Utils.formatElapsedTime(context,
                         BatteryUtils.convertUsToMs(chargeTime), false /* withSeconds */);
-                int resId = shortString ? R.string.power_charging_duration_short
-                        : R.string.power_charging_duration;
+                int resId = R.string.power_charging_duration;
                 info.remainingLabel = TextUtils.expandTemplate(context.getText(
                         R.string.power_remaining_charging_duration_only), timeString);
                 info.chargeLabel = TextUtils.expandTemplate(context.getText(resId),
diff --git a/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java
index 7c5bda2..53a3770 100644
--- a/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java
@@ -15,22 +15,22 @@
 package com.android.settings.fuelgauge;
 
 import android.app.Fragment;
-import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
-import android.text.TextUtils;
 
 import com.android.settings.R;
 import com.android.settings.Settings;
 import com.android.settings.SettingsActivity;
 import com.android.settings.applications.ManageApplications;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 /**
  * Controller that jumps to high power optimization fragment
  */
-public class BatteryOptimizationPreferenceController extends PreferenceController {
+public class BatteryOptimizationPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
 
     private static final String KEY_BACKGROUND_ACTIVITY = "battery_optimization";
 
diff --git a/src/com/android/settings/fuelgauge/BatterySaverController.java b/src/com/android/settings/fuelgauge/BatterySaverController.java
index bb7e678..85fb9f5 100644
--- a/src/com/android/settings/fuelgauge/BatterySaverController.java
+++ b/src/com/android/settings/fuelgauge/BatterySaverController.java
@@ -25,20 +25,22 @@
 import android.support.v7.preference.PreferenceScreen;
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.dashboard.conditional.BatterySaverCondition;
 import com.android.settings.dashboard.conditional.ConditionManager;
 import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
 
-public class BatterySaverController extends PreferenceController implements
-        Preference.OnPreferenceChangeListener, LifecycleObserver, OnStart, OnStop,
-        BatterySaverReceiver.BatterySaverListener {
-    private static final String KEY_BATTERY_SAVER = "battery_saver_summary";
+import static android.os.PowerManager.ACTION_POWER_SAVE_MODE_CHANGING;
 
+public class BatterySaverController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
+        LifecycleObserver, OnStart, OnStop, BatterySaverReceiver.BatterySaverListener {
+    private static final String KEY_BATTERY_SAVER = "battery_saver_summary";
     private final BatterySaverReceiver mBatteryStateChangeReceiver;
     private final PowerManager mPowerManager;
     private MasterSwitchPreference mBatterySaverPref;
diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java
index a041543..3c83a9b 100644
--- a/src/com/android/settings/fuelgauge/BatteryUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryUtils.java
@@ -53,14 +53,16 @@
     public static final int SDK_NULL = -1;
 
     @Retention(RetentionPolicy.SOURCE)
-    @IntDef({StatusType.FOREGROUND,
+    @IntDef({StatusType.SCREEN_USAGE,
+            StatusType.FOREGROUND,
             StatusType.BACKGROUND,
             StatusType.ALL
     })
     public @interface StatusType {
-        int FOREGROUND = 0;
-        int BACKGROUND = 1;
-        int ALL = 2;
+        int SCREEN_USAGE = 0;
+        int FOREGROUND = 1;
+        int BACKGROUND = 2;
+        int ALL = 3;
     }
 
     private static final String TAG = "BatteryUtils";
@@ -96,6 +98,8 @@
         }
 
         switch (type) {
+            case StatusType.SCREEN_USAGE:
+                return getScreenUsageTimeMs(uid, which);
             case StatusType.FOREGROUND:
                 return getProcessForegroundTimeMs(uid, which);
             case StatusType.BACKGROUND:
@@ -107,6 +111,29 @@
         return 0;
     }
 
+    private long getScreenUsageTimeMs(BatteryStats.Uid uid, int which, long rawRealTimeUs) {
+        final int foregroundTypes[] = {BatteryStats.Uid.PROCESS_STATE_TOP};
+        Log.v(TAG, "package: " + mPackageManager.getNameForUid(uid.getUid()));
+
+        long timeUs = 0;
+        for (int type : foregroundTypes) {
+            final long localTime = uid.getProcessStateTime(type, rawRealTimeUs, which);
+            Log.v(TAG, "type: " + type + " time(us): " + localTime);
+            timeUs += localTime;
+        }
+        Log.v(TAG, "foreground time(us): " + timeUs);
+
+        // Return the min value of STATE_TOP time and foreground activity time, since both of these
+        // time have some errors
+        return convertUsToMs(
+                Math.min(timeUs, getForegroundActivityTotalTimeUs(uid, rawRealTimeUs)));
+    }
+
+    private long getScreenUsageTimeMs(BatteryStats.Uid uid, int which) {
+        final long rawRealTimeUs = convertMsToUs(SystemClock.elapsedRealtime());
+        return getScreenUsageTimeMs(uid, which, rawRealTimeUs);
+    }
+
     private long getProcessBackgroundTimeMs(BatteryStats.Uid uid, int which) {
         final long rawRealTimeUs = convertMsToUs(SystemClock.elapsedRealtime());
         final long timeUs = uid.getProcessStateTime(
@@ -119,21 +146,8 @@
 
     private long getProcessForegroundTimeMs(BatteryStats.Uid uid, int which) {
         final long rawRealTimeUs = convertMsToUs(SystemClock.elapsedRealtime());
-        final int foregroundTypes[] = {BatteryStats.Uid.PROCESS_STATE_TOP};
-        Log.v(TAG, "package: " + mPackageManager.getNameForUid(uid.getUid()));
-
-        long timeUs = 0;
-        for (int type : foregroundTypes) {
-            final long localTime = uid.getProcessStateTime(type, rawRealTimeUs, which);
-            Log.v(TAG, "type: " + type + " time(us): " + localTime);
-            timeUs += localTime;
-        }
-        Log.v(TAG, "foreground time(us): " + timeUs);
-
-        // Return the min value of STATE_TOP time and foreground activity time, since both of these
-        // time have some errors.
-        return convertUsToMs(
-                Math.min(timeUs, getForegroundActivityTotalTimeUs(uid, rawRealTimeUs)));
+        return getScreenUsageTimeMs(uid, which, rawRealTimeUs)
+                + convertUsToMs(getForegroundServiceTotalTimeUs(uid, rawRealTimeUs));
     }
 
     /**
@@ -183,7 +197,7 @@
         for (int i = 0, size = sippers.size(); i < size; i++) {
             final BatteryStats.Uid uid = sippers.get(i).uidObj;
             if (uid != null) {
-                final long timeMs = getProcessTimeMs(StatusType.FOREGROUND, uid,
+                final long timeMs = getProcessTimeMs(StatusType.SCREEN_USAGE, uid,
                         BatteryStats.STATS_SINCE_CHARGED);
                 activityTimeArray.put(uid.getUid(), timeMs);
                 totalActivityTimeMs += timeMs;
@@ -388,5 +402,15 @@
         return 0;
     }
 
+    @VisibleForTesting
+    long getForegroundServiceTotalTimeUs(BatteryStats.Uid uid, long rawRealtimeUs) {
+        final BatteryStats.Timer timer = uid.getForegroundServiceTimer();
+        if (timer != null) {
+            return timer.getTotalTimeLocked(rawRealtimeUs, BatteryStats.STATS_SINCE_CHARGED);
+        }
+
+        return 0;
+    }
+
 }
 
diff --git a/src/com/android/settings/fuelgauge/FakeUid.java b/src/com/android/settings/fuelgauge/FakeUid.java
index 70fb3d4..253dc02 100644
--- a/src/com/android/settings/fuelgauge/FakeUid.java
+++ b/src/com/android/settings/fuelgauge/FakeUid.java
@@ -22,6 +22,7 @@
 import android.os.BatteryStats.Uid;
 import android.util.ArrayMap;
 import android.util.SparseArray;
+import android.util.SparseIntArray;
 
 /**
  * Fake UID for testing power usage screen.
@@ -60,6 +61,11 @@
     }
 
     @Override
+    public ArrayMap<String, SparseIntArray> getJobCompletionStats() {
+        return null;
+    }
+
+    @Override
     public SparseArray<? extends Sensor> getSensorStats() {
         return null;
     }
@@ -203,6 +209,11 @@
     }
 
     @Override
+    public Timer getForegroundServiceTimer() {
+        return null;
+    }
+
+    @Override
     public long getProcessStateTime(int state, long elapsedRealtimeUs, int which) {
         return 0;
     }
diff --git a/src/com/android/settings/fuelgauge/OWNERS b/src/com/android/settings/fuelgauge/OWNERS
new file mode 100644
index 0000000..5b26c46
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/OWNERS
@@ -0,0 +1,6 @@
+# Default reviewers for this and subdirectories.
+dehboxturtle@google.com
+jackqdyulei@google.com
+
+# Emergency approvers in case the above are not available
+asapperstein@google.com
\ No newline at end of file
diff --git a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
index 712b9ad..adadb78 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
@@ -40,10 +40,11 @@
 import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.datausage.DataUsageUtils;
 import com.android.settings.fuelgauge.PowerUsageAdvanced.PowerUsageData.UsageType;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -123,6 +124,9 @@
         mPackageManager = context.getPackageManager();
         mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
         mBatteryUtils = BatteryUtils.getInstance(context);
+
+        // init the summary so other preferences won't have unnecessary move
+        updateHistPrefSummary(context);
     }
 
     @Override
@@ -161,7 +165,7 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
         return null;
     }
 
@@ -174,7 +178,13 @@
         }
         updatePreference(mHistPref);
         refreshPowerUsageDataList(mStatsHelper, mUsageListGroup);
+        updateHistPrefSummary(context);
 
+        BatteryEntry.startRequestQueue();
+        BatteryUtils.logRuntime(TAG, "refreshUI", startTime);
+    }
+
+    private void updateHistPrefSummary(Context context) {
         Intent batteryIntent =
                 context.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
         final boolean plugged = batteryIntent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) != 0;
@@ -185,9 +195,6 @@
         } else {
             mHistPref.hideBottomSummary();
         }
-
-        BatteryEntry.startRequestQueue();
-        BatteryUtils.logRuntime(TAG, "refreshUI", startTime);
     }
 
     @VisibleForTesting
@@ -243,7 +250,9 @@
     boolean shouldHideCategory(PowerUsageData powerUsageData) {
         return powerUsageData.usageType == UsageType.UNACCOUNTED
                 || powerUsageData.usageType == UsageType.OVERCOUNTED
-                || (powerUsageData.usageType == UsageType.USER && mUserManager.getUserCount() == 1);
+                || (powerUsageData.usageType == UsageType.USER && mUserManager.getUserCount() == 1)
+                || (powerUsageData.usageType == UsageType.CELL
+                && !DataUsageUtils.hasMobileData(getContext()));
     }
 
     @VisibleForTesting
@@ -329,7 +338,8 @@
         return usageType == UsageType.CELL
                 || usageType == UsageType.BLUETOOTH
                 || usageType == UsageType.WIFI
-                || usageType == UsageType.APP;
+                || usageType == UsageType.APP
+                || usageType == UsageType.SYSTEM;
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java b/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java
index ef7110e..bf4c2af 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java
@@ -31,11 +31,11 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.fuelgauge.anomaly.Anomaly;
 import com.android.settings.fuelgauge.anomaly.AnomalyDialogFragment;
 import com.android.settings.fuelgauge.anomaly.AnomalyPreference;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.List;
 
@@ -119,7 +119,7 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
         return null;
     }
 
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 86c3a32..ee6ebb2 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -57,7 +57,6 @@
 import com.android.settings.Utils;
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.applications.ManageApplications;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.display.AmbientDisplayPreferenceController;
@@ -71,6 +70,7 @@
 import com.android.settings.fuelgauge.anomaly.AnomalySummaryPreferenceController;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -303,8 +303,8 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
-        final List<PreferenceController> controllers = new ArrayList<>();
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         mBatteryHeaderPreferenceController = new BatteryHeaderPreferenceController(
                 context, getActivity(), this /* host */, getLifecycle());
         controllers.add(mBatteryHeaderPreferenceController);
@@ -715,7 +715,7 @@
             preference.setSummary(
                     (sipper.drainType != DrainType.APP || mBatteryUtils.shouldHideSipper(sipper))
                             ? timeSequence
-                            : TextUtils.expandTemplate(getText(R.string.battery_screen_usage),
+                            : TextUtils.expandTemplate(getText(R.string.battery_used_for),
                                     timeSequence));
         }
     }
@@ -887,7 +887,7 @@
                     public void onBatteryInfoLoaded(BatteryInfo info) {
                         mLoader.setSummary(SummaryProvider.this, info.chargeLabel);
                     }
-                });
+                }, true /* shortString */);
             });
         }
 
diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java
index 0c401b5..dd8ebc7 100644
--- a/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java
+++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java
@@ -17,12 +17,17 @@
 package com.android.settings.fuelgauge.anomaly;
 
 import android.content.Context;
+import android.net.Uri;
 import android.provider.Settings;
 import android.support.annotation.VisibleForTesting;
 import android.text.format.DateUtils;
 import android.util.KeyValueListParser;
 import android.util.Log;
 
+import java.util.Arrays;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 /**
  * Class to store the policy for anomaly detection, which comes from
  * {@link android.provider.Settings.Global}
@@ -43,6 +48,8 @@
     @VisibleForTesting
     static final String KEY_WAKEUP_ALARM_THRESHOLD = "wakeup_alarm_threshold";
     @VisibleForTesting
+    static final String KEY_WAKEUP_BLACKLISTED_TAGS = "wakeup_blacklisted_tags";
+    @VisibleForTesting
     static final String KEY_BLUETOOTH_SCAN_THRESHOLD = "bluetooth_scan_threshold";
 
     /**
@@ -94,6 +101,14 @@
     public final long wakeupAlarmThreshold;
 
     /**
+     * Array of blacklisted wakeups, by tag.
+     *
+     * @see Settings.Global#ANOMALY_DETECTION_CONSTANTS
+     * @see #KEY_WAKEUP_BLACKLISTED_TAGS
+     */
+    public final Set<String> wakeupBlacklistedTags;
+
+    /**
      * Threshold for bluetooth unoptimized scanning time in milli seconds
      *
      * @see Settings.Global#ANOMALY_DETECTION_CONSTANTS
@@ -119,15 +134,18 @@
             Log.e(TAG, "Bad anomaly detection constants");
         }
 
-        anomalyDetectionEnabled = mParserWrapper.getBoolean(KEY_ANOMALY_DETECTION_ENABLED, true);
-        wakeLockDetectionEnabled = mParserWrapper.getBoolean(KEY_WAKELOCK_DETECTION_ENABLED, true);
-        wakeupAlarmDetectionEnabled = mParserWrapper.getBoolean(KEY_WAKEUP_ALARM_DETECTION_ENABLED,
-                false);
+        anomalyDetectionEnabled =
+                mParserWrapper.getBoolean(KEY_ANOMALY_DETECTION_ENABLED, false);
+        wakeLockDetectionEnabled =
+                mParserWrapper.getBoolean(KEY_WAKELOCK_DETECTION_ENABLED,false);
+        wakeupAlarmDetectionEnabled =
+                mParserWrapper.getBoolean(KEY_WAKEUP_ALARM_DETECTION_ENABLED,false);
         bluetoothScanDetectionEnabled = mParserWrapper.getBoolean(
-                KEY_BLUETOOTH_SCAN_DETECTION_ENABLED, true);
+                KEY_BLUETOOTH_SCAN_DETECTION_ENABLED, false);
         wakeLockThreshold = mParserWrapper.getLong(KEY_WAKELOCK_THRESHOLD,
                 DateUtils.HOUR_IN_MILLIS);
-        wakeupAlarmThreshold = mParserWrapper.getLong(KEY_WAKEUP_ALARM_THRESHOLD, 60);
+        wakeupAlarmThreshold = mParserWrapper.getLong(KEY_WAKEUP_ALARM_THRESHOLD, 10);
+        wakeupBlacklistedTags = parseStringSet(KEY_WAKEUP_BLACKLISTED_TAGS, null);
         bluetoothScanThreshold = mParserWrapper.getLong(KEY_BLUETOOTH_SCAN_THRESHOLD,
                 30 * DateUtils.MINUTE_IN_MILLIS);
     }
@@ -148,4 +166,14 @@
                 return false; // Disabled when no this type
         }
     }
+
+    private Set<String> parseStringSet(final String key, final Set<String> defaultSet) {
+        final String value = mParserWrapper.getString(key, null);
+        if (value != null) {
+            return Arrays.stream(value.split(":"))
+                    .map(String::trim).map(Uri::decode).collect(Collectors.toSet());
+        } else {
+            return defaultSet;
+        }
+    }
 }
diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceController.java b/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceController.java
index 59c8b2c..6bfc9ff 100644
--- a/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceController.java
@@ -102,6 +102,8 @@
 
             mAnomalyPreference.setTitle(title);
             mAnomalyPreference.setSummary(summary);
+        } else {
+            mAnomalyPreference.setVisible(false);
         }
     }
 
diff --git a/src/com/android/settings/fuelgauge/anomaly/KeyValueListParserWrapper.java b/src/com/android/settings/fuelgauge/anomaly/KeyValueListParserWrapper.java
index 4a9c2a9..7d216c5 100644
--- a/src/com/android/settings/fuelgauge/anomaly/KeyValueListParserWrapper.java
+++ b/src/com/android/settings/fuelgauge/anomaly/KeyValueListParserWrapper.java
@@ -44,6 +44,14 @@
     void setString(String str) throws IllegalArgumentException;
 
     /**
+     * Get the value for key as a string.
+     * @param key The key to lookup.
+     * @param defaultValue The value to return if the key was not found.
+     * @return the string value associated with the key.
+     */
+    String getString(String key, String defaultValue);
+
+    /**
      * Get the value for key as a boolean.
      * @param key The key to lookup.
      * @param defaultValue The value to return if the key was not found.
diff --git a/src/com/android/settings/fuelgauge/anomaly/KeyValueListParserWrapperImpl.java b/src/com/android/settings/fuelgauge/anomaly/KeyValueListParserWrapperImpl.java
index f724034..cf3aa95 100644
--- a/src/com/android/settings/fuelgauge/anomaly/KeyValueListParserWrapperImpl.java
+++ b/src/com/android/settings/fuelgauge/anomaly/KeyValueListParserWrapperImpl.java
@@ -39,6 +39,11 @@
     }
 
     @Override
+    public String getString(String key, String defaultValue) {
+        return mParser.getString(key, defaultValue);
+    }
+
+    @Override
     public boolean getBoolean(String key, boolean defaultValue) {
         return mParser.getBoolean(key, defaultValue);
     }
diff --git a/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java b/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java
index b0e34fa..fc746b9 100644
--- a/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java
+++ b/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java
@@ -49,7 +49,9 @@
     public void handlePositiveAction(Anomaly anomaly, int contextMetricsKey) {
         super.handlePositiveAction(anomaly, contextMetricsKey);
         mRuntimePermissionPresenter.revokeRuntimePermission(anomaly.packageName,
-                Manifest.permission_group.LOCATION);
+                Manifest.permission.ACCESS_COARSE_LOCATION);
+        mRuntimePermissionPresenter.revokeRuntimePermission(anomaly.packageName,
+                Manifest.permission.ACCESS_FINE_LOCATION);
     }
 
     @Override
diff --git a/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java b/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java
index 8823a17..936fe30 100644
--- a/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java
+++ b/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java
@@ -29,10 +29,11 @@
 import com.android.settings.fuelgauge.anomaly.Anomaly;
 import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy;
 import com.android.settings.fuelgauge.anomaly.AnomalyUtils;
-import com.android.settings.fuelgauge.anomaly.action.AnomalyAction;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * Check whether apps has too many wakeup alarms
@@ -42,6 +43,7 @@
     @VisibleForTesting
     BatteryUtils mBatteryUtils;
     private long mWakeupAlarmThreshold;
+    private Set<String> mWakeupBlacklistedTags;
     private Context mContext;
     private AnomalyUtils mAnomalyUtils;
 
@@ -56,6 +58,7 @@
         mBatteryUtils = BatteryUtils.getInstance(context);
         mAnomalyUtils = anomalyUtils;
         mWakeupAlarmThreshold = policy.wakeupAlarmThreshold;
+        mWakeupBlacklistedTags = policy.wakeupBlacklistedTags;
     }
 
     @Override
@@ -123,11 +126,14 @@
             final BatteryStats.Uid.Pkg ps = packageStats.valueAt(ipkg);
             final ArrayMap<String, ? extends BatteryStats.Counter> alarms =
                     ps.getWakeupAlarmStats();
-            for (int iwa = alarms.size() - 1; iwa >= 0; iwa--) {
-                int count = alarms.valueAt(iwa).getCountLocked(BatteryStats.STATS_SINCE_CHARGED);
+            for (Map.Entry<String, ? extends BatteryStats.Counter> alarm : alarms.entrySet()) {
+                if (mWakeupBlacklistedTags != null
+                        && mWakeupBlacklistedTags.contains(alarm.getKey())) {
+                    continue;
+                }
+                int count = alarm.getValue().getCountLocked(BatteryStats.STATS_SINCE_CHARGED);
                 wakeups += count;
             }
-
         }
 
         return wakeups;
diff --git a/src/com/android/settings/gestures/AssistGestureFeatureProvider.java b/src/com/android/settings/gestures/AssistGestureFeatureProvider.java
index 447562d..bc87ffe 100644
--- a/src/com/android/settings/gestures/AssistGestureFeatureProvider.java
+++ b/src/com/android/settings/gestures/AssistGestureFeatureProvider.java
@@ -18,7 +18,7 @@
 
 import android.content.Context;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.List;
@@ -33,6 +33,6 @@
     boolean isSensorAvailable(Context context);
 
     /** Returns a list of additional preference controllers */
-    List<PreferenceController> getControllers(Context context, Lifecycle lifecycle);
+    List<AbstractPreferenceController> getControllers(Context context, Lifecycle lifecycle);
 
 }
diff --git a/src/com/android/settings/gestures/AssistGestureFeatureProviderImpl.java b/src/com/android/settings/gestures/AssistGestureFeatureProviderImpl.java
index 4509862..187b1ca 100644
--- a/src/com/android/settings/gestures/AssistGestureFeatureProviderImpl.java
+++ b/src/com/android/settings/gestures/AssistGestureFeatureProviderImpl.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
@@ -38,7 +38,7 @@
     }
 
     @Override
-    public List<PreferenceController> getControllers(Context context, Lifecycle lifecycle) {
+    public List<AbstractPreferenceController> getControllers(Context context, Lifecycle lifecycle) {
         return new ArrayList<>();
     }
 
diff --git a/src/com/android/settings/gestures/AssistGestureSettings.java b/src/com/android/settings/gestures/AssistGestureSettings.java
index dd0a991..8878f47 100644
--- a/src/com/android/settings/gestures/AssistGestureSettings.java
+++ b/src/com/android/settings/gestures/AssistGestureSettings.java
@@ -21,10 +21,10 @@
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
@@ -35,8 +35,6 @@
 
     private static final String TAG = "AssistGesture";
 
-    private static final String KEY_ASSIST = "gesture_assist";
-
     @Override
     public int getMetricsCategory() {
         return MetricsProto.MetricsEvent.SETTINGS_ASSIST_GESTURE;
@@ -53,15 +51,13 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
         return buildPreferenceControllers(context, getLifecycle());
     }
 
-    private static List<PreferenceController> buildPreferenceControllers(Context context,
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
             Lifecycle lifecycle) {
-        final List<PreferenceController> controllers = new ArrayList<>();
-        controllers.add(new AssistGesturePreferenceController(context, lifecycle, KEY_ASSIST,
-                false /* assistOnly */));
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.addAll(FeatureFactory.getFactory(context).getAssistGestureFeatureProvider()
                 .getControllers(context, lifecycle));
 
@@ -79,9 +75,17 @@
                 }
 
                 @Override
-                public List<PreferenceController> getPreferenceControllers(Context context) {
+                public List<AbstractPreferenceController> getPreferenceControllers(
+                        Context context) {
                     return buildPreferenceControllers(context, null /* lifecycle */);
                 }
+
+                @Override
+                protected boolean isPageSearchEnabled(Context context) {
+                    return new AssistGestureSettingsPreferenceController(context,
+                            null /* lifecycle */, null /* key */, false /* assistOnly */)
+                            .isAvailable();
+                }
             };
 }
 
diff --git a/src/com/android/settings/gestures/AssistGesturePreferenceController.java b/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java
similarity index 72%
rename from src/com/android/settings/gestures/AssistGesturePreferenceController.java
rename to src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java
index b91f230..bf6ee8c 100644
--- a/src/com/android/settings/gestures/AssistGesturePreferenceController.java
+++ b/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java
@@ -16,6 +16,9 @@
 
 package com.android.settings.gestures;
 
+import static android.provider.Settings.Secure.ASSIST_GESTURE_ENABLED;
+import static android.provider.Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED;
+
 import android.content.Context;
 import android.content.Intent;
 import android.provider.Settings;
@@ -32,19 +35,17 @@
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
-import static android.provider.Settings.Secure.ASSIST_GESTURE_ENABLED;
-
-public class AssistGesturePreferenceController extends GesturePreferenceController
+public class AssistGestureSettingsPreferenceController extends GesturePreferenceController
         implements OnResume {
 
-    private final int ON = 1;
-    private final int OFF = 0;
-
     private static final String PREF_KEY_VIDEO = "gesture_assist_video";
+
+    private static final String SECURE_KEY_ASSIST = ASSIST_GESTURE_ENABLED;
+    private static final String SECURE_KEY_SILENCE = ASSIST_GESTURE_SILENCE_ALERTS_ENABLED;
+    private static final int ON = 1;
+    private static final int OFF = 0;
+
     private final String mAssistGesturePrefKey;
-
-    private final String SECURE_KEY = ASSIST_GESTURE_ENABLED;
-
     private final AssistGestureFeatureProvider mFeatureProvider;
     private boolean mWasAvailable;
 
@@ -54,8 +55,8 @@
     @VisibleForTesting
     boolean mAssistOnly;
 
-    public AssistGesturePreferenceController(Context context, Lifecycle lifecycle, String key,
-            boolean assistOnly) {
+    public AssistGestureSettingsPreferenceController(Context context, Lifecycle lifecycle,
+            String key, boolean assistOnly) {
         super(context, lifecycle);
         mFeatureProvider = FeatureFactory.getFactory(context).getAssistGestureFeatureProvider();
         mWasAvailable = isAvailable();
@@ -76,14 +77,6 @@
     public void displayPreference(PreferenceScreen screen) {
         mScreen = screen;
         mPreference = screen.findPreference(getPreferenceKey());
-        if (!mFeatureProvider.isSensorAvailable(mContext)) {
-            removePreference(mScreen, getPreferenceKey());
-            return;
-        }
-        if (!mFeatureProvider.isSupported(mContext)) {
-            mScreen.removePreference(mPreference);
-            return;
-        }
         // Call super last or AbstractPreferenceController might remove the preference from the
         // screen (if !isAvailable()) before we can save a reference to it.
         super.displayPreference(screen);
@@ -91,14 +84,6 @@
 
     @Override
     public void onResume() {
-        // This check must be done in case the user disables Assistant while still on the settings
-        // page. This check is slightly different than isAvailable() in some cases due to this
-        // setting being in multiple places that require different behavior
-        if (mScreen != null && !mFeatureProvider.isSupported(mContext)) {
-            mScreen.removePreference(mPreference);
-            mWasAvailable = false;
-            return;
-        }
         if (mWasAvailable != isAvailable()) {
             // Only update the preference visibility if the availability has changed -- otherwise
             // the preference may be incorrectly added to screens with collapsed sections.
@@ -112,7 +97,7 @@
             return;
         }
 
-        if (mFeatureProvider.isSupported(mContext)) {
+        if (isAvailable()) {
             if (mScreen.findPreference(getPreferenceKey()) == null) {
                 mScreen.addPreference(mPreference);
             }
@@ -121,15 +106,22 @@
         }
     }
 
+    private boolean isAssistGestureEnabled() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                SECURE_KEY_ASSIST, ON) != 0;
+    }
+
+    private boolean isSilenceGestureEnabled() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                SECURE_KEY_SILENCE, ON) != 0;
+    }
+
     @Override
     public void updateState(Preference preference) {
-        boolean isEnabled = isSwitchPrefEnabled() && mFeatureProvider.isSupported(mContext);
+        boolean isEnabled = isAssistGestureEnabled() && mFeatureProvider.isSupported(mContext);
 
         if (!mAssistOnly) {
-            boolean assistGestureSilenceEnabled = Settings.Secure.getInt(
-                    mContext.getContentResolver(),
-                    Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED, 1) != 0;
-            isEnabled = isEnabled || assistGestureSilenceEnabled;
+            isEnabled = isEnabled || isSilenceGestureEnabled();
         }
 
         if (preference != null) {
@@ -146,7 +138,8 @@
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean enabled = (boolean) newValue;
-        Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY, enabled ? ON : OFF);
+        Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY_ASSIST,
+                enabled ? ON : OFF);
         updateState(preference);
         return true;
     }
@@ -163,9 +156,8 @@
 
     @Override
     protected boolean isSwitchPrefEnabled() {
-        final int assistGestureEnabled = Settings.Secure.getInt(mContext.getContentResolver(),
-                SECURE_KEY, ON);
-        return assistGestureEnabled != 0;
+        // Does nothing
+        return true;
     }
 
     @Override
@@ -174,7 +166,7 @@
                 AssistGestureSettings.class.getName(), mAssistGesturePrefKey,
                 mContext.getString(R.string.display_settings));
 
-        return new InlineSwitchPayload(SECURE_KEY, ResultPayload.SettingsSource.SECURE,
+        return new InlineSwitchPayload(SECURE_KEY_ASSIST, ResultPayload.SettingsSource.SECURE,
                 ON /* onValue */, intent, isAvailable(), ON /* defaultValue */);
     }
 }
diff --git a/src/com/android/settings/gestures/DoubleTapPowerSettings.java b/src/com/android/settings/gestures/DoubleTapPowerSettings.java
index 4efe3be..0dca805 100644
--- a/src/com/android/settings/gestures/DoubleTapPowerSettings.java
+++ b/src/com/android/settings/gestures/DoubleTapPowerSettings.java
@@ -22,11 +22,11 @@
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
@@ -66,13 +66,13 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
         return buildPreferenceControllers(context, getLifecycle());
     }
 
-    private static List<PreferenceController> buildPreferenceControllers(Context context,
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
             Lifecycle lifecycle) {
-        final List<PreferenceController> controllers = new ArrayList<>();
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new DoubleTapPowerPreferenceController(context, lifecycle,
                 KEY_DOUBLE_TAP_POWER));
         return controllers;
@@ -89,7 +89,7 @@
                 }
 
                 @Override
-                public List<PreferenceController> getPreferenceControllers(Context context) {
+                public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
                     return buildPreferenceControllers(context, null /* lifecycle */);
                 }
             };
diff --git a/src/com/android/settings/gestures/DoubleTapScreenSettings.java b/src/com/android/settings/gestures/DoubleTapScreenSettings.java
index 0cc0365..c0cd453e 100644
--- a/src/com/android/settings/gestures/DoubleTapScreenSettings.java
+++ b/src/com/android/settings/gestures/DoubleTapScreenSettings.java
@@ -24,11 +24,11 @@
 import com.android.internal.hardware.AmbientDisplayConfiguration;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
@@ -73,13 +73,13 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
         return buildPreferenceControllers(context, getLifecycle());
     }
 
-    private static List<PreferenceController> buildPreferenceControllers(Context context,
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
             Lifecycle lifecycle) {
-        final List<PreferenceController> controllers = new ArrayList<>();
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new DoubleTapScreenPreferenceController(context, lifecycle,
                 new AmbientDisplayConfiguration(context), UserHandle.myUserId(),
                 KEY_DOUBLE_TAP_SCREEN));
@@ -97,7 +97,7 @@
                 }
 
                 @Override
-                public List<PreferenceController> getPreferenceControllers(Context context) {
+                public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
                     return buildPreferenceControllers(context, null /* lifecycle */);
                 }
             };
diff --git a/src/com/android/settings/gestures/DoubleTwistGestureSettings.java b/src/com/android/settings/gestures/DoubleTwistGestureSettings.java
index e5fb9a0..ac9de88 100644
--- a/src/com/android/settings/gestures/DoubleTwistGestureSettings.java
+++ b/src/com/android/settings/gestures/DoubleTwistGestureSettings.java
@@ -22,11 +22,11 @@
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
@@ -66,13 +66,13 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
         return buildPreferenceControllers(context, getLifecycle());
     }
 
-    private static List<PreferenceController> buildPreferenceControllers(Context context,
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
             Lifecycle lifecycle) {
-        final List<PreferenceController> controllers = new ArrayList<>();
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new DoubleTwistPreferenceController(context, lifecycle, KEY_DOUBLE_TWIST));
         return controllers;
     }
@@ -88,7 +88,7 @@
                 }
 
                 @Override
-                public List<PreferenceController> getPreferenceControllers(Context context) {
+                public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
                     return buildPreferenceControllers(context, null /* lifecycle */);
                 }
             };
diff --git a/src/com/android/settings/gestures/GesturePreference.java b/src/com/android/settings/gestures/GesturePreference.java
deleted file mode 100644
index 5a64a5a..0000000
--- a/src/com/android/settings/gestures/GesturePreference.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package com.android.settings.gestures;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.SurfaceTexture;
-import android.media.MediaPlayer;
-import android.net.Uri;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.view.View;
-import android.view.Surface;
-import android.view.TextureView;
-import android.widget.ImageView;
-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 boolean mAnimationAvailable;
-    private boolean mVideoReady;
-    private boolean mScrolling;
-    private int mPreviewResource;
-
-    public GesturePreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        mContext = context;
-        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();
-            mMediaPlayer = MediaPlayer.create(mContext, mVideoPath);
-            if (mMediaPlayer != null && mMediaPlayer.getDuration() > 0) {
-                setLayoutResource(R.layout.gesture_preference);
-
-                mPreviewResource = attributes.getResourceId(
-                        R.styleable.GesturePreference_preview, 0);
-
-                mMediaPlayer.setOnSeekCompleteListener(new MediaPlayer.OnSeekCompleteListener() {
-                    @Override
-                    public void onSeekComplete(MediaPlayer mp) {
-                        mVideoReady = true;
-                    }
-                });
-
-                mMediaPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
-                    @Override
-                    public void onPrepared(MediaPlayer mediaPlayer) {
-                        mediaPlayer.setLooping(true);
-                    }
-                });
-                mAnimationAvailable = 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);
-
-        if (!mAnimationAvailable) {
-            return;
-        }
-
-        final TextureView video = (TextureView) holder.findViewById(R.id.gesture_video);
-        final ImageView imageView = (ImageView) holder.findViewById(R.id.gesture_image);
-        imageView.setImageResource(mPreviewResource);
-        final ImageView playButton = (ImageView) holder.findViewById(R.id.gesture_play_button);
-
-        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) {
-                if (mMediaPlayer != null) {
-                    mMediaPlayer.setSurface(new Surface(surfaceTexture));
-                    mVideoReady = false;
-                    mMediaPlayer.seekTo(0);
-                }
-            }
-
-            @Override
-            public void onSurfaceTextureSizeChanged(SurfaceTexture surfaceTexture, int width,
-                    int height) {
-            }
-
-            @Override
-            public boolean onSurfaceTextureDestroyed(SurfaceTexture surfaceTexture) {
-                imageView.setVisibility(View.VISIBLE);
-                return false;
-            }
-
-            @Override
-            public void onSurfaceTextureUpdated(SurfaceTexture surfaceTexture) {
-                if (mVideoReady && imageView.getVisibility() == View.VISIBLE) {
-                    imageView.setVisibility(View.GONE);
-                } else if (mScrolling) {
-                    mScrolling = false;
-                    if (mMediaPlayer != null && mMediaPlayer.isPlaying()) {
-                        mMediaPlayer.pause();
-                        playButton.setVisibility(View.VISIBLE);
-                    }
-                }
-                if (mMediaPlayer != null && !mMediaPlayer.isPlaying() &&
-                        playButton.getVisibility() != View.VISIBLE) {
-                    playButton.setVisibility(View.VISIBLE);
-                }
-            }
-        });
-
-    }
-
-    @Override
-    public void onDetached() {
-        if (mMediaPlayer != null) {
-            mMediaPlayer.stop();
-            mMediaPlayer.reset();
-            mMediaPlayer.release();
-        }
-        super.onDetached();
-    }
-
-    void setScrolling(boolean scrolling) {
-        mScrolling = scrolling;
-    }
-
-    void onViewVisible() {
-        if (mVideoReady && mMediaPlayer != null && !mMediaPlayer.isPlaying()) {
-            mMediaPlayer.seekTo(0);
-        }
-    }
-
-    void onViewInvisible() {
-        if (mMediaPlayer != null && mMediaPlayer.isPlaying()) {
-            mMediaPlayer.pause();
-        }
-    }
-
-}
diff --git a/src/com/android/settings/gestures/GesturePreferenceController.java b/src/com/android/settings/gestures/GesturePreferenceController.java
index a5df949..a7f8997 100644
--- a/src/com/android/settings/gestures/GesturePreferenceController.java
+++ b/src/com/android/settings/gestures/GesturePreferenceController.java
@@ -17,22 +17,33 @@
 package com.android.settings.gestures;
 
 import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 import android.support.v7.preference.TwoStatePreference;
 
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.widget.VideoPreference;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnStart;
-import com.android.settingslib.core.lifecycle.events.OnStop;
+import com.android.settingslib.core.lifecycle.events.OnCreate;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
 
-public abstract class GesturePreferenceController extends PreferenceController
-        implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnStart, OnStop {
+public abstract class GesturePreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
+        LifecycleObserver, OnResume, OnPause, OnCreate, OnSaveInstanceState  {
+
+    @VisibleForTesting
+    static final String KEY_VIDEO_PAUSED = "key_video_paused";
 
     private VideoPreference mVideoPreference;
+    @VisibleForTesting
+    boolean mVideoPaused;
 
     public GesturePreferenceController(Context context, Lifecycle lifecycle) {
         super(context);
@@ -67,16 +78,29 @@
     }
 
     @Override
-    public void onStop() {
+    public void onCreate(Bundle savedInstanceState) {
+        if (savedInstanceState != null) {
+            mVideoPaused = savedInstanceState.getBoolean(KEY_VIDEO_PAUSED, false);
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        outState.putBoolean(KEY_VIDEO_PAUSED, mVideoPaused);
+    }
+
+    @Override
+    public void onPause() {
         if (mVideoPreference != null) {
+            mVideoPaused = mVideoPreference.isVideoPaused();
             mVideoPreference.onViewInvisible();
         }
     }
 
     @Override
-    public void onStart() {
+    public void onResume() {
         if (mVideoPreference != null) {
-            mVideoPreference.onViewVisible();
+            mVideoPreference.onViewVisible(mVideoPaused);
         }
     }
 
diff --git a/src/com/android/settings/gestures/GestureSettings.java b/src/com/android/settings/gestures/GestureSettings.java
new file mode 100644
index 0000000..4d38b09
--- /dev/null
+++ b/src/com/android/settings/gestures/GestureSettings.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.content.Context;
+import android.os.UserHandle;
+import android.provider.SearchIndexableResource;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import com.android.internal.hardware.AmbientDisplayConfiguration;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class GestureSettings extends DashboardFragment {
+
+    private static final String TAG = "GestureSettings";
+
+    private static final String KEY_ASSIST = "gesture_assist_input_summary";
+    private static final String KEY_SWIPE_DOWN = "gesture_swipe_down_fingerprint_input_summary";
+    private static final String KEY_DOUBLE_TAP_POWER = "gesture_double_tap_power_input_summary";
+    private static final String KEY_DOUBLE_TWIST = "gesture_double_twist_input_summary";
+    private static final String KEY_DOUBLE_TAP_SCREEN = "gesture_double_tap_screen_input_summary";
+    private static final String KEY_PICK_UP = "gesture_pick_up_input_summary";
+
+    private AmbientDisplayConfiguration mAmbientDisplayConfig;
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.SETTINGS_GESTURES;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.gestures;
+    }
+
+    @Override
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        if (mAmbientDisplayConfig == null) {
+            mAmbientDisplayConfig = new AmbientDisplayConfiguration(context);
+        }
+
+        return buildPreferenceControllers(context, getLifecycle(), mAmbientDisplayConfig);
+    }
+
+    static List<AbstractPreferenceController> buildPreferenceControllers(
+            @NonNull Context context, @Nullable Lifecycle lifecycle,
+            @NonNull AmbientDisplayConfiguration ambientDisplayConfiguration) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        controllers.add(new AssistGestureSettingsPreferenceController(context, lifecycle,
+                KEY_ASSIST, false /* assistOnly */));
+        controllers.add(new SwipeToNotificationPreferenceController(context, lifecycle,
+                KEY_SWIPE_DOWN));
+        controllers.add(new DoubleTwistPreferenceController(context, lifecycle, KEY_DOUBLE_TWIST));
+        controllers.add(new DoubleTapPowerPreferenceController(context, lifecycle,
+                KEY_DOUBLE_TAP_POWER));
+        controllers.add(new PickupGesturePreferenceController(context, lifecycle,
+                ambientDisplayConfiguration, UserHandle.myUserId(), KEY_PICK_UP));
+        controllers.add(new DoubleTapScreenPreferenceController(context, lifecycle,
+                ambientDisplayConfiguration, UserHandle.myUserId(), KEY_DOUBLE_TAP_SCREEN));
+        return controllers;
+    }
+
+    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(
+                        Context context, boolean enabled) {
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = R.xml.gestures;
+                    return Arrays.asList(sir);
+                }
+
+                @Override
+                public List<AbstractPreferenceController> getPreferenceControllers(
+                        Context context) {
+                    return buildPreferenceControllers(context, null,
+                            new AmbientDisplayConfiguration(context));
+                }
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    List<String> keys = super.getNonIndexableKeys(context);
+                    // Duplicates in summary and details pages.
+                    keys.add(KEY_ASSIST);
+                    keys.add(KEY_SWIPE_DOWN);
+                    keys.add(KEY_DOUBLE_TAP_POWER);
+                    keys.add(KEY_DOUBLE_TWIST);
+                    keys.add(KEY_DOUBLE_TAP_SCREEN);
+                    keys.add(KEY_PICK_UP);
+
+                    return keys;
+                }
+            };
+}
diff --git a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java
new file mode 100644
index 0000000..d1b47b2
--- /dev/null
+++ b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+
+import com.android.internal.hardware.AmbientDisplayConfiguration;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.util.List;
+
+public class GesturesSettingPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
+
+    private static final String KEY_GESTURES_SETTINGS = "gesture_settings";
+
+    private final AssistGestureFeatureProvider mFeatureProvider;
+    private List<AbstractPreferenceController> mGestureControllers;
+
+    public GesturesSettingPreferenceController(Context context) {
+        super(context);
+        mFeatureProvider = FeatureFactory.getFactory(context).getAssistGestureFeatureProvider();
+    }
+
+    @Override
+    public boolean isAvailable() {
+        if (mGestureControllers == null) {
+            mGestureControllers = GestureSettings.buildPreferenceControllers(mContext,
+                    null /* lifecycle */, new AmbientDisplayConfiguration(mContext));
+        }
+        boolean isAvailable = false;
+        for (AbstractPreferenceController controller : mGestureControllers) {
+            isAvailable = isAvailable || controller.isAvailable();
+        }
+        return isAvailable;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_GESTURES_SETTINGS;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        if (!mFeatureProvider.isSensorAvailable(mContext)) {
+            preference.setSummary("");
+            return;
+        }
+        final ContentResolver contentResolver = mContext.getContentResolver();
+        final boolean assistGestureEnabled = Settings.Secure.getInt(
+                contentResolver, Settings.Secure.ASSIST_GESTURE_ENABLED, 1) != 0;
+        final boolean assistGestureSilenceEnabled = Settings.Secure.getInt(
+                contentResolver, Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED, 1) != 0;
+        final String summary;
+        if (mFeatureProvider.isSupported(mContext) && assistGestureEnabled) {
+            summary = mContext.getString(
+                    R.string.language_input_gesture_summary_on_with_assist);
+        } else if (assistGestureSilenceEnabled) {
+            summary = mContext.getString(
+                    R.string.language_input_gesture_summary_on_non_assist);
+        } else {
+            summary = mContext.getString(R.string.language_input_gesture_summary_off);
+        }
+        preference.setSummary(summary);
+    }
+
+}
diff --git a/src/com/android/settings/gestures/PickupGestureSettings.java b/src/com/android/settings/gestures/PickupGestureSettings.java
index 7cc264c..a4f1776 100644
--- a/src/com/android/settings/gestures/PickupGestureSettings.java
+++ b/src/com/android/settings/gestures/PickupGestureSettings.java
@@ -24,11 +24,11 @@
 import com.android.internal.hardware.AmbientDisplayConfiguration;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
@@ -73,13 +73,13 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
         return buildPreferenceControllers(context, getLifecycle());
     }
 
-    private static List<PreferenceController> buildPreferenceControllers(Context context,
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
             Lifecycle lifecycle) {
-        final List<PreferenceController> controllers = new ArrayList<>();
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new PickupGesturePreferenceController(context, lifecycle,
                 new AmbientDisplayConfiguration(context), UserHandle.myUserId(), KEY_PICK_UP));
         return controllers;
@@ -96,7 +96,7 @@
                 }
 
                 @Override
-                public List<PreferenceController> getPreferenceControllers(Context context) {
+                public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
                     return buildPreferenceControllers(context, null /* lifecycle */);
                 }
             };
diff --git a/src/com/android/settings/gestures/SwipeToNotificationSettings.java b/src/com/android/settings/gestures/SwipeToNotificationSettings.java
index 05a1202..c6f346a 100644
--- a/src/com/android/settings/gestures/SwipeToNotificationSettings.java
+++ b/src/com/android/settings/gestures/SwipeToNotificationSettings.java
@@ -22,11 +22,11 @@
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
@@ -67,13 +67,13 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
         return buildPreferenceControllers(context, getLifecycle());
     }
 
-    private static List<PreferenceController> buildPreferenceControllers(Context context,
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
             Lifecycle lifecycle) {
-        final List<PreferenceController> controllers = new ArrayList<>();
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new SwipeToNotificationPreferenceController(context, lifecycle, KEY));
         return controllers;
     }
@@ -89,7 +89,7 @@
                 }
 
                 @Override
-                public List<PreferenceController> getPreferenceControllers(Context context) {
+                public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
                     return buildPreferenceControllers(context, null /* lifecycle */);
                 }
             };
diff --git a/src/com/android/settings/graph/UsageView.java b/src/com/android/settings/graph/UsageView.java
index 38eb027..bcf0441 100644
--- a/src/com/android/settings/graph/UsageView.java
+++ b/src/com/android/settings/graph/UsageView.java
@@ -81,6 +81,7 @@
             }
         }
         mUsageGraph.setAccentColor(a.getColor(R.styleable.UsageView_android_colorAccent, 0));
+        a.recycle();
     }
 
     public void clearPaths() {
diff --git a/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java b/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java
index a7862ae..48b0b4a 100644
--- a/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java
+++ b/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java
@@ -21,7 +21,6 @@
 import android.annotation.Nullable;
 import android.app.Activity;
 import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
@@ -31,17 +30,15 @@
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.v7.preference.PreferenceScreen;
+import android.provider.SearchIndexableResource;
 import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodManager;
-import android.view.inputmethod.InputMethodSubtype;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
-import com.android.settings.search.SearchIndexableRaw;
 import com.android.settingslib.inputmethod.InputMethodAndSubtypeUtil;
 import com.android.settingslib.inputmethod.InputMethodPreference;
 import com.android.settingslib.inputmethod.InputMethodSettingValuesWrapper;
@@ -60,10 +57,9 @@
 
     @Override
     public void onCreatePreferences(Bundle bundle, String s) {
+        addPreferencesFromResource(R.xml.available_virtual_keyboard);
         Activity activity = getActivity();
-        PreferenceScreen screen = getPreferenceManager().createPreferenceScreen(activity);
-        screen.setTitle(activity.getString(R.string.available_virtual_keyboard_category));
-        setPreferenceScreen(screen);
+
         mInputMethodSettingValues = InputMethodSettingValuesWrapper.getInstance(activity);
         mImm = activity.getSystemService(InputMethodManager.class);
         mDpm = activity.getSystemService(DevicePolicyManager.class);
@@ -105,7 +101,7 @@
         }
         try {
             return packageManager.getDrawable(packageName, resId, applicationInfo);
-        } catch (Exception e){
+        } catch (Exception e) {
             return null;
         }
     }
@@ -172,48 +168,16 @@
         }
     }
 
-    private static List<InputMethodSubtype> getAllSubtypesOf(final InputMethodInfo imi) {
-        final int subtypeCount = imi.getSubtypeCount();
-        final List<InputMethodSubtype> allSubtypes = new ArrayList<>(subtypeCount);
-        for (int index = 0; index < subtypeCount; index++) {
-            allSubtypes.add(imi.getSubtypeAt(index));
-        }
-        return allSubtypes;
-    }
-
-    static List<SearchIndexableRaw> buildSearchIndexOfInputMethods(final Context context,
-            final List<InputMethodInfo> inputMethods, final String screenTitle) {
-        final List<SearchIndexableRaw> indexes = new ArrayList<>();
-        for (int i = 0; i < inputMethods.size(); i++) {
-            final InputMethodInfo imi = inputMethods.get(i);
-            final ServiceInfo serviceInfo = imi.getServiceInfo();
-            final SearchIndexableRaw index = new SearchIndexableRaw(context);
-            index.key = new ComponentName(serviceInfo.packageName, serviceInfo.name)
-                    .flattenToString();
-            index.title = imi.loadLabel(context.getPackageManager()).toString();
-            index.summaryOn = index.summaryOff = InputMethodAndSubtypeUtil
-                    .getSubtypeLocaleNameListAsSentence(getAllSubtypesOf(imi), context, imi);
-            index.screenTitle = screenTitle;
-            indexes.add(index);
-        }
-        return indexes;
-    }
-
-    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
-        @Override
-        public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
-            final InputMethodManager imm = context.getSystemService(InputMethodManager.class);
-            final List<InputMethodInfo> enabledInputMethods = imm.getEnabledInputMethodList();
-            final List<InputMethodInfo> disabledInputMethods = new ArrayList<>();
-            for (final InputMethodInfo imi : imm.getInputMethodList()) {
-                if (!enabledInputMethods.contains(imi)) {
-                    disabledInputMethods.add(imi);
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+                        boolean enabled) {
+                    List<SearchIndexableResource> res = new ArrayList<>();
+                    SearchIndexableResource index = new SearchIndexableResource(context);
+                    index.xmlResId = R.xml.available_virtual_keyboard;
+                    res.add(index);
+                    return res;
                 }
-            }
-            final String screenTitle = context.getString(
-                    R.string.available_virtual_keyboard_category);
-            return buildSearchIndexOfInputMethods(context, disabledInputMethods, screenTitle);
-        }
-    };
+            };
 }
diff --git a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java
index 40efb07..6a0e853 100644
--- a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java
+++ b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java
@@ -19,21 +19,27 @@
 import android.content.Context;
 import android.hardware.input.InputManager;
 import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 import android.view.InputDevice;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
-public class GameControllerPreferenceController extends PreferenceController
-        implements InputManager.InputDeviceListener, LifecycleObserver, OnResume, OnPause {
+import java.util.List;
 
-    public static final String PREF_KEY = "vibrate_input_devices";
+public class GameControllerPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, InputManager.InputDeviceListener, LifecycleObserver,
+        OnResume, OnPause {
+
+    @VisibleForTesting
+    static final String PREF_KEY = "vibrate_input_devices";
     private static final String CATEGORY_KEY = "game_controller_settings_category";
 
     private final InputManager mIm;
@@ -104,6 +110,14 @@
     }
 
     @Override
+    public void updateNonIndexableKeys(List<String> keys) {
+        if (!isAvailable()) {
+            keys.add(CATEGORY_KEY);
+            keys.add(PREF_KEY);
+        }
+    }
+
+    @Override
     public void onInputDeviceAdded(int deviceId) {
         updateGameControllers();
     }
diff --git a/src/com/android/settings/inputmethod/InputMethodDialogReceiver.java b/src/com/android/settings/inputmethod/InputMethodDialogReceiver.java
deleted file mode 100644
index e442e88..0000000
--- a/src/com/android/settings/inputmethod/InputMethodDialogReceiver.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.inputmethod;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.provider.Settings;
-import android.view.inputmethod.InputMethodManager;
-
-public class InputMethodDialogReceiver extends BroadcastReceiver {
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        if (Settings.ACTION_SHOW_INPUT_METHOD_PICKER.equals(intent.getAction())) {
-            ((InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE))
-                    .showInputMethodPicker(true /* showAuxiliarySubtypes */);
-        }
-    }
-}
diff --git a/src/com/android/settings/inputmethod/OWNERS b/src/com/android/settings/inputmethod/OWNERS
new file mode 100644
index 0000000..9f33394
--- /dev/null
+++ b/src/com/android/settings/inputmethod/OWNERS
@@ -0,0 +1,5 @@
+# Default reviewers for this and subdirectories.
+yukawa@google.com
+michaelwr@google.com
+
+# Emergency approvers in case the above are not available
\ No newline at end of file
diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
index 42eff15..83d501d 100644
--- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
+++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
@@ -31,6 +31,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.UserHandle;
+import android.provider.SearchIndexableResource;
 import android.provider.Settings.Secure;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
@@ -51,11 +52,11 @@
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
-import com.android.settings.search.SearchIndexableRaw;
 import com.android.settingslib.inputmethod.InputMethodAndSubtypeUtil;
 
 import java.text.Collator;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -288,6 +289,7 @@
         final PhysicalKeyboardFragment mPhysicalKeyboardFragment;
         @NonNull
         final List<HardKeyboardDeviceInfo> mHardKeyboards;
+
         public Callbacks(
                 @NonNull Context context,
                 @NonNull PhysicalKeyboardFragment physicalKeyboardFragment,
@@ -532,43 +534,14 @@
         }
     }
 
-    public static List<InputDevice> getPhysicalFullKeyboards() {
-        List<InputDevice> keyboards = null;
-        for (final int deviceId : InputDevice.getDeviceIds()) {
-            final InputDevice device = InputDevice.getDevice(deviceId);
-            if (device != null && !device.isVirtual() && device.isFullKeyboard()) {
-                if (keyboards == null) keyboards = new ArrayList<>();
-                keyboards.add(device);
-            }
-        }
-        return (keyboards == null) ? Collections.emptyList() : keyboards;
-    }
-
     public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
-        @Override
-        public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
-            final InputManager inputManager = (InputManager) context.getSystemService(
-                    Context.INPUT_SERVICE);
-            final String screenTitle = context.getString(R.string.physical_keyboard_title);
-            final List<SearchIndexableRaw> indexes = new ArrayList<>();
-            for (final InputDevice device : getPhysicalFullKeyboards()) {
-                final String keyboardLayoutDescriptor = inputManager
-                        .getCurrentKeyboardLayoutForInputDevice(device.getIdentifier());
-                final KeyboardLayout keyboardLayout = (keyboardLayoutDescriptor != null)
-                        ? inputManager.getKeyboardLayout(keyboardLayoutDescriptor) : null;
-                final String summary = (keyboardLayout != null)
-                        ? keyboardLayout.toString()
-                        : context.getString(R.string.keyboard_layout_default_label);
-                final SearchIndexableRaw index = new SearchIndexableRaw(context);
-                index.key = device.getName();
-                index.title = device.getName();
-                index.summaryOn = summary;
-                index.summaryOff = summary;
-                index.screenTitle = screenTitle;
-                indexes.add(index);
-            }
-            return indexes;
-        }
-    };
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(
+                        Context context, boolean enabled) {
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = R.xml.physical_keyboard_settings;
+                    return Arrays.asList(sir);
+                }
+            };
 }
diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java
index 03d8221..7b0d1ce 100644
--- a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java
+++ b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java
@@ -21,8 +21,9 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.inputmethod.PhysicalKeyboardFragment.HardKeyboardDeviceInfo;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -30,8 +31,9 @@
 
 import java.util.List;
 
-public class PhysicalKeyboardPreferenceController extends PreferenceController implements
-        LifecycleObserver, OnResume, OnPause, InputManager.InputDeviceListener {
+public class PhysicalKeyboardPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause,
+        InputManager.InputDeviceListener {
 
     private final InputManager mIm;
 
diff --git a/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java b/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java
index 5ab2cba..270aaba 100644
--- a/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java
+++ b/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java
@@ -23,10 +23,12 @@
 import android.view.textservice.TextServicesManager;
 
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.inputmethod.InputMethodAndSubtypeUtil;
 
-public class SpellCheckerPreferenceController extends PreferenceController {
+public class SpellCheckerPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
 
     public static final String KEY_SPELL_CHECKERS = "spellcheckers_settings";
 
diff --git a/src/com/android/settings/inputmethod/SpellCheckersSettings.java b/src/com/android/settings/inputmethod/SpellCheckersSettings.java
index e21ced1..3a3f443 100644
--- a/src/com/android/settings/inputmethod/SpellCheckersSettings.java
+++ b/src/com/android/settings/inputmethod/SpellCheckersSettings.java
@@ -21,6 +21,7 @@
 import android.content.DialogInterface;
 import android.content.pm.ApplicationInfo;
 import android.os.Bundle;
+import android.provider.Settings;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.support.v7.preference.Preference.OnPreferenceClickListener;
@@ -105,7 +106,8 @@
 
     @Override
     public void onSwitchChanged(final Switch switchView, final boolean isChecked) {
-        mTsm.setSpellCheckerEnabled(isChecked);
+        Settings.Secure.putInt(getContentResolver(), Settings.Secure.SPELL_CHECKER_ENABLED,
+                isChecked ? 1 : 0);
         updatePreferenceScreen();
     }
 
@@ -203,12 +205,17 @@
         builder.setSingleChoiceItems(items, checkedItemId, new AlertDialog.OnClickListener() {
             @Override
             public void onClick(final DialogInterface dialog, final int item) {
+                final int subtypeId;
                 if (item == ITEM_ID_USE_SYSTEM_LANGUAGE) {
-                    mTsm.setSpellCheckerSubtype(null);
+                    subtypeId = SpellCheckerSubtype.SUBTYPE_ID_NONE;
                 } else {
                     final int index = convertDialogItemIdToSubtypeIndex(item);
-                    mTsm.setSpellCheckerSubtype(currentSci.getSubtypeAt(index));
+                    subtypeId = currentSci.getSubtypeAt(index).hashCode();
                 }
+
+                Settings.Secure.putInt(getContentResolver(),
+                        Settings.Secure.SELECTED_SPELL_CHECKER_SUBTYPE, subtypeId);
+
                 if (DBG) {
                     final SpellCheckerSubtype subtype = mTsm.getCurrentSpellCheckerSubtype(
                             true /* allowImplicitlySelectedSubtype */);
@@ -248,7 +255,11 @@
     }
 
     private void changeCurrentSpellChecker(final SpellCheckerInfo sci) {
-        mTsm.setCurrentSpellChecker(sci);
+        Settings.Secure.putString(getContentResolver(), Settings.Secure.SELECTED_SPELL_CHECKER,
+                sci.getId());
+        // Reset the spell checker subtype
+        Settings.Secure.putInt(getContentResolver(), Settings.Secure.SELECTED_SPELL_CHECKER_SUBTYPE,
+                SpellCheckerSubtype.SUBTYPE_ID_NONE);
         if (DBG) {
             Log.d(TAG, "Current spell check is " + mTsm.getCurrentSpellChecker().getId());
         }
diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
index 98c4db2..620bc65 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
@@ -27,7 +27,6 @@
 import android.widget.EditText;
 
 import com.android.settings.R;
-import com.android.settings.UserDictionarySettings;
 import com.android.settings.Utils;
 
 import java.util.ArrayList;
diff --git a/src/com/android/settings/inputmethod/UserDictionaryCursorLoader.java b/src/com/android/settings/inputmethod/UserDictionaryCursorLoader.java
new file mode 100644
index 0000000..d5b742d
--- /dev/null
+++ b/src/com/android/settings/inputmethod/UserDictionaryCursorLoader.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import android.content.Context;
+import android.content.CursorLoader;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.provider.UserDictionary;
+import android.support.annotation.VisibleForTesting;
+import android.util.ArraySet;
+
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Set;
+
+public class UserDictionaryCursorLoader extends CursorLoader {
+
+    @VisibleForTesting
+    static final String[] QUERY_PROJECTION = {
+            UserDictionary.Words._ID,
+            UserDictionary.Words.WORD,
+            UserDictionary.Words.SHORTCUT
+    };
+
+    // The index of the shortcut in the above array.
+    static final int INDEX_SHORTCUT = 2;
+
+    // Either the locale is empty (means the word is applicable to all locales)
+    // or the word equals our current locale
+    private static final String QUERY_SELECTION =
+            UserDictionary.Words.LOCALE + "=?";
+    private static final String QUERY_SELECTION_ALL_LOCALES =
+            UserDictionary.Words.LOCALE + " is null";
+
+
+    // Locale can be any of:
+    // - The string representation of a locale, as returned by Locale#toString()
+    // - The empty string. This means we want a cursor returning words valid for all locales.
+    // - null. This means we want a cursor for the current locale, whatever this is.
+    // Note that this contrasts with the data inside the database, where NULL means "all
+    // locales" and there should never be an empty string. The confusion is called by the
+    // historical use of null for "all locales".
+    // TODO: it should be easy to make this more readable by making the special values
+    // human-readable, like "all_locales" and "current_locales" strings, provided they
+    // can be guaranteed not to match locales that may exist.
+    private final String mLocale;
+
+    public UserDictionaryCursorLoader(Context context, String locale) {
+        super(context);
+        mLocale = locale;
+    }
+
+    @Override
+    public Cursor loadInBackground() {
+        final MatrixCursor result = new MatrixCursor(QUERY_PROJECTION);
+        final Cursor candidate;
+        if ("".equals(mLocale)) {
+            // Case-insensitive sort
+            candidate = getContext().getContentResolver().query(
+                    UserDictionary.Words.CONTENT_URI, QUERY_PROJECTION,
+                    QUERY_SELECTION_ALL_LOCALES, null,
+                    "UPPER(" + UserDictionary.Words.WORD + ")");
+        } else {
+            final String queryLocale = null != mLocale ? mLocale : Locale.getDefault().toString();
+            candidate = getContext().getContentResolver().query(UserDictionary.Words.CONTENT_URI,
+                    QUERY_PROJECTION, QUERY_SELECTION,
+                    new String[]{queryLocale}, "UPPER(" + UserDictionary.Words.WORD + ")");
+        }
+        final Set<Integer> hashSet = new ArraySet<>();
+        for (candidate.moveToFirst(); !candidate.isAfterLast(); candidate.moveToNext()) {
+            final int id = candidate.getInt(0);
+            final String word = candidate.getString(1);
+            final String shortcut = candidate.getString(2);
+            final int hash = Objects.hash(word, shortcut);
+            if (hashSet.contains(hash)) {
+                continue;
+            }
+            hashSet.add(hash);
+            result.addRow(new Object[]{id, word, shortcut});
+        }
+        return result;
+    }
+}
diff --git a/src/com/android/settings/inputmethod/UserDictionaryList.java b/src/com/android/settings/inputmethod/UserDictionaryList.java
index b8e87ef..2f59dc9 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryList.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryList.java
@@ -22,6 +22,7 @@
 import android.database.Cursor;
 import android.os.Bundle;
 import android.provider.UserDictionary;
+import android.support.annotation.NonNull;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceGroup;
 import android.text.TextUtils;
@@ -78,14 +79,15 @@
         mLocale = locale;
     }
 
+    @NonNull
     public static TreeSet<String> getUserDictionaryLocalesSet(Context context) {
         final Cursor cursor = context.getContentResolver().query(
-                UserDictionary.Words.CONTENT_URI, new String[] { UserDictionary.Words.LOCALE },
+                UserDictionary.Words.CONTENT_URI, new String[]{UserDictionary.Words.LOCALE},
                 null, null, null);
-        final TreeSet<String> localeSet = new TreeSet<String>();
-        if (null == cursor) {
-            // The user dictionary service is not present or disabled. Return null.
-            return null;
+        final TreeSet<String> localeSet = new TreeSet<>();
+        if (cursor == null) {
+            // The user dictionary service is not present or disabled. Return empty set.
+            return localeSet;
         }
         try {
             if (cursor.moveToFirst()) {
@@ -134,6 +136,7 @@
 
     /**
      * Creates the entries that allow the user to go into the user dictionary for each locale.
+     *
      * @param userDictGroup The group to put the settings in.
      */
     protected void createUserDictSettings(PreferenceGroup userDictGroup) {
@@ -163,6 +166,7 @@
 
     /**
      * Create a single User Dictionary Preference object, with its parameters set.
+     *
      * @param locale The locale for which this user dictionary is for.
      * @return The corresponding preference.
      */
@@ -172,15 +176,16 @@
         if (null == locale) {
             newPref.setTitle(Locale.getDefault().getDisplayName());
         } else {
-            if ("".equals(locale))
+            if ("".equals(locale)) {
                 newPref.setTitle(getString(R.string.user_dict_settings_all_languages));
-            else
+            } else {
                 newPref.setTitle(Utils.createLocaleFromString(locale).getDisplayName());
+            }
             intent.putExtra("locale", locale);
             newPref.getExtras().putString("locale", locale);
         }
         newPref.setIntent(intent);
-        newPref.setFragment(com.android.settings.UserDictionarySettings.class.getName());
+        newPref.setFragment(UserDictionarySettings.class.getName());
         return newPref;
     }
 
diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/inputmethod/UserDictionarySettings.java
similarity index 68%
rename from src/com/android/settings/UserDictionarySettings.java
rename to src/com/android/settings/inputmethod/UserDictionarySettings.java
index 5571c2d..9680af1 100644
--- a/src/com/android/settings/UserDictionarySettings.java
+++ b/src/com/android/settings/inputmethod/UserDictionarySettings.java
@@ -1,25 +1,29 @@
-/**
- * Copyright (C) 2009 Google Inc.
+/*
+ * Copyright (C) 2009 The Android Open Source Project
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this 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.
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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;
+package com.android.settings.inputmethod;
 
+import android.annotation.Nullable;
+import android.app.ActionBar;
 import android.app.ListFragment;
+import android.app.LoaderManager;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.Loader;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.provider.UserDictionary;
@@ -38,28 +42,13 @@
 import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
-import com.android.settings.inputmethod.UserDictionaryAddWordContents;
-import com.android.settings.inputmethod.UserDictionarySettingsUtils;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
 import com.android.settings.core.instrumentation.Instrumentable;
+import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
 
-import java.util.Locale;
-
-public class UserDictionarySettings extends ListFragment implements Instrumentable {
-
-    private static final String[] QUERY_PROJECTION = {
-        UserDictionary.Words._ID, UserDictionary.Words.WORD, UserDictionary.Words.SHORTCUT
-    };
-
-    // The index of the shortcut in the above array.
-    private static final int INDEX_SHORTCUT = 2;
-
-    // Either the locale is empty (means the word is applicable to all locales)
-    // or the word equals our current locale
-    private static final String QUERY_SELECTION =
-            UserDictionary.Words.LOCALE + "=?";
-    private static final String QUERY_SELECTION_ALL_LOCALES =
-            UserDictionary.Words.LOCALE + " is null";
+public class UserDictionarySettings extends ListFragment implements Instrumentable,
+        LoaderManager.LoaderCallbacks<Cursor> {
 
     private static final String DELETE_SELECTION_WITH_SHORTCUT = UserDictionary.Words.WORD
             + "=? AND " + UserDictionary.Words.SHORTCUT + "=?";
@@ -68,12 +57,13 @@
             + UserDictionary.Words.SHORTCUT + "=''";
 
     private static final int OPTIONS_MENU_ADD = Menu.FIRST;
+    private static final int LOADER_ID = 1;
 
     private final VisibilityLoggerMixin mVisibilityLoggerMixin =
             new VisibilityLoggerMixin(getMetricsCategory());
 
     private Cursor mCursor;
-    protected String mLocale;
+    private String mLocale;
 
     @Override
     public int getMetricsCategory() {
@@ -87,16 +77,8 @@
     }
 
     @Override
-    public View onCreateView(
-            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        return inflater.inflate(
-                com.android.internal.R.layout.preference_list_fragment, container, false);
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        getActivity().getActionBar().setTitle(R.string.user_dict_settings_title);
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
 
         final Intent intent = getActivity().getIntent();
         final String localeFromIntent =
@@ -116,56 +98,49 @@
         }
 
         mLocale = locale;
-        mCursor = createCursor(locale);
-        TextView emptyView = (TextView) getView().findViewById(android.R.id.empty);
+
+        setHasOptionsMenu(true);
+        getLoaderManager().initLoader(LOADER_ID, null, this /* callback */);
+    }
+
+    @Override
+    public View onCreateView(
+            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        // Show the language as a subtitle of the action bar
+        final ActionBar actionBar = getActivity().getActionBar();
+        if (actionBar != null) {
+            actionBar.setTitle(R.string.user_dict_settings_title);
+            actionBar.setSubtitle(
+                    UserDictionarySettingsUtils.getLocaleDisplayName(getActivity(), mLocale));
+        }
+
+        return inflater.inflate(
+                com.android.internal.R.layout.preference_list_fragment, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        TextView emptyView = getView().findViewById(android.R.id.empty);
         emptyView.setText(R.string.user_dict_settings_empty_text);
 
         final ListView listView = getListView();
-        listView.setAdapter(createAdapter());
         listView.setFastScrollEnabled(true);
         listView.setEmptyView(emptyView);
-
-        setHasOptionsMenu(true);
-        // Show the language as a subtitle of the action bar
-        getActivity().getActionBar().setSubtitle(
-                UserDictionarySettingsUtils.getLocaleDisplayName(getActivity(), mLocale));
     }
 
     @Override
     public void onResume() {
         super.onResume();
         mVisibilityLoggerMixin.onResume();
-    }
-
-    private Cursor createCursor(final String locale) {
-        // Locale can be any of:
-        // - The string representation of a locale, as returned by Locale#toString()
-        // - The empty string. This means we want a cursor returning words valid for all locales.
-        // - null. This means we want a cursor for the current locale, whatever this is.
-        // Note that this contrasts with the data inside the database, where NULL means "all
-        // locales" and there should never be an empty string. The confusion is called by the
-        // historical use of null for "all locales".
-        // TODO: it should be easy to make this more readable by making the special values
-        // human-readable, like "all_locales" and "current_locales" strings, provided they
-        // can be guaranteed not to match locales that may exist.
-        if ("".equals(locale)) {
-            // Case-insensitive sort
-            return getActivity().managedQuery(UserDictionary.Words.CONTENT_URI, QUERY_PROJECTION,
-                    QUERY_SELECTION_ALL_LOCALES, null,
-                    "UPPER(" + UserDictionary.Words.WORD + ")");
-        } else {
-            final String queryLocale = null != locale ? locale : Locale.getDefault().toString();
-            return getActivity().managedQuery(UserDictionary.Words.CONTENT_URI, QUERY_PROJECTION,
-                    QUERY_SELECTION, new String[] { queryLocale },
-                    "UPPER(" + UserDictionary.Words.WORD + ")");
-        }
+        getLoaderManager().restartLoader(LOADER_ID, null, this /* callback */);
     }
 
     private ListAdapter createAdapter() {
         return new MyAdapter(getActivity(),
                 R.layout.user_dictionary_item, mCursor,
-                new String[] { UserDictionary.Words.WORD, UserDictionary.Words.SHORTCUT },
-                new int[] { android.R.id.text1, android.R.id.text2 }, this);
+                new String[]{UserDictionary.Words.WORD, UserDictionary.Words.SHORTCUT},
+                new int[]{android.R.id.text1, android.R.id.text2});
     }
 
     @Override
@@ -181,7 +156,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_white);
+                        .setIcon(R.drawable.ic_menu_add_white);
         actionItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
                 MenuItem.SHOW_AS_ACTION_WITH_TEXT);
     }
@@ -203,7 +178,8 @@
 
     /**
      * Add or edit a word. If editingWord is null, it's an add; otherwise, it's an edit.
-     * @param editingWord the word to edit, or null if it's an add.
+     *
+     * @param editingWord     the word to edit, or null if it's an add.
      * @param editingShortcut the shortcut for this entry, or null if none.
      */
     private void showAddOrEditDialog(final String editingWord, final String editingShortcut) {
@@ -245,14 +221,30 @@
         if (TextUtils.isEmpty(shortcut)) {
             resolver.delete(
                     UserDictionary.Words.CONTENT_URI, DELETE_SELECTION_WITHOUT_SHORTCUT,
-                    new String[] { word });
+                    new String[]{word});
         } else {
             resolver.delete(
                     UserDictionary.Words.CONTENT_URI, DELETE_SELECTION_WITH_SHORTCUT,
-                    new String[] { word, shortcut });
+                    new String[]{word, shortcut});
         }
     }
 
+    @Override
+    public Loader<Cursor> onCreateLoader(int id, Bundle args) {
+        return new UserDictionaryCursorLoader(getContext(), mLocale);
+    }
+
+    @Override
+    public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
+        mCursor = data;
+        getListView().setAdapter(createAdapter());
+    }
+
+    @Override
+    public void onLoaderReset(Loader<Cursor> loader) {
+
+    }
+
     private static class MyAdapter extends SimpleCursorAdapter implements SectionIndexer {
 
         private AlphabetIndexer mIndexer;
@@ -261,12 +253,12 @@
 
             @Override
             public boolean setViewValue(View v, Cursor c, int columnIndex) {
-                if (columnIndex == INDEX_SHORTCUT) {
-                    final String shortcut = c.getString(INDEX_SHORTCUT);
+                if (columnIndex == UserDictionaryCursorLoader.INDEX_SHORTCUT) {
+                    final String shortcut = c.getString(UserDictionaryCursorLoader.INDEX_SHORTCUT);
                     if (TextUtils.isEmpty(shortcut)) {
                         v.setVisibility(View.GONE);
                     } else {
-                        ((TextView)v).setText(shortcut);
+                        ((TextView) v).setText(shortcut);
                         v.setVisibility(View.VISIBLE);
                     }
                     v.invalidate();
@@ -277,8 +269,7 @@
             }
         };
 
-        public MyAdapter(Context context, int layout, Cursor c, String[] from, int[] to,
-                UserDictionarySettings settings) {
+        public MyAdapter(Context context, int layout, Cursor c, String[] from, int[] to) {
             super(context, layout, c, from, to);
 
             if (null != c) {
diff --git a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java
index 7b7c599..fbe9690 100644
--- a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java
+++ b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java
@@ -23,6 +23,7 @@
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.provider.SearchIndexableResource;
 import android.support.v7.preference.Preference;
 import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodManager;
@@ -33,14 +34,12 @@
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
-import com.android.settings.search.SearchIndexableRaw;
 import com.android.settingslib.inputmethod.InputMethodAndSubtypeUtil;
 import com.android.settingslib.inputmethod.InputMethodPreference;
 
 import java.text.Collator;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
+import java.util.Arrays;
 import java.util.List;
 
 public final class VirtualKeyboardFragment extends SettingsPreferenceFragment implements Indexable {
@@ -121,13 +120,19 @@
 
     public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
-        @Override
-        public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
-            final InputMethodManager imm = context.getSystemService(InputMethodManager.class);
-            final List<InputMethodInfo> enabledInputMethods = imm.getEnabledInputMethodList();
-            final String screenTitle = context.getString(R.string.virtual_keyboard_category);
-            return AvailableVirtualKeyboardFragment
-                    .buildSearchIndexOfInputMethods(context, enabledInputMethods, screenTitle);
-        }
-    };
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(
+                        Context context, boolean enabled) {
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = R.xml.virtual_keyboard_settings;
+                    return Arrays.asList(sir);
+                }
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    final List<String> keys = super.getNonIndexableKeys(context);
+                    keys.add("add_virtual_keyboard_screen");
+                    return keys;
+                }
+            };
 }
diff --git a/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java b/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java
index 5436901..c3443d2 100644
--- a/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java
+++ b/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java
@@ -25,12 +25,14 @@
 import android.view.inputmethod.InputMethodManager;
 
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class VirtualKeyboardPreferenceController extends PreferenceController {
+public class VirtualKeyboardPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
 
     private final InputMethodManager mImm;
     private final DevicePolicyManager mDpm;
diff --git a/src/com/android/settings/language/LanguageAndInputSettings.java b/src/com/android/settings/language/LanguageAndInputSettings.java
index cca6cbe..4affc6e 100644
--- a/src/com/android/settings/language/LanguageAndInputSettings.java
+++ b/src/com/android/settings/language/LanguageAndInputSettings.java
@@ -21,37 +21,26 @@
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.os.UserHandle;
 import android.provider.SearchIndexableResource;
 import android.provider.Settings;
 import android.speech.tts.TtsEngines;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
 import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodManager;
 
-import com.android.internal.hardware.AmbientDisplayConfiguration;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.applications.defaultapps.DefaultAutofillPreferenceController;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.gestures.AssistGestureFeatureProvider;
-import com.android.settings.gestures.AssistGesturePreferenceController;
-import com.android.settings.gestures.DoubleTapPowerPreferenceController;
-import com.android.settings.gestures.DoubleTapScreenPreferenceController;
-import com.android.settings.gestures.DoubleTwistPreferenceController;
-import com.android.settings.gestures.PickupGesturePreferenceController;
-import com.android.settings.gestures.SwipeToNotificationPreferenceController;
 import com.android.settings.inputmethod.GameControllerPreferenceController;
 import com.android.settings.inputmethod.PhysicalKeyboardPreferenceController;
 import com.android.settings.inputmethod.SpellCheckerPreferenceController;
 import com.android.settings.inputmethod.VirtualKeyboardPreferenceController;
-import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
@@ -63,14 +52,7 @@
     private static final String TAG = "LangAndInputSettings";
 
     private static final String KEY_TEXT_TO_SPEECH = "tts_settings_summary";
-    private static final String KEY_ASSIST = "gesture_assist_input_summary";
-    private static final String KEY_SWIPE_DOWN = "gesture_swipe_down_fingerprint_input_summary";
-    private static final String KEY_DOUBLE_TAP_POWER = "gesture_double_tap_power_input_summary";
-    private static final String KEY_DOUBLE_TWIST = "gesture_double_twist_input_summary";
-    private static final String KEY_DOUBLE_TAP_SCREEN = "gesture_double_tap_screen_input_summary";
-    private static final String KEY_PICK_UP = "gesture_pick_up_input_summary";
-
-    private AmbientDisplayConfiguration mAmbientDisplayConfig;
+    private static final String KEY_PHYSICAL_KEYBOARD = "physical_keyboard_pref";
 
     @Override
     public int getMetricsCategory() {
@@ -99,7 +81,7 @@
         if (activity == null) {
             return;
         }
-        activity.setTitle(R.string.language_input_gesture_title);
+        activity.setTitle(R.string.language_settings);
     }
 
     @Override
@@ -108,18 +90,13 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
-        if (mAmbientDisplayConfig == null) {
-            mAmbientDisplayConfig = new AmbientDisplayConfiguration(context);
-        }
-
-        return buildPreferenceControllers(context, getLifecycle(), mAmbientDisplayConfig);
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getLifecycle());
     }
 
-    private static List<PreferenceController> buildPreferenceControllers(@NonNull Context context,
-            @Nullable Lifecycle lifecycle,
-            @NonNull AmbientDisplayConfiguration ambientDisplayConfiguration) {
-        final List<PreferenceController> controllers = new ArrayList<>();
+    private static List<AbstractPreferenceController> buildPreferenceControllers(
+            @NonNull Context context, @Nullable Lifecycle lifecycle) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         // Language
         controllers.add(new PhoneLanguagePreferenceController(context));
         controllers.add(new SpellCheckerPreferenceController(context));
@@ -135,79 +112,41 @@
         }
 
         controllers.add(gameControllerPreferenceController);
-        // Gestures
-        controllers.add(new AssistGesturePreferenceController(context, lifecycle, KEY_ASSIST,
-                false /* assistOnly */));
-        controllers.add(new SwipeToNotificationPreferenceController(context, lifecycle,
-                KEY_SWIPE_DOWN));
-        controllers.add(new DoubleTwistPreferenceController(context, lifecycle, KEY_DOUBLE_TWIST));
-        controllers.add(new DoubleTapPowerPreferenceController(context, lifecycle,
-                KEY_DOUBLE_TAP_POWER));
-        controllers.add(new PickupGesturePreferenceController(context, lifecycle,
-                ambientDisplayConfiguration, UserHandle.myUserId(), KEY_PICK_UP));
-        controllers.add(new DoubleTapScreenPreferenceController(context, lifecycle,
-                ambientDisplayConfiguration, UserHandle.myUserId(), KEY_DOUBLE_TAP_SCREEN));
         controllers.add(new DefaultAutofillPreferenceController(context));
         return controllers;
     }
 
-    @VisibleForTesting
-    void setAmbientDisplayConfig(AmbientDisplayConfiguration ambientConfig) {
-        mAmbientDisplayConfig = ambientConfig;
-    }
-
     private static class SummaryProvider implements SummaryLoader.SummaryProvider {
 
         private final Context mContext;
         private final SummaryLoader mSummaryLoader;
-        private final AssistGestureFeatureProvider mFeatureProvider;
 
         public SummaryProvider(Context context, SummaryLoader summaryLoader) {
             mContext = context;
             mSummaryLoader = summaryLoader;
-            mFeatureProvider = FeatureFactory.getFactory(context).getAssistGestureFeatureProvider();
         }
 
         @Override
         public void setListening(boolean listening) {
             final ContentResolver contentResolver = mContext.getContentResolver();
             if (listening) {
-                if (mFeatureProvider.isSensorAvailable(mContext)) {
-                    final boolean assistGestureEnabled = Settings.Secure.getInt(
-                            contentResolver, Settings.Secure.ASSIST_GESTURE_ENABLED, 1) != 0;
-                    final boolean assistGestureSilenceEnabled = Settings.Secure.getInt(
-                            contentResolver, Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED,
-                            1) != 0;
-                    String summary;
-                    if (mFeatureProvider.isSupported(mContext) && assistGestureEnabled) {
-                        summary = mContext.getString(
-                                R.string.language_input_gesture_summary_on_with_assist);
-                    } else if (assistGestureSilenceEnabled) {
-                        summary = mContext.getString(
-                                R.string.language_input_gesture_summary_on_non_assist);
-                    } else {
-                        summary = mContext.getString(R.string.language_input_gesture_summary_off);
-                    }
-                    mSummaryLoader.setSummary(this, summary);
-                } else {
-                    final String flattenComponent = Settings.Secure.getString(
-                            contentResolver, Settings.Secure.DEFAULT_INPUT_METHOD);
-                    if (!TextUtils.isEmpty(flattenComponent)) {
-                        final PackageManager packageManage = mContext.getPackageManager();
-                        final String pkg = ComponentName.unflattenFromString(flattenComponent)
+                final String flattenComponent = Settings.Secure.getString(
+                        contentResolver, Settings.Secure.DEFAULT_INPUT_METHOD);
+                if (!TextUtils.isEmpty(flattenComponent)) {
+                    final PackageManager packageManage = mContext.getPackageManager();
+                    final String pkg = ComponentName.unflattenFromString(flattenComponent)
                             .getPackageName();
-                        final InputMethodManager imm = (InputMethodManager)
+                    final InputMethodManager imm = (InputMethodManager)
                             mContext.getSystemService(Context.INPUT_METHOD_SERVICE);
-                        final List<InputMethodInfo> imis = imm.getInputMethodList();
-                        for (InputMethodInfo imi : imis) {
-                            if (TextUtils.equals(imi.getPackageName(), pkg)) {
-                                mSummaryLoader.setSummary(this, imi.loadLabel(packageManage));
-                                return;
-                            }
+                    final List<InputMethodInfo> imis = imm.getInputMethodList();
+                    for (InputMethodInfo imi : imis) {
+                        if (TextUtils.equals(imi.getPackageName(), pkg)) {
+                            mSummaryLoader.setSummary(this, imi.loadLabel(packageManage));
+                            return;
                         }
                     }
-                    mSummaryLoader.setSummary(this, "");
                 }
+                mSummaryLoader.setSummary(this, "");
             }
         }
     }
@@ -226,9 +165,9 @@
                 }
 
                 @Override
-                public List<PreferenceController> getPreferenceControllers(Context context) {
-                    return buildPreferenceControllers(context, null,
-                            new AmbientDisplayConfiguration(context));
+                public List<AbstractPreferenceController> getPreferenceControllers(
+                        Context context) {
+                    return buildPreferenceControllers(context, null);
                 }
 
                 @Override
@@ -236,12 +175,7 @@
                     List<String> keys = super.getNonIndexableKeys(context);
                     // Duplicates in summary and details pages.
                     keys.add(KEY_TEXT_TO_SPEECH);
-                    keys.add(KEY_ASSIST);
-                    keys.add(KEY_SWIPE_DOWN);
-                    keys.add(KEY_DOUBLE_TAP_POWER);
-                    keys.add(KEY_DOUBLE_TWIST);
-                    keys.add(KEY_DOUBLE_TAP_SCREEN);
-                    keys.add(KEY_PICK_UP);
+                    keys.add(KEY_PHYSICAL_KEYBOARD);
 
                     return keys;
                 }
diff --git a/src/com/android/settings/language/PhoneLanguagePreferenceController.java b/src/com/android/settings/language/PhoneLanguagePreferenceController.java
index cd2f539..11c3e03 100644
--- a/src/com/android/settings/language/PhoneLanguagePreferenceController.java
+++ b/src/com/android/settings/language/PhoneLanguagePreferenceController.java
@@ -19,10 +19,12 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class PhoneLanguagePreferenceController extends PreferenceController {
+public class PhoneLanguagePreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
 
     private static final String KEY_PHONE_LANGUAGE = "phone_language";
 
diff --git a/src/com/android/settings/language/TtsPreferenceController.java b/src/com/android/settings/language/TtsPreferenceController.java
index a734e4b..ef26d5f 100644
--- a/src/com/android/settings/language/TtsPreferenceController.java
+++ b/src/com/android/settings/language/TtsPreferenceController.java
@@ -19,9 +19,11 @@
 import android.content.Context;
 import android.speech.tts.TtsEngines;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class TtsPreferenceController extends PreferenceController {
+public class TtsPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
 
     private static final String KEY_VOICE_CATEGORY = "voice_category";
     private static final String KEY_TTS_SETTINGS = "tts_settings_summary";
diff --git a/src/com/android/settings/language/UserDictionaryPreferenceController.java b/src/com/android/settings/language/UserDictionaryPreferenceController.java
index 01ce3aa..3a1d6e0 100644
--- a/src/com/android/settings/language/UserDictionaryPreferenceController.java
+++ b/src/com/android/settings/language/UserDictionaryPreferenceController.java
@@ -21,13 +21,15 @@
 import android.os.Bundle;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.UserDictionarySettings;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.inputmethod.UserDictionaryList;
+import com.android.settings.inputmethod.UserDictionarySettings;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.TreeSet;
 
-public class UserDictionaryPreferenceController extends PreferenceController {
+public class UserDictionaryPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
 
     private static final String KEY_USER_DICTIONARY_SETTINGS = "key_user_dictionary_settings";
 
@@ -37,10 +39,7 @@
 
     @Override
     public boolean isAvailable() {
-        final TreeSet<String> localeSet = getDictionaryLocales();
-        // The locale list is null if and only if the user dictionary service is
-        // not present or disabled. In this case we need to remove the preference.
-        return localeSet != null;
+        return true;
     }
 
     @Override
diff --git a/src/com/android/settings/location/AppLocationPermissionPreferenceController.java b/src/com/android/settings/location/AppLocationPermissionPreferenceController.java
index d91b47b..75c9e2f 100644
--- a/src/com/android/settings/location/AppLocationPermissionPreferenceController.java
+++ b/src/com/android/settings/location/AppLocationPermissionPreferenceController.java
@@ -1,14 +1,15 @@
 package com.android.settings.location;
 
 import android.content.Context;
-import android.content.Intent;
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class AppLocationPermissionPreferenceController extends PreferenceController {
+public class AppLocationPermissionPreferenceController extends
+        AbstractPreferenceController implements PreferenceControllerMixin {
 
     private static final String KEY_APP_LEVEL_PERMISSIONS = "app_level_permissions";
     private Preference mPreference;
diff --git a/src/com/android/settings/location/LocationPreferenceController.java b/src/com/android/settings/location/LocationPreferenceController.java
index bd7aea1..225100f 100644
--- a/src/com/android/settings/location/LocationPreferenceController.java
+++ b/src/com/android/settings/location/LocationPreferenceController.java
@@ -25,7 +25,8 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settings.search.DatabaseIndexingUtils;
 import com.android.settings.search.InlineListPayload;
 import com.android.settings.search.ResultPayload;
@@ -34,8 +35,8 @@
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
-public class LocationPreferenceController extends PreferenceController implements
-        LifecycleObserver, OnResume, OnPause {
+public class LocationPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {
 
     private static final String KEY_LOCATION = "location";
     private Context mContext;
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index dc321e2..34e8cc3 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -211,11 +211,6 @@
                     request.contentDescription);
             pref.setIcon(request.icon);
             pref.setTitle(request.label);
-            if (request.isHighBattery) {
-                pref.setSummary(R.string.location_high_battery_use);
-            } else {
-                pref.setSummary(R.string.location_low_battery_use);
-            }
             pref.setOnPreferenceClickListener(
                     new PackageEntryClickedListener(request.packageName, request.userHandle));
             recentLocationPrefs.add(pref);
diff --git a/src/com/android/settings/location/LocationSettingsBase.java b/src/com/android/settings/location/LocationSettingsBase.java
index 1ea21b6..741d607 100644
--- a/src/com/android/settings/location/LocationSettingsBase.java
+++ b/src/com/android/settings/location/LocationSettingsBase.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.location;
 
-import android.app.ActivityManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -29,14 +28,17 @@
 
 import com.android.settings.SettingsPreferenceFragment;
 
-import static com.android.settingslib.Utils.updateLocationMode;
-
 /**
  * A base class that listens to location settings change and modifies location
  * settings.
  */
 public abstract class LocationSettingsBase extends SettingsPreferenceFragment {
     private static final String TAG = "LocationSettingsBase";
+    /** Broadcast intent action when the location mode is about to change. */
+    private static final String MODE_CHANGING_ACTION =
+            "com.android.settings.location.MODE_CHANGING";
+    private static final String CURRENT_MODE_KEY = "CURRENT_MODE";
+    private static final String NEW_MODE_KEY = "NEW_MODE";
 
     private int mCurrentMode;
     private BroadcastReceiver mReceiver;
@@ -88,6 +90,15 @@
         return um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION);
     }
 
+    public static boolean updateLocationMode(Context context, int oldMode, int newMode) {
+        Intent intent = new Intent(MODE_CHANGING_ACTION);
+        intent.putExtra(CURRENT_MODE_KEY, oldMode);
+        intent.putExtra(NEW_MODE_KEY, newMode);
+        context.sendBroadcast(intent, android.Manifest.permission.WRITE_SECURE_SETTINGS);
+        return Settings.Secure.putInt(context.getContentResolver(), Settings.Secure.LOCATION_MODE,
+                newMode);
+    }
+
     public void setLocationMode(int mode) {
         Context context = getActivity();
         if (isRestricted(context)) {
@@ -104,7 +115,7 @@
             return;
         }
 
-        updateLocationMode(context, mCurrentMode, mode, ActivityManager.getCurrentUser());
+        updateLocationMode(context, mCurrentMode, mode);
         refreshLocationMode();
     }
 
diff --git a/src/com/android/settings/location/OWNERS b/src/com/android/settings/location/OWNERS
new file mode 100644
index 0000000..f00674e
--- /dev/null
+++ b/src/com/android/settings/location/OWNERS
@@ -0,0 +1,9 @@
+# Default reviewers for this and subdirectories.
+lifu@google.com
+mstogaitis@google.com
+palanki@google.com
+sooniln@google.com
+weiwa@google.com
+wyattriley@google.com
+
+# Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java
index 05c428a..d2015df 100644
--- a/src/com/android/settings/network/AirplaneModePreferenceController.java
+++ b/src/com/android/settings/network/AirplaneModePreferenceController.java
@@ -27,15 +27,16 @@
 import com.android.internal.telephony.TelephonyIntents;
 import com.android.internal.telephony.TelephonyProperties;
 import com.android.settings.AirplaneModeEnabler;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
-public class AirplaneModePreferenceController extends PreferenceController
-        implements LifecycleObserver, OnResume, OnPause {
+public class AirplaneModePreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {
 
     public static final int REQUEST_CODE_EXIT_ECM = 1;
 
diff --git a/src/com/android/settings/network/MobileNetworkPreferenceController.java b/src/com/android/settings/network/MobileNetworkPreferenceController.java
index 5922045..6e2c2d5 100644
--- a/src/com/android/settings/network/MobileNetworkPreferenceController.java
+++ b/src/com/android/settings/network/MobileNetworkPreferenceController.java
@@ -25,7 +25,8 @@
 import android.telephony.TelephonyManager;
 
 import com.android.settings.Utils;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
@@ -33,8 +34,8 @@
 import static android.os.UserHandle.myUserId;
 import static android.os.UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS;
 
-public class MobileNetworkPreferenceController extends PreferenceController implements
-        LifecycleObserver, OnResume, OnPause {
+public class MobileNetworkPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {
 
     private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";
 
diff --git a/src/com/android/settings/network/MobilePlanPreferenceController.java b/src/com/android/settings/network/MobilePlanPreferenceController.java
index da4902d..d5ff924 100644
--- a/src/com/android/settings/network/MobilePlanPreferenceController.java
+++ b/src/com/android/settings/network/MobilePlanPreferenceController.java
@@ -31,7 +31,8 @@
 
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnCreate;
 import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
@@ -45,8 +46,8 @@
 import static com.android.settingslib.RestrictedLockUtils.hasBaseUserRestriction;
 
 
-public class MobilePlanPreferenceController extends PreferenceController implements
-        LifecycleObserver, OnCreate, OnSaveInstanceState {
+public class MobilePlanPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver, OnCreate, OnSaveInstanceState {
 
     public interface MobilePlanPreferenceHost {
         void showMobilePlanMessageDialog();
diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java
index 35de1bb..e982a28 100644
--- a/src/com/android/settings/network/NetworkDashboardFragment.java
+++ b/src/com/android/settings/network/NetworkDashboardFragment.java
@@ -15,9 +15,13 @@
  */
 package com.android.settings.network;
 
+import static com.android.settings.network.MobilePlanPreferenceController
+        .MANAGE_MOBILE_PLAN_DIALOG_ID;
+
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.app.Fragment;
 import android.content.Context;
 import android.provider.SearchIndexableResource;
 import android.support.annotation.VisibleForTesting;
@@ -27,22 +31,21 @@
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.network.MobilePlanPreferenceController.MobilePlanPreferenceHost;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.wifi.WifiMasterSwitchPreferenceController;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static com.android.settings.network.MobilePlanPreferenceController
-        .MANAGE_MOBILE_PLAN_DIALOG_ID;
-
 public class NetworkDashboardFragment extends DashboardFragment implements
-        MobilePlanPreferenceController.MobilePlanPreferenceHost {
+        MobilePlanPreferenceHost {
 
     private static final String TAG = "NetworkDashboardFrag";
 
@@ -81,25 +84,35 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getLifecycle(), mMetricsFeatureProvider, this
+                /* fragment */,
+                this /* mobilePlanHost */);
+    }
+
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
+            Lifecycle lifecycle, MetricsFeatureProvider metricsFeatureProvider, Fragment fragment,
+            MobilePlanPreferenceHost mobilePlanHost) {
         final AirplaneModePreferenceController airplaneModePreferenceController =
-                new AirplaneModePreferenceController(context, this /* fragment */);
+                new AirplaneModePreferenceController(context, fragment);
         final MobilePlanPreferenceController mobilePlanPreferenceController =
-                new MobilePlanPreferenceController(context, this);
+                new MobilePlanPreferenceController(context, mobilePlanHost);
         final WifiMasterSwitchPreferenceController wifiPreferenceController =
-                new WifiMasterSwitchPreferenceController(context, mMetricsFeatureProvider);
+                new WifiMasterSwitchPreferenceController(context, metricsFeatureProvider);
         final MobileNetworkPreferenceController mobileNetworkPreferenceController =
                 new MobileNetworkPreferenceController(context);
         final VpnPreferenceController vpnPreferenceController =
                 new VpnPreferenceController(context);
-        final Lifecycle lifecycle = getLifecycle();
-        lifecycle.addObserver(airplaneModePreferenceController);
-        lifecycle.addObserver(mobilePlanPreferenceController);
-        lifecycle.addObserver(wifiPreferenceController);
-        lifecycle.addObserver(mobileNetworkPreferenceController);
-        lifecycle.addObserver(vpnPreferenceController);
 
-        final List<PreferenceController> controllers = new ArrayList<>();
+        if (lifecycle != null) {
+            lifecycle.addObserver(airplaneModePreferenceController);
+            lifecycle.addObserver(mobilePlanPreferenceController);
+            lifecycle.addObserver(wifiPreferenceController);
+            lifecycle.addObserver(mobileNetworkPreferenceController);
+            lifecycle.addObserver(vpnPreferenceController);
+        }
+
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(airplaneModePreferenceController);
         controllers.add(mobileNetworkPreferenceController);
         controllers.add(new TetherPreferenceController(context, lifecycle));
@@ -211,6 +224,14 @@
                 }
 
                 @Override
+                public List<AbstractPreferenceController> getPreferenceControllers(Context
+                        context) {
+                    return buildPreferenceControllers(context, null /* lifecycle */,
+                            null /* metricsFeatureProvider */, null /* fragment */,
+                            null /* mobilePlanHost */);
+                }
+
+                @Override
                 public List<String> getNonIndexableKeys(Context context) {
                     List<String> keys = super.getNonIndexableKeys(context);
                     // Remove master switch as a result
diff --git a/src/com/android/settings/network/NetworkResetPreferenceController.java b/src/com/android/settings/network/NetworkResetPreferenceController.java
index d8f3217..58a5383 100644
--- a/src/com/android/settings/network/NetworkResetPreferenceController.java
+++ b/src/com/android/settings/network/NetworkResetPreferenceController.java
@@ -18,9 +18,11 @@
 
 import android.content.Context;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class NetworkResetPreferenceController extends PreferenceController {
+public class NetworkResetPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
 
     private final NetworkResetRestrictionChecker mRestrictionChecker;
 
diff --git a/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java b/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java
index 3e481a8..8d4ea63 100644
--- a/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java
+++ b/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java
@@ -20,15 +20,17 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.List;
 
 /**
- * {@link PreferenceController} that shows the active network scorer and toggles the preference
- * based on whether or not there are valid scorers installed.
+ * {@link AbstractPreferenceController} that shows the active network scorer and toggles the
+ * preference based on whether or not there are valid scorers installed.
  */
-public class NetworkScorerPickerPreferenceController extends PreferenceController {
+public class NetworkScorerPickerPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
 
     private static final String KEY_NETWORK_SCORER_PICKER = "network_scorer_picker";
 
diff --git a/src/com/android/settings/network/ProxyPreferenceController.java b/src/com/android/settings/network/ProxyPreferenceController.java
index edec247..0970dd9 100644
--- a/src/com/android/settings/network/ProxyPreferenceController.java
+++ b/src/com/android/settings/network/ProxyPreferenceController.java
@@ -20,9 +20,11 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class ProxyPreferenceController extends PreferenceController {
+public class ProxyPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
 
     private static final String KEY_PROXY_SETTINGS = "proxy_settings";
 
diff --git a/src/com/android/settings/network/TetherPreferenceController.java b/src/com/android/settings/network/TetherPreferenceController.java
index 933bc8a..1c9959e 100644
--- a/src/com/android/settings/network/TetherPreferenceController.java
+++ b/src/com/android/settings/network/TetherPreferenceController.java
@@ -15,6 +15,10 @@
  */
 package com.android.settings.network;
 
+import static android.os.UserManager.DISALLOW_CONFIG_TETHERING;
+import static com.android.settingslib.RestrictedLockUtils.checkIfRestrictionEnforced;
+import static com.android.settingslib.RestrictedLockUtils.hasBaseUserRestriction;
+
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothPan;
 import android.bluetooth.BluetoothProfile;
@@ -35,7 +39,8 @@
 
 import com.android.settings.R;
 import com.android.settings.TetherSettings;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnCreate;
@@ -45,13 +50,8 @@
 
 import java.util.concurrent.atomic.AtomicReference;
 
-import static android.os.UserManager.DISALLOW_CONFIG_TETHERING;
-
-import static com.android.settingslib.RestrictedLockUtils.checkIfRestrictionEnforced;
-import static com.android.settingslib.RestrictedLockUtils.hasBaseUserRestriction;
-
-public class TetherPreferenceController extends PreferenceController
-        implements LifecycleObserver, OnCreate, OnResume, OnPause, OnDestroy {
+public class TetherPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin, LifecycleObserver, OnCreate, OnResume, OnPause, OnDestroy {
 
     private static final String KEY_TETHER_SETTINGS = "tether_settings";
 
diff --git a/src/com/android/settings/network/VpnPreferenceController.java b/src/com/android/settings/network/VpnPreferenceController.java
index a62be76..763fb72 100644
--- a/src/com/android/settings/network/VpnPreferenceController.java
+++ b/src/com/android/settings/network/VpnPreferenceController.java
@@ -39,8 +39,9 @@
 import com.android.internal.net.LegacyVpnInfo;
 import com.android.internal.net.VpnConfig;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
@@ -48,8 +49,8 @@
 import java.util.List;
 
 
-public class VpnPreferenceController extends PreferenceController implements LifecycleObserver,
-        OnResume, OnPause {
+public class VpnPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {
 
     private static final String KEY_VPN_SETTINGS = "vpn_settings";
     private static final NetworkRequest REQUEST = new NetworkRequest.Builder()
diff --git a/src/com/android/settings/network/WifiCallingPreferenceController.java b/src/com/android/settings/network/WifiCallingPreferenceController.java
index 0e673fa..5d6e5cb 100644
--- a/src/com/android/settings/network/WifiCallingPreferenceController.java
+++ b/src/com/android/settings/network/WifiCallingPreferenceController.java
@@ -21,9 +21,11 @@
 
 import com.android.ims.ImsManager;
 import com.android.settings.WifiCallingSettings;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class WifiCallingPreferenceController extends PreferenceController {
+public class WifiCallingPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
 
     private static final String KEY_WFC_SETTINGS = "wifi_calling_settings";
     private TelephonyManager mTm;
diff --git a/src/com/android/settings/nfc/NfcPaymentPreference.java b/src/com/android/settings/nfc/NfcPaymentPreference.java
index 239377d..a3f7466 100644
--- a/src/com/android/settings/nfc/NfcPaymentPreference.java
+++ b/src/com/android/settings/nfc/NfcPaymentPreference.java
@@ -18,6 +18,7 @@
 import android.app.AlertDialog;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
+import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.support.v7.preference.PreferenceViewHolder;
@@ -209,7 +210,9 @@
             if (!appInfo.isDefault) {
                 mPaymentBackend.setDefaultPaymentApp(appInfo.componentName);
             }
-            getDialog().dismiss();
+            Dialog dialog = getDialog();
+            if (dialog != null)
+                dialog.dismiss();
         }
     }
 }
diff --git a/src/com/android/settings/nfc/NfcPreferenceController.java b/src/com/android/settings/nfc/NfcPreferenceController.java
index e5d47fb..a034777 100644
--- a/src/com/android/settings/nfc/NfcPreferenceController.java
+++ b/src/com/android/settings/nfc/NfcPreferenceController.java
@@ -23,12 +23,10 @@
 import android.os.Handler;
 import android.provider.Settings;
 import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.core.PreferenceController;
-import com.android.settings.network.AirplaneModePreferenceController;
-import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -36,8 +34,8 @@
 
 import java.util.List;
 
-public class NfcPreferenceController extends PreferenceController
-        implements LifecycleObserver, OnResume, OnPause {
+public class NfcPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {
 
     public static final String KEY_TOGGLE_NFC = "toggle_nfc";
     public static final String KEY_ANDROID_BEAM_SETTINGS = "android_beam_settings";
diff --git a/src/com/android/settings/nfc/OWNERS b/src/com/android/settings/nfc/OWNERS
new file mode 100644
index 0000000..f11f74f
--- /dev/null
+++ b/src/com/android/settings/nfc/OWNERS
@@ -0,0 +1,5 @@
+# Default reviewers for this and subdirectories.
+eisenbach@google.com
+kandoiruchi@google.com
+
+# Emergency approvers in case the above are not available
\ No newline at end of file
diff --git a/src/com/android/settings/nfc/PaymentBackend.java b/src/com/android/settings/nfc/PaymentBackend.java
index 7f07418..91cd96c 100644
--- a/src/com/android/settings/nfc/PaymentBackend.java
+++ b/src/com/android/settings/nfc/PaymentBackend.java
@@ -42,7 +42,7 @@
     }
 
     public static class PaymentAppInfo {
-        CharSequence label;
+        public CharSequence label;
         CharSequence description;
         Drawable banner;
         boolean isDefault;
diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java
index d914cd8..10f1154 100644
--- a/src/com/android/settings/nfc/PaymentSettings.java
+++ b/src/com/android/settings/nfc/PaymentSettings.java
@@ -16,12 +16,10 @@
 
 package com.android.settings.nfc;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
-import android.nfc.NfcAdapter;
 import android.os.Bundle;
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
@@ -34,8 +32,6 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.nfc.PaymentBackend.PaymentAppInfo;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
@@ -109,40 +105,6 @@
         menuItem.setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_NEVER);
     }
 
-    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 && NfcAdapter.getDefaultAdapter(mContext) != null) {
-                PaymentBackend paymentBackend = new PaymentBackend(mContext);
-                paymentBackend.refresh();
-                PaymentAppInfo app = paymentBackend.getDefaultApp();
-                String summary = null;
-                if (app != null) {
-                    summary = mContext.getString(R.string.payment_summary, app.label);
-                }
-                mSummaryLoader.setSummary(this, summary);
-            }
-        }
-    }
-
-    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);
-        }
-    };
-
     public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
         new BaseSearchIndexProvider() {
             @Override
diff --git a/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java b/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java
index f513882..bad626a 100644
--- a/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java
+++ b/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java
@@ -23,14 +23,16 @@
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.accounts.AccountRestrictionHelper;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.RestrictedPreference;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 /**
  * Base class for preference controller that handles preference that enforce adjust volume
  * restriction
  */
-public abstract class AdjustVolumeRestrictedPreferenceController extends PreferenceController {
+public abstract class AdjustVolumeRestrictedPreferenceController extends
+        AbstractPreferenceController implements PreferenceControllerMixin {
 
     private AccountRestrictionHelper mHelper;
 
diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index 5cac0bb..72a4cc1 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -21,6 +21,7 @@
 import android.app.NotificationChannelGroup;
 import android.app.NotificationManager;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.provider.Settings;
@@ -34,7 +35,6 @@
 import android.widget.Switch;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.AppHeader;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.applications.AppInfoBase;
@@ -137,6 +137,7 @@
                 .setLabel(mAppRow.label)
                 .setPackageName(mAppRow.pkg)
                 .setUid(mAppRow.uid)
+                .setHasAppInfoLink(true)
                 .setButtonActions(EntityHeaderController.ActionType.ACTION_NONE,
                         EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE)
                 .done(activity, getPrefContext());
@@ -191,7 +192,8 @@
             }
 
             int deletedChannelCount = mBackend.getDeletedChannelCount(mAppRow.pkg, mAppRow.uid);
-            if (deletedChannelCount > 0) {
+            if (deletedChannelCount > 0 &&
+                    getPreferenceScreen().findPreference(KEY_DELETED) == null) {
                 mDeletedChannels = new FooterPreference(getPrefContext());
                 mDeletedChannels.setSelectable(false);
                 mDeletedChannels.setTitle(getResources().getQuantityString(
@@ -219,7 +221,6 @@
         channelPref.setSummary(getImportanceSummary(channel));
         Bundle channelArgs = new Bundle();
         channelArgs.putInt(AppInfoBase.ARG_PACKAGE_UID, mUid);
-        channelArgs.putBoolean(AppHeader.EXTRA_HIDE_INFO_BUTTON, true);
         channelArgs.putString(AppInfoBase.ARG_PACKAGE_NAME, mPkg);
         channelArgs.putString(Settings.EXTRA_CHANNEL_ID, channel.getId());
         Intent channelIntent = Utils.onBuildStartFragmentIntent(getActivity(),
@@ -342,13 +343,20 @@
             case NotificationManager.IMPORTANCE_LOW:
                 return getContext().getString(R.string.notification_importance_low);
             case NotificationManager.IMPORTANCE_DEFAULT:
-                return getContext().getString(R.string.notification_importance_default);
+                if (hasValidSound(channel)) {
+                    return getContext().getString(R.string.notification_importance_default);
+                } else { // Silent
+                    return getContext().getString(R.string.notification_importance_low);
+                }
             case NotificationManager.IMPORTANCE_HIGH:
             case NotificationManager.IMPORTANCE_MAX:
             default:
-                return getContext().getString(R.string.notification_importance_high);
+                if (hasValidSound(channel)) {
+                    return getContext().getString(R.string.notification_importance_high);
+                } else { // Silent
+                    return getContext().getString(R.string.notification_importance_high_silent);
+                }
         }
-
     }
 
     private Comparator<NotificationChannel> mChannelComparator =
diff --git a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
index d77be7b..94eccf9 100644
--- a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
@@ -27,8 +27,9 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.support.v7.preference.TwoStatePreference;
 
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.search.DatabaseIndexingUtils;
 import com.android.settings.search.InlineSwitchPayload;
 import com.android.settings.search.ResultPayload;
@@ -38,8 +39,9 @@
 
 import static android.provider.Settings.Secure.NOTIFICATION_BADGING;
 
-public class BadgingNotificationPreferenceController extends PreferenceController implements
-        Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause {
+public class BadgingNotificationPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
+        LifecycleObserver, OnResume, OnPause {
 
     private static final String TAG = "BadgeNotifPrefContr";
     private static final String KEY_NOTIFICATION_BADGING = "notification_badging";
diff --git a/src/com/android/settings/notification/BootSoundPreferenceController.java b/src/com/android/settings/notification/BootSoundPreferenceController.java
index b644ee9..945f9ae 100644
--- a/src/com/android/settings/notification/BootSoundPreferenceController.java
+++ b/src/com/android/settings/notification/BootSoundPreferenceController.java
@@ -22,9 +22,11 @@
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class BootSoundPreferenceController extends PreferenceController {
+public class BootSoundPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
 
     // Boot Sounds needs to be a system property so it can be accessed during boot.
     private static final String KEY_BOOT_SOUNDS = "boot_sounds";
diff --git a/src/com/android/settings/notification/CastPreferenceController.java b/src/com/android/settings/notification/CastPreferenceController.java
index 0156dfd..fcb4535 100644
--- a/src/com/android/settings/notification/CastPreferenceController.java
+++ b/src/com/android/settings/notification/CastPreferenceController.java
@@ -18,9 +18,11 @@
 
 import android.content.Context;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class CastPreferenceController extends PreferenceController {
+public class CastPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
 
     private static final String KEY_WIFI_DISPLAY = "wifi_display";
 
diff --git a/src/com/android/settings/notification/ChannelImportanceSettings.java b/src/com/android/settings/notification/ChannelImportanceSettings.java
index 26dd57f..9e9ffd6 100644
--- a/src/com/android/settings/notification/ChannelImportanceSettings.java
+++ b/src/com/android/settings/notification/ChannelImportanceSettings.java
@@ -17,6 +17,7 @@
 package com.android.settings.notification;
 
 import static android.app.NotificationChannel.USER_LOCKED_IMPORTANCE;
+import static android.app.NotificationChannel.USER_LOCKED_SOUND;
 import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
 import static android.app.NotificationManager.IMPORTANCE_HIGH;
 import static android.app.NotificationManager.IMPORTANCE_LOW;
@@ -24,6 +25,7 @@
 import static android.app.NotificationManager.IMPORTANCE_MIN;
 
 import android.content.Context;
+import android.media.RingtoneManager;
 import android.provider.SearchIndexableResource;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
@@ -125,6 +127,7 @@
 
     @Override
     public void onRadioButtonClicked(RadioButtonPreference clicked) {
+        int oldImportance = mChannel.getImportance();
         switch (clicked.getKey()) {
             case KEY_IMPORTANCE_HIGH:
                 mChannel.setImportance(IMPORTANCE_HIGH);
@@ -140,6 +143,17 @@
                 break;
         }
         updateRadioButtons(clicked.getKey());
+
+        // If you are moving from an importance level without sound to one with sound,
+        // but the sound you had selected was "Silence",
+        // then set sound for this channel to your default sound,
+        // because you probably intended to cause this channel to actually start making sound.
+        if (oldImportance < IMPORTANCE_DEFAULT && !hasValidSound(mChannel) &&
+                mChannel.getImportance() >= IMPORTANCE_DEFAULT) {
+            mChannel.setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION),
+                    mChannel.getAudioAttributes());
+            mChannel.lockFields(USER_LOCKED_SOUND);
+        }
         mChannel.lockFields(USER_LOCKED_IMPORTANCE);
         mBackend.updateChannel(mAppRow.pkg, mAppRow.uid, mChannel);
     }
diff --git a/src/com/android/settings/notification/ChannelNotificationSettings.java b/src/com/android/settings/notification/ChannelNotificationSettings.java
index 6c052d5..dd4850e 100644
--- a/src/com/android/settings/notification/ChannelNotificationSettings.java
+++ b/src/com/android/settings/notification/ChannelNotificationSettings.java
@@ -26,6 +26,7 @@
 import android.os.AsyncTask;
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceGroup;
 import android.text.TextUtils;
 import android.text.BidiFormatter;
 import android.text.SpannableStringBuilder;
@@ -36,7 +37,6 @@
 import android.widget.Switch;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.AppHeader;
 import com.android.settings.R;
 import com.android.settings.RingtonePreference;
 import com.android.settings.Utils;
@@ -58,6 +58,7 @@
     private static final String KEY_VIBRATE = "vibrate";
     private static final String KEY_RINGTONE = "ringtone";
     private static final String KEY_IMPORTANCE = "importance";
+    private static final String KEY_ADVANCED = "advanced";
 
     private Preference mImportance;
     private RestrictedSwitchPreference mLights;
@@ -66,6 +67,7 @@
     private FooterPreference mFooter;
     private NotificationChannelGroup mChannelGroup;
     private EntityHeaderController mHeaderPref;
+    private PreferenceGroup mAdvanced;
 
     @Override
     public int getMetricsCategory() {
@@ -130,6 +132,7 @@
         setupVibrate();
         setupRingtone();
         setupImportance();
+        mAdvanced = (PreferenceGroup) findPreference(KEY_ADVANCED);
     }
 
     private void addHeaderPref() {
@@ -146,8 +149,9 @@
                 .setSummary(mAppRow.label)
                 .setPackageName(mAppRow.pkg)
                 .setUid(mAppRow.uid)
-                .setButtonActions(EntityHeaderController.ActionType.ACTION_APP_INFO,
-                        EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE)
+                .setButtonActions(EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE,
+                        EntityHeaderController.ActionType.ACTION_NONE)
+                .setHasAppInfoLink(true)
                 .done(activity, getPrefContext());
         getPreferenceScreen().addPreference(pref);
     }
@@ -283,7 +287,6 @@
         mImportance = findPreference(KEY_IMPORTANCE);
         Bundle channelArgs = new Bundle();
         channelArgs.putInt(AppInfoBase.ARG_PACKAGE_UID, mUid);
-        channelArgs.putBoolean(AppHeader.EXTRA_HIDE_INFO_BUTTON, true);
         channelArgs.putString(AppInfoBase.ARG_PACKAGE_NAME, mPkg);
         channelArgs.putString(Settings.EXTRA_CHANNEL_ID, mChannel.getId());
         mImportance.setEnabled(mSuspendedAppsAdmin == null && isChannelConfigurable(mChannel));
@@ -315,15 +318,19 @@
                 break;
             case NotificationManager.IMPORTANCE_DEFAULT:
                 title = getContext().getString(R.string.notification_importance_default_title);
-                if (hasValidSound()) {
+                if (hasValidSound(mChannel)) {
                     summary = getContext().getString(R.string.notification_importance_default);
+                } else {
+                    summary = getContext().getString(R.string.notification_importance_low);
                 }
                 break;
             case NotificationManager.IMPORTANCE_HIGH:
             case NotificationManager.IMPORTANCE_MAX:
                 title = getContext().getString(R.string.notification_importance_high_title);
-                if (hasValidSound()) {
+                if (hasValidSound(mChannel)) {
                     summary = getContext().getString(R.string.notification_importance_high);
+                } else {
+                    summary = getContext().getString(R.string.notification_importance_high_silent);
                 }
                 break;
             default:
@@ -366,26 +373,26 @@
                 Settings.System.NOTIFICATION_LIGHT_PULSE, 0) == 1;
     }
 
-    boolean hasValidSound() {
-        return mChannel.getSound() != null && !Uri.EMPTY.equals(mChannel.getSound());
-    }
-
     void updateDependents(boolean banned) {
+        PreferenceGroup parent;
         if (mShowLegacyChannelConfig) {
+            parent = getPreferenceScreen();
             setVisible(mImportanceToggle, checkCanBeVisible(NotificationManager.IMPORTANCE_MIN));
         } else {
+            setVisible(mAdvanced, checkCanBeVisible(NotificationManager.IMPORTANCE_MIN));
             setVisible(mImportance, checkCanBeVisible(NotificationManager.IMPORTANCE_MIN));
-            setVisible(mLights, checkCanBeVisible(
+            setVisible(mAdvanced, mLights, checkCanBeVisible(
                     NotificationManager.IMPORTANCE_DEFAULT) && canPulseLight());
             setVisible(mVibrate, checkCanBeVisible(NotificationManager.IMPORTANCE_DEFAULT));
             setVisible(mRingtone, checkCanBeVisible(NotificationManager.IMPORTANCE_DEFAULT));
+            parent = mAdvanced;
         }
-        setVisible(mBadge, checkCanBeVisible(NotificationManager.IMPORTANCE_MIN));
-        setVisible(mPriority, checkCanBeVisible(NotificationManager.IMPORTANCE_DEFAULT)
+        setVisible(parent, mBadge, checkCanBeVisible(NotificationManager.IMPORTANCE_MIN));
+        setVisible(parent, mPriority, checkCanBeVisible(NotificationManager.IMPORTANCE_DEFAULT)
                 || (checkCanBeVisible(NotificationManager.IMPORTANCE_LOW)
                 && mDndVisualEffectsSuppressed));
-        setVisible(mVisibilityOverride, checkCanBeVisible(NotificationManager.IMPORTANCE_LOW)
-                && isLockScreenSecure());
+        setVisible(parent, mVisibilityOverride, isLockScreenSecure()
+                &&checkCanBeVisible(NotificationManager.IMPORTANCE_LOW));
         setVisible(mBlockedDesc, mChannel.getImportance() == IMPORTANCE_NONE);
         if (mAppLink != null) {
             setVisible(mAppLink, checkCanBeVisible(NotificationManager.IMPORTANCE_MIN));
diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java
index 26fc0a0..2533466 100644
--- a/src/com/android/settings/notification/ConfigureNotificationSettings.java
+++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java
@@ -18,18 +18,23 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.UserHandle;
 import android.provider.SearchIndexableResource;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
+import com.android.settings.RingtonePreference;
 import com.android.settings.applications.NotificationApps;
-import com.android.settings.applications.NotificationApps.SummaryProvider;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.gestures.SwipeToNotificationPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
@@ -39,7 +44,21 @@
 public class ConfigureNotificationSettings extends DashboardFragment {
     private static final String TAG = "ConfigNotiSettings";
 
-    private static final String KEY_SWIPE_DOWN = "gesture_swipe_down_fingerprint_notifications";
+    @VisibleForTesting
+    static final String KEY_LOCKSCREEN = "lock_screen_notifications";
+    @VisibleForTesting
+    static final String KEY_LOCKSCREEN_WORK_PROFILE_HEADER =
+            "lock_screen_notifications_profile_header";
+    @VisibleForTesting
+    static final String KEY_LOCKSCREEN_WORK_PROFILE = "lock_screen_notifications_profile";
+    @VisibleForTesting
+    static final String KEY_SWIPE_DOWN = "gesture_swipe_down_fingerprint_notifications";
+
+    private static final String KEY_NOTI_DEFAULT_RINGTONE = "notification_default_ringtone";
+
+    private RingtonePreference mRequestPreference;
+    private static final int REQUEST_CODE = 200;
+    private static final String SELECTED_PREFERENCE_KEY = "selected_preference";
 
     @Override
     public int getMetricsCategory() {
@@ -57,22 +76,22 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
         return buildPreferenceControllers(context, getLifecycle());
     }
 
-    private static List<PreferenceController> buildPreferenceControllers(Context context,
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
             Lifecycle lifecycle) {
-        final List<PreferenceController> controllers = new ArrayList<>();
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         final BadgingNotificationPreferenceController badgeController =
                 new BadgingNotificationPreferenceController(context);
         final PulseNotificationPreferenceController pulseController =
                 new PulseNotificationPreferenceController(context);
         final LockScreenNotificationPreferenceController lockScreenNotificationController =
                 new LockScreenNotificationPreferenceController(context,
-                        "lock_screen_notifications",
-                        "lock_screen_notifications_profile_header",
-                        "lock_screen_notifications_profile");
+                        KEY_LOCKSCREEN,
+                        KEY_LOCKSCREEN_WORK_PROFILE_HEADER,
+                        KEY_LOCKSCREEN_WORK_PROFILE);
         if (lifecycle != null) {
             lifecycle.addObserver(pulseController);
             lifecycle.addObserver(lockScreenNotificationController);
@@ -82,9 +101,47 @@
         controllers.add(badgeController);
         controllers.add(pulseController);
         controllers.add(lockScreenNotificationController);
+        controllers.add(new NotificationRingtonePreferenceController(context) {
+            @Override
+            public String getPreferenceKey() {
+                return KEY_NOTI_DEFAULT_RINGTONE;
+            }
+
+        });
         return controllers;
     }
 
+    @Override
+    public boolean onPreferenceTreeClick(Preference preference) {
+        if (preference instanceof RingtonePreference) {
+            mRequestPreference = (RingtonePreference) preference;
+            mRequestPreference.onPrepareRingtonePickerIntent(mRequestPreference.getIntent());
+            startActivityForResultAsUser(
+                    mRequestPreference.getIntent(),
+                    REQUEST_CODE,
+                    null,
+                    UserHandle.of(mRequestPreference.getUserId()));
+            return true;
+        }
+        return super.onPreferenceTreeClick(preference);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (mRequestPreference != null) {
+            mRequestPreference.onActivityResult(requestCode, resultCode, data);
+            mRequestPreference = null;
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        if (mRequestPreference != null) {
+            outState.putString(SELECTED_PREFERENCE_KEY, mRequestPreference.getKey());
+        }
+    }
+
     public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
         = new SummaryLoader.SummaryProviderFactory() {
             @Override
@@ -108,8 +165,19 @@
                 }
 
                 @Override
-                public List<PreferenceController> getPreferenceControllers(Context context) {
+                public List<AbstractPreferenceController> getPreferenceControllers(
+                        Context context) {
                     return buildPreferenceControllers(context, null);
                 }
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    final List<String> keys = super.getNonIndexableKeys(context);
+                    keys.add(KEY_SWIPE_DOWN);
+                    keys.add(KEY_LOCKSCREEN);
+                    keys.add(KEY_LOCKSCREEN_WORK_PROFILE);
+                    keys.add(KEY_LOCKSCREEN_WORK_PROFILE_HEADER);
+                    return keys;
+                }
             };
 }
diff --git a/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java b/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java
index 39250c6..d6291a8 100644
--- a/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java
+++ b/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java
@@ -24,14 +24,16 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.accounts.AccountRestrictionHelper;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.RestrictedPreference;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 /**
  * Base class for preference controller that handles preference that enforce adjust volume
  * restriction
  */
-public class EmergencyBroadcastPreferenceController extends PreferenceController {
+public class EmergencyBroadcastPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
 
     private final String mPrefKey;
 
diff --git a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
index 228e185..9855751 100644
--- a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
@@ -16,6 +16,9 @@
 
 package com.android.settings.notification;
 
+import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS;
+import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS;
+
 import android.content.ContentResolver;
 import android.content.Context;
 import android.database.ContentObserver;
@@ -32,19 +35,18 @@
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import java.util.ArrayList;
 
-import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS;
-import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS;
-
-public class LockScreenNotificationPreferenceController extends PreferenceController implements
-        Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause {
+public class LockScreenNotificationPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
+        LifecycleObserver, OnResume, OnPause {
 
     private static final String TAG = "LockScreenNotifPref";
 
@@ -77,11 +79,10 @@
         mProfileChallengeUserId = Utils.getManagedProfileId(
                 UserManager.get(context), UserHandle.myUserId());
         final LockPatternUtils utils = new LockPatternUtils(context);
-        final boolean isUnified =
-                !utils.isSeparateProfileChallengeEnabled(mProfileChallengeUserId);
         mSecure = utils.isSecure(UserHandle.myUserId());
         mSecureProfile = (mProfileChallengeUserId != UserHandle.USER_NULL)
-                && (utils.isSecure(mProfileChallengeUserId) || (isUnified && mSecure));
+                && (utils.isSecure(mProfileChallengeUserId)
+                || (!utils.isSeparateProfileChallengeEnabled(mProfileChallengeUserId) && mSecure));
     }
 
     @Override
@@ -108,8 +109,6 @@
     private void initLockScreenNotificationPrefDisplay() {
         ArrayList<CharSequence> entries = new ArrayList<>();
         ArrayList<CharSequence> values = new ArrayList<>();
-        entries.add(mContext.getString(R.string.lock_screen_notifications_summary_disable));
-        values.add(Integer.toString(R.string.lock_screen_notifications_summary_disable));
 
         String summaryShowEntry =
                 mContext.getString(R.string.lock_screen_notifications_summary_show);
@@ -131,6 +130,10 @@
                     KEYGUARD_DISABLE_SECURE_NOTIFICATIONS);
         }
 
+        entries.add(mContext.getString(R.string.lock_screen_notifications_summary_disable));
+        values.add(Integer.toString(R.string.lock_screen_notifications_summary_disable));
+
+
         mLockscreen.setEntries(entries.toArray(new CharSequence[entries.size()]));
         mLockscreen.setEntryValues(values.toArray(new CharSequence[values.size()]));
         updateLockscreenNotifications();
@@ -150,8 +153,6 @@
         }
         ArrayList<CharSequence> entries = new ArrayList<>();
         ArrayList<CharSequence> values = new ArrayList<>();
-        entries.add(mContext.getString(R.string.lock_screen_notifications_summary_disable_profile));
-        values.add(Integer.toString(R.string.lock_screen_notifications_summary_disable_profile));
 
         String summaryShowEntry = mContext.getString(
                 R.string.lock_screen_notifications_summary_show_profile);
@@ -172,6 +173,10 @@
             setRestrictedIfNotificationFeaturesDisabled(summaryHideEntry, summaryHideEntryValue,
                     KEYGUARD_DISABLE_SECURE_NOTIFICATIONS);
         }
+
+        entries.add(mContext.getString(R.string.lock_screen_notifications_summary_disable_profile));
+        values.add(Integer.toString(R.string.lock_screen_notifications_summary_disable_profile));
+
         mLockscreenProfile.setOnPreClickListener(
                 (Preference p) -> Utils.startQuietModeDialogIfNecessary(mContext,
                         UserManager.get(mContext), mProfileChallengeUserId)
diff --git a/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java b/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
index a78fed7..f9eabb9 100644
--- a/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
+++ b/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
@@ -27,21 +27,21 @@
 import android.Manifest;
 import android.annotation.Nullable;
 import android.app.Activity;
+import android.app.NotificationManager;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.pm.PackageManager;
 import android.content.pm.ServiceInfo;
 import android.os.Bundle;
 import android.os.UserHandle;
-import android.provider.Settings;
-import android.provider.SettingsStringUtil;
 import android.util.Slog;
+import android.view.WindowManager;
 import android.view.accessibility.AccessibilityEvent;
 
 import com.android.internal.app.AlertActivity;
 import com.android.internal.app.AlertController;
 import com.android.settings.R;
-import com.android.settings.core.TouchOverlayManager;
 
 /** @hide */
 public class NotificationAccessConfirmationActivity extends Activity
@@ -52,13 +52,13 @@
 
     private int mUserId;
     private ComponentName mComponentName;
-    private TouchOverlayManager mTouchOverlayManager;
+    private NotificationManager mNm;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        mTouchOverlayManager = new TouchOverlayManager(this);
+        mNm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
 
         mComponentName = getIntent().getParcelableExtra(EXTRA_COMPONENT_NAME);
         mUserId = getIntent().getIntExtra(EXTRA_USER_ID, UserHandle.USER_NULL);
@@ -80,6 +80,20 @@
                 .installContent(p);
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        getWindow().addFlags(
+                WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
+    }
+
+    @Override
+    public void onPause() {
+        getWindow().clearFlags(
+                WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
+        super.onPause();
+    }
+
     private void onAllow() {
         String requiredPermission = Manifest.permission.BIND_NOTIFICATION_LISTENER_SERVICE;
         try {
@@ -94,12 +108,7 @@
             return;
         }
 
-        final SettingsStringUtil.SettingStringHelper setting =
-                 new SettingsStringUtil.SettingStringHelper(
-                         getContentResolver(),
-                         Settings.Secure.ENABLED_NOTIFICATION_LISTENERS,
-                         mUserId);
-        setting.write(SettingsStringUtil.ComponentNameSet.add(setting.read(), mComponentName));
+        mNm.setNotificationListenerAccessGranted(mComponentName, true);
 
         finish();
     }
@@ -122,16 +131,4 @@
             finish();
         }
     }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mTouchOverlayManager.setOverlayAllowed(false);
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        mTouchOverlayManager.setOverlayAllowed(true);
-    }
 }
diff --git a/src/com/android/settings/notification/NotificationAccessSettings.java b/src/com/android/settings/notification/NotificationAccessSettings.java
index 2cd728c..858482c 100644
--- a/src/com/android/settings/notification/NotificationAccessSettings.java
+++ b/src/com/android/settings/notification/NotificationAccessSettings.java
@@ -16,21 +16,18 @@
 
 package com.android.settings.notification;
 
+import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.Fragment;
-import android.app.NotificationManager;
 import android.content.ComponentName;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.service.notification.NotificationListenerService;
-import android.util.Log;
 
 import com.android.internal.annotations.VisibleForTesting;
-import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -41,7 +38,6 @@
     private static final String TAG = NotificationAccessSettings.class.getSimpleName();
     private static final Config CONFIG = getNotificationListenerConfig();
 
-
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -70,10 +66,11 @@
         return CONFIG;
     }
 
+    @Override
     protected boolean setEnabled(ComponentName service, String title, boolean enable) {
         logSpecialPermissionChange(enable, service.getPackageName());
         if (!enable) {
-            if (!mServiceListing.isEnabled(service)) {
+            if (!isServiceEnabled(service)) {
                 return true; // already disabled
             }
             // show a friendly dialog
@@ -82,10 +79,27 @@
                     .show(getFragmentManager(), "friendlydialog");
             return false;
         } else {
-            return super.setEnabled(service, title, enable);
+            if (isServiceEnabled(service)) {
+                return true; // already enabled
+            }
+            // show a scary dialog
+            new ScaryWarningDialogFragment()
+                    .setServiceInfo(service, title, this)
+                    .show(getFragmentManager(), "dialog");
+            return false;
         }
     }
 
+    @Override
+    protected boolean isServiceEnabled(ComponentName cn) {
+        return mNm.isNotificationListenerAccessGranted(cn);
+    }
+
+    @Override
+    protected void enable(ComponentName service) {
+        mNm.setNotificationListenerAccessGranted(service, true);
+    }
+
     @VisibleForTesting
     void logSpecialPermissionChange(boolean enable, String packageName) {
         int logCategory = enable ? MetricsEvent.APP_SPECIAL_PERMISSION_NOTIVIEW_ALLOW
@@ -94,17 +108,14 @@
                 logCategory, packageName);
     }
 
-    private static void disable(final Context context, final NotificationAccessSettings parent,
-            final ComponentName cn) {
-        parent.mServiceListing.setEnabled(cn, false);
+    private static void disable(final NotificationAccessSettings parent, final ComponentName cn) {
+        parent.mNm.setNotificationListenerAccessGranted(cn, false);
         AsyncTask.execute(new Runnable() {
             @Override
             public void run() {
-                final NotificationManager mgr = context.getSystemService(NotificationManager.class);
-
-                if (!mgr.isNotificationPolicyAccessGrantedForPackage(
+                if (!parent.mNm.isNotificationPolicyAccessGrantedForPackage(
                         cn.getPackageName())) {
-                    mgr.removeAutomaticZenRules(cn.getPackageName());
+                    parent.mNm.removeAutomaticZenRules(cn.getPackageName());
                 }
             }
         });
@@ -145,7 +156,7 @@
                     .setPositiveButton(R.string.notification_listener_disable_warning_confirm,
                             new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialog, int id) {
-                                    disable(getContext(), parent, cn);
+                                    disable(parent, cn);
                                 }
                             })
                     .setNegativeButton(R.string.notification_listener_disable_warning_cancel,
diff --git a/src/com/android/settings/notification/NotificationSettingsBase.java b/src/com/android/settings/notification/NotificationSettingsBase.java
index 48ca207..0d24afc 100644
--- a/src/com/android/settings/notification/NotificationSettingsBase.java
+++ b/src/com/android/settings/notification/NotificationSettingsBase.java
@@ -35,8 +35,10 @@
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.admin.DevicePolicyManager;
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
@@ -44,6 +46,7 @@
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
 import android.content.pm.UserInfo;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -51,6 +54,7 @@
 import android.service.notification.NotificationListenerService;
 import android.support.v7.preference.DropDownPreference;
 import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceGroup;
 import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.Log;
@@ -108,6 +112,8 @@
     protected NotificationBackend.AppRow mAppRow;
     protected boolean mShowLegacyChannelConfig = false;
 
+    protected boolean mListeningToPackageRemove;
+
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
@@ -159,6 +165,13 @@
         }
 
         mUserId = UserHandle.getUserId(mUid);
+        startListeningToPackageRemove();
+    }
+
+    @Override
+    public void onDestroy() {
+        stopListeningToPackageRemove();
+        super.onDestroy();
     }
 
     @Override
@@ -184,12 +197,16 @@
     }
 
     protected void setVisible(Preference p, boolean visible) {
-        final boolean isVisible = getPreferenceScreen().findPreference(p.getKey()) != null;
+        setVisible(getPreferenceScreen(), p, visible);
+    }
+
+    protected void setVisible(PreferenceGroup parent, Preference p, boolean visible) {
+        final boolean isVisible = parent.findPreference(p.getKey()) != null;
         if (isVisible == visible) return;
         if (visible) {
-            getPreferenceScreen().addPreference(p);
+            parent.addPreference(p);
         } else {
-            getPreferenceScreen().removePreference(p);
+            parent.removePreference(p);
         }
     }
 
@@ -264,12 +281,9 @@
 
     protected void addAppLinkPref() {
         if (mAppRow.settingsIntent != null && mAppLink == null) {
-            mAppLink = new Preference(getPrefContext());
-            mAppLink.setKey(KEY_APP_LINK);
-            mAppLink.setOrder(500);
+            addPreferencesFromResource(R.xml.inapp_notification_settings);
+            mAppLink = (Preference) findPreference(KEY_APP_LINK);
             mAppLink.setIntent(mAppRow.settingsIntent);
-            mAppLink.setTitle(mContext.getString(R.string.app_settings_link));
-            getPreferenceScreen().addPreference(mAppLink);
         }
     }
 
@@ -459,4 +473,42 @@
         return channel.isBlockableSystem()
                 || channel.getImportance() == NotificationManager.IMPORTANCE_NONE;
     }
+
+    protected void startListeningToPackageRemove() {
+        if (mListeningToPackageRemove) {
+            return;
+        }
+        mListeningToPackageRemove = true;
+        final IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_REMOVED);
+        filter.addDataScheme("package");
+        getContext().registerReceiver(mPackageRemovedReceiver, filter);
+    }
+
+    protected void stopListeningToPackageRemove() {
+        if (!mListeningToPackageRemove) {
+            return;
+        }
+        mListeningToPackageRemove = false;
+        getContext().unregisterReceiver(mPackageRemovedReceiver);
+    }
+
+    protected void onPackageRemoved() {
+        getActivity().finishAndRemoveTask();
+    }
+
+    protected final BroadcastReceiver mPackageRemovedReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String packageName = intent.getData().getSchemeSpecificPart();
+            if (mPkgInfo == null || TextUtils.equals(mPkgInfo.packageName, packageName)) {
+                if (DEBUG) Log.d(TAG, "Package (" + packageName + ") removed. Removing"
+                        + "NotificationSettingsBase.");
+                onPackageRemoved();
+            }
+        }
+    };
+
+    boolean hasValidSound(NotificationChannel channel) {
+        return channel.getSound() != null && !Uri.EMPTY.equals(channel.getSound());
+    }
 }
diff --git a/src/com/android/settings/notification/OWNERS b/src/com/android/settings/notification/OWNERS
new file mode 100644
index 0000000..0d73685
--- /dev/null
+++ b/src/com/android/settings/notification/OWNERS
@@ -0,0 +1,4 @@
+# Default reviewers for this and subdirectories.
+asc@google.com
+dsandler@google.com
+juliacr@google.com
\ No newline at end of file
diff --git a/src/com/android/settings/notification/PulseNotificationPreferenceController.java b/src/com/android/settings/notification/PulseNotificationPreferenceController.java
index d6db8ac..4a8b820 100644
--- a/src/com/android/settings/notification/PulseNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/PulseNotificationPreferenceController.java
@@ -27,15 +27,17 @@
 import android.support.v7.preference.TwoStatePreference;
 import android.util.Log;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import static android.provider.Settings.System.NOTIFICATION_LIGHT_PULSE;
 
-public class PulseNotificationPreferenceController extends PreferenceController implements
-        Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause {
+public class PulseNotificationPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
+        LifecycleObserver, OnResume, OnPause {
 
     private static final String TAG = "PulseNotifPrefContr";
     private static final String KEY_NOTIFICATION_PULSE = "notification_pulse";
diff --git a/src/com/android/settings/notification/RingtonePreferenceControllerBase.java b/src/com/android/settings/notification/RingtonePreferenceControllerBase.java
index 333f08a..09a47b7 100644
--- a/src/com/android/settings/notification/RingtonePreferenceControllerBase.java
+++ b/src/com/android/settings/notification/RingtonePreferenceControllerBase.java
@@ -22,9 +22,11 @@
 import android.net.Uri;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public abstract class RingtonePreferenceControllerBase extends PreferenceController {
+public abstract class RingtonePreferenceControllerBase extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
 
     public RingtonePreferenceControllerBase(Context context) {
         super(context);
diff --git a/src/com/android/settings/notification/SettingPrefController.java b/src/com/android/settings/notification/SettingPrefController.java
index 413b4a2..ac613d1 100644
--- a/src/com/android/settings/notification/SettingPrefController.java
+++ b/src/com/android/settings/notification/SettingPrefController.java
@@ -27,15 +27,15 @@
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
-import java.util.List;
 
-public abstract class SettingPrefController extends PreferenceController implements
-    LifecycleObserver, OnResume, OnPause {
+public abstract class SettingPrefController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {
 
     protected static final int DEFAULT_ON = 1;
 
@@ -55,6 +55,7 @@
     @Override
     public void displayPreference(PreferenceScreen screen) {
         mPreference.init(mParent);
+        super.displayPreference(screen);
         if (isAvailable()) {
             mSettingsObserver = new SettingsObserver();
         }
diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java
index 8bee301..ad6da10 100644
--- a/src/com/android/settings/notification/SoundSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java
@@ -31,9 +31,9 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.RingtonePreference;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
@@ -57,7 +57,7 @@
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        mProgressiveDisclosureMixin.setTileLimit(6);
+        mProgressiveDisclosureMixin.setTileLimit(1);
     }
 
     @Override
@@ -113,7 +113,7 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
         return buildPreferenceControllers(context, this, mVolumeCallback, getLifecycle());
     }
 
@@ -182,10 +182,10 @@
         }
     }
 
-    private static List<PreferenceController> buildPreferenceControllers(Context context,
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
             SoundSettings fragment, VolumeSeekBarPreference.Callback callback,
             Lifecycle lifecycle) {
-        final List<PreferenceController> controllers = new ArrayList<>();
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new ZenModePreferenceController(context));
         controllers.add(new EmergencyBroadcastPreferenceController(
                 context, KEY_CELL_BROADCAST_SETTINGS));
@@ -233,7 +233,7 @@
                 }
 
                 @Override
-                public List<PreferenceController> getPreferenceControllers(Context context) {
+                public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
                     return buildPreferenceControllers(context, null /* fragment */,
                             null /* callback */, null /* lifecycle */);
                 }
diff --git a/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java b/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java
index 338b652..d41e16b 100644
--- a/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java
+++ b/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java
@@ -27,15 +27,17 @@
 import android.support.v7.preference.TwoStatePreference;
 
 import com.android.settings.Utils;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import static android.provider.Settings.System.VIBRATE_WHEN_RINGING;
 
-public class VibrateWhenRingPreferenceController extends PreferenceController implements
-        Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause {
+public class VibrateWhenRingPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
+        LifecycleObserver, OnResume, OnPause {
 
     private static final String KEY_VIBRATE_WHEN_RINGING = "vibrate_when_ringing";
     private SettingObserver mSettingObserver;
diff --git a/src/com/android/settings/notification/WorkSoundPreferenceController.java b/src/com/android/settings/notification/WorkSoundPreferenceController.java
index 465a2ec..1497c2c 100644
--- a/src/com/android/settings/notification/WorkSoundPreferenceController.java
+++ b/src/com/android/settings/notification/WorkSoundPreferenceController.java
@@ -43,15 +43,17 @@
 import com.android.settings.DefaultRingtonePreference;
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
-public class WorkSoundPreferenceController extends PreferenceController implements
-        OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause {
+public class WorkSoundPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, OnPreferenceChangeListener, LifecycleObserver,
+        OnResume, OnPause {
 
     private static final String TAG = "WorkSoundPrefController";
     private static final String KEY_WORK_CATEGORY = "sound_work_settings_section";
diff --git a/src/com/android/settings/notification/ZenAccessSettings.java b/src/com/android/settings/notification/ZenAccessSettings.java
index a41a733..238c11e 100644
--- a/src/com/android/settings/notification/ZenAccessSettings.java
+++ b/src/com/android/settings/notification/ZenAccessSettings.java
@@ -17,7 +17,9 @@
 package com.android.settings.notification;
 
 import android.annotation.Nullable;
+import android.app.ActivityManager;
 import android.app.AlertDialog;
+import android.app.AppGlobals;
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.app.NotificationManager;
@@ -25,14 +27,17 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageItemInfo;
 import android.content.pm.PackageManager;
+import android.content.pm.ParceledListSlice;
 import android.database.ContentObserver;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.os.RemoteException;
 import android.provider.Settings;
 import android.provider.Settings.Secure;
 import android.support.v14.preference.SwitchPreference;
@@ -41,6 +46,7 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 import android.util.ArraySet;
+import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
 
@@ -55,10 +61,9 @@
 import java.util.List;
 
 public class ZenAccessSettings extends EmptyTextSettings {
+    private final String TAG = "ZenAccessSettings";
 
     private final SettingObserver mObserver = new SettingObserver();
-    private static final String ENABLED_SERVICES_SEPARATOR = ":";
-
     private Context mContext;
     private PackageManager mPkgMan;
     private NotificationManager mNoMan;
@@ -87,26 +92,32 @@
     @Override
     public void onResume() {
         super.onResume();
-        reloadList();
-        getContentResolver().registerContentObserver(
-                Secure.getUriFor(Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES), false,
-                mObserver);
-        getContentResolver().registerContentObserver(
-                Secure.getUriFor(Secure.ENABLED_NOTIFICATION_LISTENERS), false,
-                mObserver);
+        if (!ActivityManager.isLowRamDeviceStatic()) {
+            reloadList();
+            getContentResolver().registerContentObserver(
+                    Secure.getUriFor(Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES), false,
+                    mObserver);
+            getContentResolver().registerContentObserver(
+                    Secure.getUriFor(Secure.ENABLED_NOTIFICATION_LISTENERS), false,
+                    mObserver);
+        } else {
+            setEmptyText(R.string.disabled_low_ram_device);
+        }
     }
 
     @Override
     public void onPause() {
         super.onPause();
-        getContentResolver().unregisterContentObserver(mObserver);
+        if (!ActivityManager.isLowRamDeviceStatic()) {
+            getContentResolver().unregisterContentObserver(mObserver);
+        }
     }
 
     private void reloadList() {
         final PreferenceScreen screen = getPreferenceScreen();
         screen.removeAll();
         final ArrayList<ApplicationInfo> apps = new ArrayList<>();
-        final ArraySet<String> requesting = mNoMan.getPackagesRequestingNotificationPolicyAccess();
+        final ArraySet<String> requesting = getPackagesRequestingNotificationPolicyAccess();
         if (!requesting.isEmpty()) {
             final List<ApplicationInfo> installed = mPkgMan.getInstalledApplications(0);
             if (installed != null) {
@@ -117,7 +128,8 @@
                 }
             }
         }
-        ArraySet<String> autoApproved = getEnabledNotificationListeners();
+        ArraySet<String> autoApproved = new ArraySet<>();
+        autoApproved.addAll(mNoMan.getEnabledNotificationListenerPackages());
         requesting.addAll(autoApproved);
         Collections.sort(apps, new PackageItemInfo.DisplayNameComparator(mPkgMan));
         for (ApplicationInfo app : apps) {
@@ -152,20 +164,25 @@
         }
     }
 
-    private ArraySet<String> getEnabledNotificationListeners() {
-        ArraySet<String> packages = new ArraySet<>();
-        String settingValue = Settings.Secure.getString(getContext().getContentResolver(),
-                Settings.Secure.ENABLED_NOTIFICATION_LISTENERS);
-        if (!TextUtils.isEmpty(settingValue)) {
-            String[] restored = settingValue.split(ENABLED_SERVICES_SEPARATOR);
-            for (int i = 0; i < restored.length; i++) {
-                ComponentName value = ComponentName.unflattenFromString(restored[i]);
-                if (null != value) {
-                    packages.add(value.getPackageName());
+    private ArraySet<String> getPackagesRequestingNotificationPolicyAccess() {
+        ArraySet<String> requestingPackages = new ArraySet<>();
+        try {
+            final String[] PERM = {
+                    android.Manifest.permission.ACCESS_NOTIFICATION_POLICY
+            };
+            final ParceledListSlice list = AppGlobals.getPackageManager()
+                    .getPackagesHoldingPermissions(PERM, 0 /*flags*/,
+                            ActivityManager.getCurrentUser());
+            final List<PackageInfo> pkgs = list.getList();
+            if (pkgs != null) {
+                for (PackageInfo info : pkgs) {
+                    requestingPackages.add(info.packageName);
                 }
             }
+        } catch(RemoteException e) {
+            Log.e(TAG, "Cannot reach packagemanager", e);
         }
-        return packages;
+        return requestingPackages;
     }
 
     private boolean hasAccess(String pkg) {
diff --git a/src/com/android/settings/notification/ZenModePrioritySettings.java b/src/com/android/settings/notification/ZenModePrioritySettings.java
index f4d3f74..b164407 100644
--- a/src/com/android/settings/notification/ZenModePrioritySettings.java
+++ b/src/com/android/settings/notification/ZenModePrioritySettings.java
@@ -31,7 +31,7 @@
 import com.android.settings.R;
 import com.android.settings.search.Indexable;
 
-public class ZenModePrioritySettings extends ZenModeSettingsBase implements Indexable {
+public class ZenModePrioritySettings extends ZenModeSettingsBase {
     private static final String KEY_REMINDERS = "reminders";
     private static final String KEY_EVENTS = "events";
     private static final String KEY_MESSAGES = "messages";
diff --git a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java
index 5629b17..4abdd7e 100644
--- a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java
+++ b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.notification;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.AutomaticZenRule;
 import android.app.NotificationManager;
@@ -262,8 +263,14 @@
     }
 
     private void updateRuleName() {
-        getActivity().setTitle(mRule.getName());
-        mRuleName.setSummary(mRule.getName());
+        Activity activity = getActivity();
+        if (activity != null) {
+            activity.setTitle(mRule.getName());
+            mRuleName.setSummary(mRule.getName());
+        } else {
+            if (DEBUG) Log.d(TAG, "updateRuleName - activity title and mRuleName "
+                    + "not updated; getActivity() returned null");
+        }
     }
 
     private AutomaticZenRule getZenRule() {
diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index e6b10c3..8cb700b 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -136,7 +136,7 @@
             }
         }
         final Preference p = new Preference(getPrefContext());
-        p.setIcon(R.drawable.ic_add);
+        p.setIcon(R.drawable.ic_menu_add);
         p.setTitle(R.string.zen_mode_add_rule);
         p.setPersistent(false);
         p.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@@ -178,8 +178,6 @@
     private static ManagedServiceSettings.Config getConditionProviderConfig() {
         final ManagedServiceSettings.Config c = new ManagedServiceSettings.Config();
         c.tag = TAG;
-        c.setting = Settings.Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES;
-        c.secondarySetting = Settings.Secure.ENABLED_NOTIFICATION_LISTENERS;
         c.intentAction = ConditionProviderService.SERVICE_INTERFACE;
         c.permission = android.Manifest.permission.BIND_CONDITION_PROVIDER_SERVICE;
         c.noun = "condition provider";
diff --git a/src/com/android/settings/overlay/FeatureFactory.java b/src/com/android/settings/overlay/FeatureFactory.java
index 4c4621a..1d0f24f 100644
--- a/src/com/android/settings/overlay/FeatureFactory.java
+++ b/src/com/android/settings/overlay/FeatureFactory.java
@@ -23,9 +23,11 @@
 import com.android.settings.R;
 import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.bluetooth.BluetoothFeatureProvider;
+import com.android.settings.connecteddevice.SmsMirroringFeatureProvider;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.dashboard.DashboardFeatureProvider;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
+import com.android.settings.datausage.DataPlanFeatureProvider;
 import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
 import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
 import com.android.settings.gestures.AssistGestureFeatureProvider;
@@ -100,6 +102,10 @@
 
     public abstract BluetoothFeatureProvider getBluetoothFeatureProvider(Context context);
 
+    public abstract DataPlanFeatureProvider getDataPlanFeatureProvider();
+
+    public abstract SmsMirroringFeatureProvider getSmsMirroringFeatureProvider();
+
     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
index d4ee912..36c3bc9 100644
--- a/src/com/android/settings/overlay/FeatureFactoryImpl.java
+++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java
@@ -29,11 +29,15 @@
 import com.android.settings.applications.PackageManagerWrapperImpl;
 import com.android.settings.bluetooth.BluetoothFeatureProvider;
 import com.android.settings.bluetooth.BluetoothFeatureProviderImpl;
+import com.android.settings.connecteddevice.SmsMirroringFeatureProvider;
+import com.android.settings.connecteddevice.SmsMirroringFeatureProviderImpl;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.dashboard.DashboardFeatureProvider;
 import com.android.settings.dashboard.DashboardFeatureProviderImpl;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
+import com.android.settings.datausage.DataPlanFeatureProvider;
+import com.android.settings.datausage.DataPlanFeatureProviderImpl;
 import com.android.settings.enterprise.DevicePolicyManagerWrapperImpl;
 import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
 import com.android.settings.enterprise.EnterprisePrivacyFeatureProviderImpl;
@@ -69,6 +73,8 @@
     private AssistGestureFeatureProvider mAssistGestureFeatureProvider;
     private UserFeatureProvider mUserFeatureProvider;
     private BluetoothFeatureProvider mBluetoothFeatureProvider;
+    private DataPlanFeatureProvider mDataPlanFeatureProvider;
+    private SmsMirroringFeatureProvider mSmsMirroringFeatureProvider;
 
     @Override
     public SupportFeatureProvider getSupportFeatureProvider(Context context) {
@@ -180,10 +186,26 @@
     }
 
     @Override
+    public DataPlanFeatureProvider getDataPlanFeatureProvider() {
+        if (mDataPlanFeatureProvider == null) {
+            mDataPlanFeatureProvider = new DataPlanFeatureProviderImpl();
+        }
+        return mDataPlanFeatureProvider;
+    }
+
+    @Override
     public AssistGestureFeatureProvider getAssistGestureFeatureProvider() {
         if (mAssistGestureFeatureProvider == null) {
             mAssistGestureFeatureProvider = new AssistGestureFeatureProviderImpl();
         }
         return mAssistGestureFeatureProvider;
     }
+
+    @Override
+    public SmsMirroringFeatureProvider getSmsMirroringFeatureProvider() {
+        if (mSmsMirroringFeatureProvider == null) {
+            mSmsMirroringFeatureProvider = new SmsMirroringFeatureProviderImpl();
+        }
+        return mSmsMirroringFeatureProvider;
+    }
 }
diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java
index 4d20bcf..a694603 100644
--- a/src/com/android/settings/password/ChooseLockGeneric.java
+++ b/src/com/android/settings/password/ChooseLockGeneric.java
@@ -179,6 +179,8 @@
                 .getBooleanExtra(CONFIRM_CREDENTIALS, true);
             if (getActivity() instanceof ChooseLockGeneric.InternalActivity) {
                 mPasswordConfirmed = !confirmCredentials;
+                mUserPassword = getActivity().getIntent().getStringExtra(
+                        ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
             }
             mHideDrawer = getActivity().getIntent().getBooleanExtra(EXTRA_HIDE_DRAWER, false);
 
@@ -198,6 +200,10 @@
                 mEncryptionRequestQuality = savedInstanceState.getInt(ENCRYPT_REQUESTED_QUALITY);
                 mEncryptionRequestDisabled = savedInstanceState.getBoolean(
                         ENCRYPT_REQUESTED_DISABLED);
+                if (mUserPassword == null) {
+                    mUserPassword = savedInstanceState.getString(
+                            ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
+                }
             }
 
             // a) If this is started from other user, use that user id.
@@ -219,7 +225,7 @@
             mManagedPasswordProvider = ManagedLockPasswordProvider.get(getActivity(), mUserId);
 
             if (mPasswordConfirmed) {
-                updatePreferencesOrFinish();
+                updatePreferencesOrFinish(savedInstanceState != null);
                 if (mForChangeCredRequiredForBoot) {
                     maybeEnableEncryption(mLockPatternUtils.getKeyguardStoredPasswordQuality(
                             mUserId), false);
@@ -234,7 +240,7 @@
                         || !helper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST,
                         getString(R.string.unlock_set_unlock_launch_picker_title), true, mUserId)) {
                     mPasswordConfirmed = true; // no password set, so no need to confirm
-                    updatePreferencesOrFinish();
+                    updatePreferencesOrFinish(savedInstanceState != null);
                 } else {
                     mWaitingForConfirmation = true;
                 }
@@ -268,6 +274,10 @@
                 // Forward the target user id to  ChooseLockGeneric.
                 chooseLockGenericIntent.putExtra(Intent.EXTRA_USER_ID, mUserId);
                 chooseLockGenericIntent.putExtra(CONFIRM_CREDENTIALS, !mPasswordConfirmed);
+                if (mUserPassword != null) {
+                    chooseLockGenericIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD,
+                            mUserPassword);
+                }
                 startActivityForResult(chooseLockGenericIntent, SKIP_FINGERPRINT_REQUEST);
                 return true;
             } else {
@@ -332,7 +342,7 @@
             if (requestCode == CONFIRM_EXISTING_REQUEST && resultCode == Activity.RESULT_OK) {
                 mPasswordConfirmed = true;
                 mUserPassword = data.getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
-                updatePreferencesOrFinish();
+                updatePreferencesOrFinish(false /* isRecreatingActivity */);
                 if (mForChangeCredRequiredForBoot) {
                     if (!TextUtils.isEmpty(mUserPassword)) {
                         maybeEnableEncryption(
@@ -393,9 +403,12 @@
             outState.putBoolean(WAITING_FOR_CONFIRMATION, mWaitingForConfirmation);
             outState.putInt(ENCRYPT_REQUESTED_QUALITY, mEncryptionRequestQuality);
             outState.putBoolean(ENCRYPT_REQUESTED_DISABLED, mEncryptionRequestDisabled);
+            if (mUserPassword != null) {
+                outState.putString(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, mUserPassword);
+            }
         }
 
-        private void updatePreferencesOrFinish() {
+        private void updatePreferencesOrFinish(boolean isRecreatingActivity) {
             Intent intent = getActivity().getIntent();
             int quality = intent.getIntExtra(LockPatternUtils.PASSWORD_TYPE_KEY, -1);
             if (quality == -1) {
@@ -413,7 +426,8 @@
                 updatePreferenceText();
                 updateCurrentPreference();
                 updatePreferenceSummaryIfNeeded();
-            } else {
+            } else if (!isRecreatingActivity) {
+                // Don't start the activity again if we are recreated for configuration change
                 updateUnlockMethodAndFinish(quality, false, true /* chooseLockSkipped */);
             }
         }
@@ -579,7 +593,8 @@
                             .setUserId(mUserId);
             if (mHasChallenge) {
                 builder.setChallenge(mChallenge);
-            } else {
+            }
+            if (mUserPassword != null) {
                 builder.setPassword(mUserPassword);
             }
             return builder.build();
@@ -592,7 +607,8 @@
                             .setUserId(mUserId);
             if (mHasChallenge) {
                 builder.setChallenge(mChallenge);
-            } else {
+            }
+            if (mUserPassword != null) {
                 builder.setPattern(mUserPassword);
             }
             return builder.build();
diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java
index 84e150a..9f5192d 100644
--- a/src/com/android/settings/password/ChooseLockPassword.java
+++ b/src/com/android/settings/password/ChooseLockPassword.java
@@ -105,6 +105,7 @@
             mIntent = new Intent(context, ChooseLockPassword.class);
             mIntent.putExtra(ChooseLockGeneric.CONFIRM_CREDENTIALS, false);
             mIntent.putExtra(EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, false);
+            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
         }
 
         public IntentBuilder setPasswordQuality(int quality) {
@@ -130,7 +131,6 @@
         }
 
         public IntentBuilder setPassword(String password) {
-            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
             mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, password);
             return this;
         }
@@ -162,7 +162,7 @@
                 .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, false);
         CharSequence msg = getText(forFingerprint
                 ? R.string.lockpassword_choose_your_password_header_for_fingerprint
-                : R.string.lockpassword_choose_your_password_header);
+                : R.string.lockpassword_choose_your_screen_lock_header);
         setTitle(msg);
         LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
         layout.setFitsSystemWindows(false);
@@ -211,7 +211,9 @@
         private RecyclerView mPasswordRestrictionView;
         protected boolean mIsAlphaMode;
         protected Button mCancelButton;
+        private Button mClearButton;
         private Button mNextButton;
+        private TextView mMessage;
 
         private TextChangedHandler mTextChangedHandler;
 
@@ -246,10 +248,14 @@
         protected enum Stage {
 
             Introduction(
-                    R.string.lockpassword_choose_your_password_header,
+                    R.string.lockpassword_choose_your_screen_lock_header,
                     R.string.lockpassword_choose_your_password_header_for_fingerprint,
-                    R.string.lockpassword_choose_your_pin_header,
+                    R.string.lockpassword_choose_your_screen_lock_header,
                     R.string.lockpassword_choose_your_pin_header_for_fingerprint,
+                    R.string.lockpassword_choose_your_password_message,
+                    R.string.lock_settings_picker_fingerprint_added_security_message,
+                    R.string.lockpassword_choose_your_pin_message,
+                    R.string.lock_settings_picker_fingerprint_added_security_message,
                     R.string.next_label),
 
             NeedToConfirm(
@@ -257,6 +263,10 @@
                     R.string.lockpassword_confirm_your_password_header,
                     R.string.lockpassword_confirm_your_pin_header,
                     R.string.lockpassword_confirm_your_pin_header,
+                    0,
+                    0,
+                    0,
+                    0,
                     R.string.lockpassword_ok_label),
 
             ConfirmWrong(
@@ -264,14 +274,25 @@
                     R.string.lockpassword_confirm_passwords_dont_match,
                     R.string.lockpassword_confirm_pins_dont_match,
                     R.string.lockpassword_confirm_pins_dont_match,
+                    0,
+                    0,
+                    0,
+                    0,
                     R.string.next_label);
 
             Stage(int hintInAlpha, int hintInAlphaForFingerprint,
-                    int hintInNumeric, int hintInNumericForFingerprint, int nextButtonText) {
+                    int hintInNumeric, int hintInNumericForFingerprint,
+                    int messageInAlpha, int messageInAlphaForFingerprint,
+                    int messageInNumeric, int messageInNumericForFingerprint,
+                    int nextButtonText) {
                 this.alphaHint = hintInAlpha;
                 this.alphaHintForFingerprint = hintInAlphaForFingerprint;
                 this.numericHint = hintInNumeric;
                 this.numericHintForFingerprint = hintInNumericForFingerprint;
+                this.alphaMessage = messageInAlpha;
+                this.alphaMessageForFingerprint = messageInAlphaForFingerprint;
+                this.numericMessage = messageInNumeric;
+                this.numericMessageForFingerprint = messageInNumericForFingerprint;
                 this.buttonText = nextButtonText;
             }
 
@@ -279,6 +300,10 @@
             public final int alphaHintForFingerprint;
             public final int numericHint;
             public final int numericHintForFingerprint;
+            public final int alphaMessage;
+            public final int alphaMessageForFingerprint;
+            public final int numericMessage;
+            public final int numericMessageForFingerprint;
             public final int buttonText;
 
             public @StringRes int getHint(boolean isAlpha, boolean isFingerprint) {
@@ -288,6 +313,14 @@
                     return isFingerprint ? numericHintForFingerprint : numericHint;
                 }
             }
+
+            public @StringRes int getMessage(boolean isAlpha, boolean isFingerprint) {
+                if (isAlpha) {
+                    return isFingerprint ? alphaMessageForFingerprint : alphaMessage;
+                } else {
+                    return isFingerprint ? numericMessageForFingerprint : numericMessage;
+                }
+            }
         }
 
         // required constructor for fragments
@@ -347,15 +380,12 @@
             mCancelButton.setOnClickListener(this);
             mNextButton = (Button) view.findViewById(R.id.next_button);
             mNextButton.setOnClickListener(this);
+            mClearButton = view.findViewById(R.id.clear_button);
+            mClearButton.setOnClickListener(this);
 
+
+            mMessage = view.findViewById(R.id.message);
             if (mForFingerprint) {
-                TextView fingerprintBackupMessage =
-                        view.findViewById(R.id.fingerprint_backup_message);
-                if (fingerprintBackupMessage != null) {
-                    fingerprintBackupMessage.setVisibility(View.VISIBLE);
-                    fingerprintBackupMessage
-                            .setText(R.string.setup_lock_settings_picker_fingerprint_message);
-                }
                 mLayout.setIcon(getActivity().getDrawable(R.drawable.ic_fingerprint_header));
             }
 
@@ -735,6 +765,10 @@
                 case R.id.cancel_button:
                     getActivity().finish();
                     break;
+
+                case R.id.clear_button:
+                    mPasswordEntry.setText("");
+                    break;
             }
         }
 
@@ -839,11 +873,27 @@
                 mPasswordRestrictionView.setVisibility(View.GONE);
                 setHeaderText(getString(mUiStage.getHint(mIsAlphaMode, mForFingerprint)));
                 setNextEnabled(canInput && length > 0);
+                mClearButton.setEnabled(canInput && length > 0);
             }
+            int message = mUiStage.getMessage(mIsAlphaMode, mForFingerprint);
+            if (message != 0) {
+                mMessage.setVisibility(View.VISIBLE);
+                mMessage.setText(message);
+            } else {
+                mMessage.setVisibility(View.INVISIBLE);
+            }
+
+            mClearButton.setVisibility(toVisibility(mUiStage != Stage.Introduction));
+            mCancelButton.setVisibility(toVisibility(mUiStage == Stage.Introduction));
+
             setNextText(mUiStage.buttonText);
             mPasswordEntryInputDisabler.setInputEnabled(canInput);
         }
 
+        private int toVisibility(boolean visibleOrGone) {
+            return visibleOrGone ? View.VISIBLE : View.GONE;
+        }
+
         private void setHeaderText(String text) {
             // Only set the text if it is different than the existing one to avoid announcing again.
             if (!TextUtils.isEmpty(mLayout.getHeaderText())
diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java
index 9d00729..7df8974 100644
--- a/src/com/android/settings/password/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -95,6 +95,7 @@
             mIntent = new Intent(context, ChooseLockPattern.class);
             mIntent.putExtra(EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, false);
             mIntent.putExtra(ChooseLockGeneric.CONFIRM_CREDENTIALS, false);
+            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
         }
 
         public IntentBuilder setUserId(int userId) {
@@ -109,7 +110,6 @@
         }
 
         public IntentBuilder setPattern(String pattern) {
-            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
             mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, pattern);
             return this;
         }
diff --git a/src/com/android/settings/password/ChooseLockSettingsHelper.java b/src/com/android/settings/password/ChooseLockSettingsHelper.java
index b5a838f..806ee67 100644
--- a/src/com/android/settings/password/ChooseLockSettingsHelper.java
+++ b/src/com/android/settings/password/ChooseLockSettingsHelper.java
@@ -250,12 +250,13 @@
             CharSequence message, Class<?> activityClass, boolean returnCredentials,
             boolean external, boolean hasChallenge, long challenge,
             int userId, @Nullable CharSequence alternateButton) {
+        final boolean frp = (userId == LockPatternUtils.USER_FRP);
         final Intent intent = new Intent();
         intent.putExtra(ConfirmDeviceCredentialBaseFragment.TITLE_TEXT, title);
         intent.putExtra(ConfirmDeviceCredentialBaseFragment.HEADER_TEXT, header);
         intent.putExtra(ConfirmDeviceCredentialBaseFragment.DETAILS_TEXT, message);
         intent.putExtra(ConfirmDeviceCredentialBaseFragment.ALLOW_FP_AUTHENTICATION, external);
-        intent.putExtra(ConfirmDeviceCredentialBaseFragment.DARK_THEME, external);
+        intent.putExtra(ConfirmDeviceCredentialBaseFragment.DARK_THEME, external && !frp);
         intent.putExtra(ConfirmDeviceCredentialBaseFragment.SHOW_CANCEL_BUTTON, external);
         intent.putExtra(ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED, external);
         intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS, returnCredentials);
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
index 2b2b38f..d2bd934 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
@@ -68,7 +68,7 @@
             LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
             layout.setFitsSystemWindows(false);
         }
-
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
         mIsKeyguardLocked = savedState == null
                 ? getSystemService(KeyguardManager.class).isKeyguardLocked()
                 : savedState.getBoolean(STATE_IS_KEYGUARD_LOCKED, false);
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
index 64f3a6f..a67184a 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
@@ -77,6 +77,9 @@
     protected static final int USER_TYPE_MANAGED_PROFILE = 2;
     protected static final int USER_TYPE_SECONDARY = 3;
 
+    /** Time we wait before clearing a wrong input attempt (e.g. pattern) and the error message. */
+    protected static final long CLEAR_WRONG_ATTEMPT_TIMEOUT_MS = 3000;
+
     private FingerprintUiHelper mFingerprintHelper;
     protected boolean mReturnCredentials = false;
     protected Button mCancelButton;
diff --git a/src/com/android/settings/password/ConfirmLockPassword.java b/src/com/android/settings/password/ConfirmLockPassword.java
index 853ab36..20182cb 100644
--- a/src/com/android/settings/password/ConfirmLockPassword.java
+++ b/src/com/android/settings/password/ConfirmLockPassword.java
@@ -54,16 +54,15 @@
 public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
 
     // The index of the array is isStrongAuth << 2 + isProfile << 1 + isAlpha.
-    // TODO(b/36511626): add back special strings for strong auth.
     private static final int[] DETAIL_TEXTS = new int[] {
         R.string.lockpassword_confirm_your_pin_generic,
         R.string.lockpassword_confirm_your_password_generic,
         R.string.lockpassword_confirm_your_pin_generic_profile,
         R.string.lockpassword_confirm_your_password_generic_profile,
-        R.string.lockpassword_confirm_your_pin_generic,
-        R.string.lockpassword_confirm_your_password_generic,
-        R.string.lockpassword_confirm_your_pin_generic_profile,
-        R.string.lockpassword_confirm_your_password_generic_profile,
+        R.string.lockpassword_strong_auth_required_device_pin,
+        R.string.lockpassword_strong_auth_required_device_password,
+        R.string.lockpassword_strong_auth_required_work_pin,
+        R.string.lockpassword_strong_auth_required_work_password,
     };
 
     public static class InternalActivity extends ConfirmLockPassword {
@@ -94,7 +93,6 @@
     public static class ConfirmLockPasswordFragment extends ConfirmDeviceCredentialBaseFragment
             implements OnClickListener, OnEditorActionListener,
             CredentialCheckResultTracker.Listener {
-        private static final long ERROR_MESSAGE_TIMEOUT = 3000;
         private static final String FRAGMENT_TAG_CHECK_LOCK_RESULT = "check_lock_result";
         private ImeAwareEditText mPasswordEntry;
         private TextViewInputDisabler mPasswordEntryInputDisabler;
@@ -109,7 +107,6 @@
         private boolean mUsingFingerprint = false;
         private AppearAnimationUtils mAppearAnimationUtils;
         private DisappearAnimationUtils mDisappearAnimationUtils;
-        private boolean mBlockImm;
 
         // required constructor for fragments
         public ConfirmLockPasswordFragment() {
@@ -199,11 +196,19 @@
         }
 
         private int getDefaultHeader() {
+            if (mFrp) {
+                return mIsAlpha ? R.string.lockpassword_confirm_your_password_header_frp
+                        : R.string.lockpassword_confirm_your_pin_header_frp;
+            }
             return mIsAlpha ? R.string.lockpassword_confirm_your_password_header
                     : R.string.lockpassword_confirm_your_pin_header;
         }
 
         private int getDefaultDetails() {
+            if (mFrp) {
+                return mIsAlpha ? R.string.lockpassword_confirm_your_password_details_frp
+                        : R.string.lockpassword_confirm_your_pin_details_frp;
+            }
             boolean isStrongAuthRequired = isStrongAuthRequired();
             boolean isProfile = UserManager.get(getActivity()).isManagedProfile(mEffectiveUserId);
             // Map boolean flags to an index by isStrongAuth << 2 + isProfile << 1 + isAlpha.
@@ -241,8 +246,8 @@
             mDetailsTextView.setAlpha(0f);
             mCancelButton.setAlpha(0f);
             mPasswordEntry.setAlpha(0f);
+            mErrorTextView.setAlpha(0f);
             mFingerprintIcon.setAlpha(0f);
-            mBlockImm = true;
         }
 
         private View[] getActiveViews() {
@@ -253,6 +258,7 @@
                 result.add(mCancelButton);
             }
             result.add(mPasswordEntry);
+            result.add(mErrorTextView);
             if (mFingerprintIcon.getVisibility() == View.VISIBLE) {
                 result.add(mFingerprintIcon);
             }
@@ -262,13 +268,7 @@
         @Override
         public void startEnterAnimation() {
             super.startEnterAnimation();
-            mAppearAnimationUtils.startAnimation(getActiveViews(), new Runnable() {
-                @Override
-                public void run() {
-                    mBlockImm = false;
-                    resetState();
-                }
-            });
+            mAppearAnimationUtils.startAnimation(getActiveViews(), this::updatePasswordEntry);
         }
 
         @Override
@@ -294,7 +294,7 @@
                 mCredentialCheckResultTracker.clearResult();
                 handleAttemptLockout(deadline);
             } else {
-                resetState();
+                updatePasswordEntry();
                 mErrorTextView.setText("");
                 updateErrorMessage(
                         mLockPatternUtils.getCurrentFailedPasswordAttempts(mEffectiveUserId));
@@ -312,36 +312,24 @@
             mUsingFingerprint = visible;
         }
 
-        private void resetState() {
-            if (mBlockImm) return;
-            mPasswordEntry.setEnabled(true);
-            mPasswordEntryInputDisabler.setInputEnabled(true);
-            if (shouldAutoShowSoftKeyboard()) {
+        private void updatePasswordEntry() {
+            final boolean isLockedOut =
+                    mLockPatternUtils.getLockoutAttemptDeadline(mEffectiveUserId) != 0;
+            mPasswordEntry.setEnabled(!isLockedOut);
+            mPasswordEntryInputDisabler.setInputEnabled(!isLockedOut);
+            if (isLockedOut || mUsingFingerprint) {
+                mImm.hideSoftInputFromWindow(mPasswordEntry.getWindowToken(), 0 /*flags*/);
+            } else {
                 mPasswordEntry.scheduleShowSoftInput();
             }
         }
 
-        private boolean shouldAutoShowSoftKeyboard() {
-            return mPasswordEntry.isEnabled() && !mUsingFingerprint;
-        }
-
         public void onWindowFocusChanged(boolean hasFocus) {
-            if (!hasFocus || mBlockImm) {
+            if (!hasFocus) {
                 return;
             }
             // Post to let window focus logic to finish to allow soft input show/hide properly.
-            mPasswordEntry.post(new Runnable() {
-                @Override
-                public void run() {
-                    if (shouldAutoShowSoftKeyboard()) {
-                        resetState();
-                        return;
-                    }
-
-                    mImm.hideSoftInputFromWindow(mPasswordEntry.getWindowToken(),
-                            InputMethodManager.HIDE_IMPLICIT_ONLY);
-                }
-            });
+            mPasswordEntry.post(this::updatePasswordEntry);
         }
 
         private void handleNext() {
@@ -396,7 +384,7 @@
                                 }
                             }
                             mCredentialCheckResultTracker.setResult(matched, intent, timeoutMs,
-                                    localUserId);
+                                    localEffectiveUserId);
                         }
             };
             mPendingLockCheck = (localEffectiveUserId == localUserId)
@@ -471,7 +459,7 @@
                             effectiveUserId, timeoutMs);
                     handleAttemptLockout(deadline);
                 } else {
-                    showError(getErrorMessage(), ERROR_MESSAGE_TIMEOUT);
+                    showError(getErrorMessage(), CLEAR_WRONG_ATTEMPT_TIMEOUT_MS);
                 }
                 if (newResult) {
                     reportFailedAttempt();
@@ -491,10 +479,8 @@
         }
 
         private void handleAttemptLockout(long elapsedRealtimeDeadline) {
-            long elapsedRealtime = SystemClock.elapsedRealtime();
-            mPasswordEntry.setEnabled(false);
             mCountdownTimer = new CountDownTimer(
-                    elapsedRealtimeDeadline - elapsedRealtime,
+                    elapsedRealtimeDeadline - SystemClock.elapsedRealtime(),
                     LockPatternUtils.FAILED_ATTEMPT_COUNTDOWN_INTERVAL_MS) {
 
                 @Override
@@ -507,12 +493,13 @@
 
                 @Override
                 public void onFinish() {
-                    resetState();
+                    updatePasswordEntry();
                     mErrorTextView.setText("");
                     updateErrorMessage(
                             mLockPatternUtils.getCurrentFailedPasswordAttempts(mEffectiveUserId));
                 }
             }.start();
+            updatePasswordEntry();
         }
 
         public void onClick(View v) {
diff --git a/src/com/android/settings/password/ConfirmLockPattern.java b/src/com/android/settings/password/ConfirmLockPattern.java
index 0c0025e..1e88150 100644
--- a/src/com/android/settings/password/ConfirmLockPattern.java
+++ b/src/com/android/settings/password/ConfirmLockPattern.java
@@ -79,9 +79,6 @@
     public static class ConfirmLockPatternFragment extends ConfirmDeviceCredentialBaseFragment
             implements AppearAnimationCreator<Object>, CredentialCheckResultTracker.Listener {
 
-        // how long we wait to clear a wrong pattern
-        private static final int WRONG_PATTERN_CLEAR_TIMEOUT_MS = 2000;
-
         private static final String FRAGMENT_TAG_CHECK_LOCK_RESULT = "check_lock_result";
 
         private LockPatternView mLockPatternView;
@@ -243,11 +240,18 @@
         }
 
         private int getDefaultDetails() {
-            // TODO(b/36511626): add back special strings for strong auth.
+            if (mFrp) {
+                return R.string.lockpassword_confirm_your_pattern_details_frp;
+            }
+            final boolean isStrongAuthRequired = isStrongAuthRequired();
             if (UserManager.get(getActivity()).isManagedProfile(mEffectiveUserId)) {
-                return R.string.lockpassword_confirm_your_pattern_generic_profile;
+                return isStrongAuthRequired
+                        ? R.string.lockpassword_strong_auth_required_work_pattern
+                        : R.string.lockpassword_confirm_your_pattern_generic_profile;
             } else {
-                return R.string.lockpassword_confirm_your_pattern_generic;
+                return isStrongAuthRequired
+                        ? R.string.lockpassword_strong_auth_required_device_pattern
+                        : R.string.lockpassword_confirm_your_pattern_generic;
             }
         }
 
@@ -292,7 +296,7 @@
                     if (mHeaderText != null) {
                         mHeaderTextView.setText(mHeaderText);
                     } else {
-                        mHeaderTextView.setText(R.string.lockpassword_confirm_your_pattern_header);
+                        mHeaderTextView.setText(getDefaultHeader());
                     }
                     if (mDetailsText != null) {
                         mDetailsTextView.setText(mDetailsText);
@@ -308,7 +312,8 @@
                     mLockPatternView.clearPattern();
                     break;
                 case NeedToUnlockWrong:
-                    mErrorTextView.setText(R.string.lockpattern_need_to_unlock_wrong);
+                    showError(R.string.lockpattern_need_to_unlock_wrong,
+                            CLEAR_WRONG_ATTEMPT_TIMEOUT_MS);
 
                     mLockPatternView.setDisplayMode(LockPatternView.DisplayMode.Wrong);
                     mLockPatternView.setEnabled(true);
@@ -327,6 +332,11 @@
             mHeaderTextView.announceForAccessibility(mHeaderTextView.getText());
         }
 
+        private int getDefaultHeader() {
+            return mFrp ? R.string.lockpassword_confirm_your_pattern_header_frp
+                    : R.string.lockpassword_confirm_your_pattern_header;
+        }
+
         private Runnable mClearPatternRunnable = new Runnable() {
             public void run() {
                 mLockPatternView.clearPattern();
@@ -337,7 +347,7 @@
         // already
         private void postClearPatternRunnable() {
             mLockPatternView.removeCallbacks(mClearPatternRunnable);
-            mLockPatternView.postDelayed(mClearPatternRunnable, WRONG_PATTERN_CLEAR_TIMEOUT_MS);
+            mLockPatternView.postDelayed(mClearPatternRunnable, CLEAR_WRONG_ATTEMPT_TIMEOUT_MS);
         }
 
         @Override
diff --git a/src/com/android/settings/password/OWNERS b/src/com/android/settings/password/OWNERS
new file mode 100644
index 0000000..cac6e3f
--- /dev/null
+++ b/src/com/android/settings/password/OWNERS
@@ -0,0 +1,7 @@
+# Default reviewers for this and subdirectories.
+jaggies@google.com
+kchyn@google.com
+paulcrowley@google.com
+rubinxu@google.com
+
+# Emergency approvers in case the above are not available
\ No newline at end of file
diff --git a/src/com/android/settings/password/SetupChooseLockPassword.java b/src/com/android/settings/password/SetupChooseLockPassword.java
index 2988f52..79cfef3 100644
--- a/src/com/android/settings/password/SetupChooseLockPassword.java
+++ b/src/com/android/settings/password/SetupChooseLockPassword.java
@@ -84,13 +84,6 @@
         @Override
         public void onViewCreated(View view, Bundle savedInstanceState) {
             super.onViewCreated(view, savedInstanceState);
-
-            if (mForFingerprint) {
-                mCancelButton.setVisibility(View.GONE);
-            } else {
-                mCancelButton.setText(R.string.skip_label);
-            }
-
             final Activity activity = getActivity();
             ChooseLockGenericController chooseLockGenericController =
                     new ChooseLockGenericController(activity, mUserId);
@@ -190,6 +183,12 @@
         @Override
         protected void updateUi() {
             super.updateUi();
+            if (mForFingerprint) {
+                mCancelButton.setVisibility(View.GONE);
+            } else {
+                mCancelButton.setText(R.string.skip_label);
+            }
+
             if (mOptionsButton != null) {
                 mOptionsButton.setVisibility(
                         mUiStage == Stage.Introduction ? View.VISIBLE : View.GONE);
diff --git a/src/com/android/settings/password/SetupSkipDialog.java b/src/com/android/settings/password/SetupSkipDialog.java
index 36646b7..adc645e 100644
--- a/src/com/android/settings/password/SetupSkipDialog.java
+++ b/src/com/android/settings/password/SetupSkipDialog.java
@@ -61,6 +61,7 @@
         return new AlertDialog.Builder(getContext())
                 .setPositiveButton(R.string.skip_anyway_button_label, this)
                 .setNegativeButton(R.string.go_back_button_label, this)
+                .setTitle(R.string.lock_screen_intro_skip_title)
                 .setMessage(args.getBoolean(ARG_FRP_SUPPORTED) ?
                         R.string.lock_screen_intro_skip_dialog_text_frp :
                         R.string.lock_screen_intro_skip_dialog_text);
diff --git a/src/com/android/settings/password/StorageManagerWrapper.java b/src/com/android/settings/password/StorageManagerWrapper.java
new file mode 100644
index 0000000..5adfaf2
--- /dev/null
+++ b/src/com/android/settings/password/StorageManagerWrapper.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.password;
+
+import android.os.storage.StorageManager;
+
+/**
+ * Wrapper class to allow Robolectric to shadow methods introduced in newer API
+ */
+public class StorageManagerWrapper {
+
+    public static boolean isFileEncryptedNativeOrEmulated() {
+        return StorageManager.isFileEncryptedNativeOrEmulated();
+    }
+}
diff --git a/src/com/android/settings/search/AccessibilityServiceResultLoader.java b/src/com/android/settings/search/AccessibilityServiceResultLoader.java
new file mode 100644
index 0000000..7ffbcfc
--- /dev/null
+++ b/src/com/android/settings/search/AccessibilityServiceResultLoader.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.search;
+
+import static com.android.settings.search.InstalledAppResultLoader.getWordDifference;
+
+import android.accessibilityservice.AccessibilityServiceInfo;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
+import android.graphics.drawable.Drawable;
+import android.support.annotation.VisibleForTesting;
+import android.support.v4.content.ContextCompat;
+import android.view.accessibility.AccessibilityManager;
+
+import com.android.settings.R;
+import com.android.settings.accessibility.AccessibilitySettings;
+import com.android.settings.dashboard.SiteMapManager;
+import com.android.settings.utils.AsyncLoader;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+public class AccessibilityServiceResultLoader extends AsyncLoader<Set<? extends SearchResult>> {
+
+    private static final int NAME_NO_MATCH = -1;
+
+    private List<String> mBreadcrumb;
+    private SiteMapManager mSiteMapManager;
+    @VisibleForTesting
+    final String mQuery;
+    private final AccessibilityManager mAccessibilityManager;
+    private final PackageManager mPackageManager;
+
+
+    public AccessibilityServiceResultLoader(Context context, String query,
+            SiteMapManager mapManager) {
+        super(context);
+        mSiteMapManager = mapManager;
+        mPackageManager = context.getPackageManager();
+        mAccessibilityManager =
+                (AccessibilityManager) context.getSystemService(Context.ACCESSIBILITY_SERVICE);
+        mQuery = query;
+    }
+
+    @Override
+    public Set<? extends SearchResult> loadInBackground() {
+        final Set<SearchResult> results = new HashSet<>();
+        final Context context = getContext();
+        final List<AccessibilityServiceInfo> services = mAccessibilityManager
+                .getInstalledAccessibilityServiceList();
+        final String screenTitle = context.getString(R.string.accessibility_settings);
+        for (AccessibilityServiceInfo service : services) {
+            if (service == null) {
+                continue;
+            }
+            final ResolveInfo resolveInfo = service.getResolveInfo();
+            if (service.getResolveInfo() == null) {
+                continue;
+            }
+            final ServiceInfo serviceInfo = resolveInfo.serviceInfo;
+            final CharSequence title = resolveInfo.loadLabel(mPackageManager);
+            final int wordDiff = getWordDifference(title.toString(), mQuery);
+            if (wordDiff == NAME_NO_MATCH) {
+                continue;
+            }
+            final Drawable icon;
+            if (resolveInfo.getIconResource() == 0) {
+                icon = ContextCompat.getDrawable(context, R.mipmap.ic_accessibility_generic);
+            } else {
+                icon = resolveInfo.loadIcon(mPackageManager);
+            }
+            final String componentName = new ComponentName(serviceInfo.packageName,
+                    serviceInfo.name).flattenToString();
+            final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(context,
+                    AccessibilitySettings.class.getName(), componentName, screenTitle);
+
+            results.add(new SearchResult.Builder()
+                    .setTitle(title)
+                    .addBreadcrumbs(getBreadCrumb())
+                    .setPayload(new ResultPayload(intent))
+                    .setRank(wordDiff)
+                    .setIcon(icon)
+                    .setStableId(Objects.hash(screenTitle, componentName))
+                    .build());
+        }
+        return results;
+    }
+
+    private List<String> getBreadCrumb() {
+        if (mBreadcrumb == null || mBreadcrumb.isEmpty()) {
+            final Context context = getContext();
+            mBreadcrumb = mSiteMapManager.buildBreadCrumb(
+                    context, AccessibilitySettings.class.getName(),
+                    context.getString(R.string.accessibility_settings));
+        }
+        return mBreadcrumb;
+    }
+
+    @Override
+    protected void onDiscardResult(Set<? extends SearchResult> result) {
+
+    }
+}
diff --git a/src/com/android/settings/search/BaseSearchIndexProvider.java b/src/com/android/settings/search/BaseSearchIndexProvider.java
index 239de15..0f02f49 100644
--- a/src/com/android/settings/search/BaseSearchIndexProvider.java
+++ b/src/com/android/settings/search/BaseSearchIndexProvider.java
@@ -27,7 +27,8 @@
 import android.util.Log;
 import android.util.Xml;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -63,11 +64,17 @@
             // Entire page should be suppressed, mark all keys from this page as non-indexable.
             return getNonIndexableKeysFromXml(context);
         }
-        final List<PreferenceController> controllers = getPreferenceControllers(context);
+        final List<AbstractPreferenceController> controllers = getPreferenceControllers(context);
         if (controllers != null && !controllers.isEmpty()) {
             final List<String> nonIndexableKeys = new ArrayList<>();
-            for (PreferenceController controller : controllers) {
-                controller.updateNonIndexableKeys(nonIndexableKeys);
+            for (AbstractPreferenceController controller : controllers) {
+                if (controller instanceof PreferenceControllerMixin) {
+                    ((PreferenceControllerMixin) controller)
+                            .updateNonIndexableKeys(nonIndexableKeys);
+                } else {
+                    throw new IllegalStateException(controller.getClass().getName()
+                            + " must implement " + PreferenceControllerMixin.class.getName());
+                }
             }
             return nonIndexableKeys;
         } else {
@@ -76,7 +83,7 @@
     }
 
     @Override
-    public List<PreferenceController> getPreferenceControllers(Context context) {
+    public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
         return null;
     }
 
diff --git a/src/com/android/settings/search/DatabaseIndexingManager.java b/src/com/android/settings/search/DatabaseIndexingManager.java
index d2b2d23..7f6f012 100644
--- a/src/com/android/settings/search/DatabaseIndexingManager.java
+++ b/src/com/android/settings/search/DatabaseIndexingManager.java
@@ -17,53 +17,6 @@
 
 package com.android.settings.search;
 
-import com.android.settings.R;
-
-import android.content.ComponentName;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.res.XmlResourceParser;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteException;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Build;
-import android.provider.SearchIndexableData;
-import android.provider.SearchIndexableResource;
-import android.provider.SearchIndexablesContract;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.VisibleForTesting;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.util.Pair;
-import android.util.Xml;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsActivity;
-import com.android.settings.core.PreferenceController;
-
-import com.android.settings.overlay.FeatureFactory;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE;
 import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_CLASS_NAME;
 import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_ENTRIES;
@@ -85,17 +38,22 @@
 import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_TARGET_CLASS;
 import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_TARGET_PACKAGE;
 import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_RESID;
-
-import static com.android.settings.search.DatabaseResultLoader.*;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_ID;
+import static com.android.settings.search.DatabaseResultLoader
+        .COLUMN_INDEX_INTENT_ACTION_TARGET_PACKAGE;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_KEY;
+import static com.android.settings.search.DatabaseResultLoader.SELECT_COLUMNS;
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.CLASS_NAME;
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_ENTRIES;
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS;
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_KEY_REF;
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_RANK;
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF;
-import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED;
+import static com.android.settings.search.IndexDatabaseHelper.IndexColumns
+        .DATA_SUMMARY_OFF_NORMALIZED;
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON;
-import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED;
+import static com.android.settings.search.IndexDatabaseHelper.IndexColumns
+        .DATA_SUMMARY_ON_NORMALIZED;
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_TITLE;
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED;
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DOCID;
@@ -111,6 +69,49 @@
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.USER_ID;
 import static com.android.settings.search.IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX;
 
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.res.XmlResourceParser;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteException;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Build;
+import android.provider.SearchIndexableData;
+import android.provider.SearchIndexableResource;
+import android.provider.SearchIndexablesContract;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.VisibleForTesting;
+import android.text.TextUtils;
+import android.util.ArraySet;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.util.Xml;
+
+import com.android.settings.SettingsActivity;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.overlay.FeatureFactory;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 /**
  * Consumes the SearchIndexableProvider content providers.
  * Updates the Resource, Raw Data and non-indexable data for Search.
@@ -118,6 +119,7 @@
  * TODO this class needs to be refactored by moving most of its methods into controllers
  */
 public class DatabaseIndexingManager {
+
     private static final String LOG_TAG = "DatabaseIndexingManager";
 
     private static final String METRICS_ACTION_SETTINGS_ASYNC_INDEX =
@@ -165,6 +167,7 @@
      * calls will only gather non-indexable keys.
      */
     public void performIndexing() {
+        final long startTime = System.currentTimeMillis();
         final Intent intent = new Intent(SearchIndexablesContract.PROVIDER_INTERFACE);
         final List<ResolveInfo> providers =
                 mContext.getPackageManager().queryIntentContentProviders(intent, 0);
@@ -191,15 +194,31 @@
             if (isFullIndex) {
                 addIndexablesFromRemoteProvider(packageName, authority);
             }
+            final long nonIndexableStartTime = System.currentTimeMillis();
             addNonIndexablesKeysFromRemoteProvider(packageName, authority);
+            if (SettingsSearchIndexablesProvider.DEBUG) {
+                final long nonIndextableTime = System.currentTimeMillis() - nonIndexableStartTime;
+                Log.d(LOG_TAG, "performIndexing update non-indexable for package " + packageName
+                        + " took time: " + nonIndextableTime);
+            }
         }
-
+        final long updateDatabaseStartTime = System.currentTimeMillis();
         updateDatabase(isFullIndex, localeStr);
+        if (SettingsSearchIndexablesProvider.DEBUG) {
+            final long updateDatabaseTime = System.currentTimeMillis() - updateDatabaseStartTime;
+            Log.d(LOG_TAG, "performIndexing updateDatabase took time: " + updateDatabaseTime);
+        }
 
         //TODO(63922686): Setting indexed should be a single method, not 3 separate setters.
         IndexDatabaseHelper.setLocaleIndexed(mContext, localeStr);
         IndexDatabaseHelper.setBuildIndexed(mContext, fingerprint);
         IndexDatabaseHelper.setProvidersIndexed(mContext, providerVersionedNames);
+
+        if (SettingsSearchIndexablesProvider.DEBUG) {
+            final long indexingTime = System.currentTimeMillis() - startTime;
+            Log.d(LOG_TAG, "performIndexing took time: " + indexingTime
+                    + "ms. Full index? " + isFullIndex);
+        }
     }
 
     /**
@@ -222,7 +241,7 @@
      * Finally, we record that the locale has been indexed.
      *
      * @param needsReindexing true the database needs to be rebuilt.
-     * @param localeStr the default locale for the device.
+     * @param localeStr       the default locale for the device.
      */
     @VisibleForTesting
     void updateDatabase(boolean needsReindexing, String localeStr) {
@@ -265,9 +284,9 @@
     /**
      * Inserts {@link SearchIndexableData} into the database.
      *
-     * @param database where the data will be inserted.
-     * @param localeStr is the locale of the data to be inserted.
-     * @param dataToUpdate is a {@link List} of the data to be inserted.
+     * @param database         where the data will be inserted.
+     * @param localeStr        is the locale of the data to be inserted.
+     * @param dataToUpdate     is a {@link List} of the data to be inserted.
      * @param nonIndexableKeys is a {@link Map} from Package Name to a {@link Set} of keys which
      *                         identify search results which should not be surfaced.
      */
@@ -295,7 +314,7 @@
      * All rows which are enabled but are now flagged with non-indexable keys will become disabled.
      * All rows which are disabled but no longer a non-indexable key will become enabled.
      *
-     * @param database The database to validate.
+     * @param database         The database to validate.
      * @param nonIndexableKeys A map between package name and the set of non-indexable keys for it.
      */
     @VisibleForTesting
@@ -385,7 +404,8 @@
             String authority) {
         final List<String> keys =
                 getNonIndexablesKeysFromRemoteProvider(packageName, authority);
-        addNonIndexableKeys(packageName, new HashSet<>(keys));
+
+        addNonIndexableKeys(packageName, keys);
     }
 
     private List<String> getNonIndexablesKeysFromRemoteProvider(String packageName,
@@ -442,9 +462,11 @@
         }
     }
 
-    public void addNonIndexableKeys(String authority, Set<String> keys) {
+    public void addNonIndexableKeys(String authority, List<String> keys) {
         synchronized (mDataToProcess) {
-            mDataToProcess.nonIndexableKeys.put(authority, keys);
+            if (keys != null && !keys.isEmpty()) {
+                mDataToProcess.nonIndexableKeys.put(authority, new ArraySet<>(keys));
+            }
         }
     }
 
@@ -734,7 +756,7 @@
             final String intentTargetPackage = sir.intentTargetPackage;
             final String intentTargetClass = sir.intentTargetClass;
 
-            Map<String, PreferenceController> controllerUriMap = null;
+            Map<String, PreferenceControllerMixin> controllerUriMap = null;
 
             if (fragmentName != null) {
                 controllerUriMap = DatabaseIndexingUtils
@@ -777,7 +799,7 @@
 
                 title = XmlParserUtils.getDataTitle(context, attrs);
                 key = XmlParserUtils.getDataKey(context, attrs);
-                enabled = ! nonIndexableKeys.contains(key);
+                enabled = !nonIndexableKeys.contains(key);
                 keywords = XmlParserUtils.getDataKeywords(context, attrs);
                 iconResId = XmlParserUtils.getDataIcon(context, attrs);
 
diff --git a/src/com/android/settings/search/DatabaseIndexingUtils.java b/src/com/android/settings/search/DatabaseIndexingUtils.java
index 40ba7ee..938ddb7 100644
--- a/src/com/android/settings/search/DatabaseIndexingUtils.java
+++ b/src/com/android/settings/search/DatabaseIndexingUtils.java
@@ -33,7 +33,8 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.lang.reflect.Field;
 import java.text.Normalizer;
@@ -75,12 +76,12 @@
 
     /**
      * @param className which wil provide the map between from {@link Uri}s to
-     * {@link PreferenceController}
+     * {@link PreferenceControllerMixin}
      * @param context
-     * @return A map between {@link Uri}s and {@link PreferenceController}s to get the payload
+     * @return A map between {@link Uri}s and {@link PreferenceControllerMixin}s to get the payload
      * types for Settings.
      */
-    public static Map<String, PreferenceController> getPreferenceControllerUriMap(
+    public static Map<String, PreferenceControllerMixin> getPreferenceControllerUriMap(
             String className, Context context) {
         if (context == null) {
             return null;
@@ -98,36 +99,41 @@
         // SEARCH_INDEX_DATA_PROVIDER field
         final Indexable.SearchIndexProvider provider = getSearchIndexProvider(clazz);
 
-        List<PreferenceController> controllers =
+        List<AbstractPreferenceController> controllers =
                 provider.getPreferenceControllers(context);
 
         if (controllers == null ) {
             return null;
         }
 
-        ArrayMap<String, PreferenceController> map = new ArrayMap<>();
+        ArrayMap<String, PreferenceControllerMixin> map = new ArrayMap<>();
 
-        for (PreferenceController controller : controllers) {
-            map.put(controller.getPreferenceKey(), controller);
+        for (AbstractPreferenceController controller : controllers) {
+            if (controller instanceof PreferenceControllerMixin) {
+                map.put(controller.getPreferenceKey(), (PreferenceControllerMixin) controller);
+            } else {
+                throw new IllegalStateException(controller.getClass().getName()
+                        + " must implement " + PreferenceControllerMixin.class.getName());
+            }
         }
 
         return map;
     }
 
     /**
-     * @param uriMap Map between the {@link PreferenceController} keys
+     * @param uriMap Map between the {@link PreferenceControllerMixin} keys
      *               and the controllers themselves.
      * @param key The look-up key
-     * @return The Payload from the {@link PreferenceController} specified by the key, if it exists.
-     * Otherwise null.
+     * @return The Payload from the {@link PreferenceControllerMixin} specified by the key,
+     * if it exists. Otherwise null.
      */
-    public static ResultPayload getPayloadFromUriMap(Map<String, PreferenceController> uriMap,
+    public static ResultPayload getPayloadFromUriMap(Map<String, PreferenceControllerMixin> uriMap,
             String key) {
         if (uriMap == null) {
             return null;
         }
 
-        PreferenceController controller = uriMap.get(key);
+        PreferenceControllerMixin controller = uriMap.get(key);
         if (controller == null) {
             return null;
         }
diff --git a/src/com/android/settings/search/DatabaseResultLoader.java b/src/com/android/settings/search/DatabaseResultLoader.java
index 73b383b..7815a45 100644
--- a/src/com/android/settings/search/DatabaseResultLoader.java
+++ b/src/com/android/settings/search/DatabaseResultLoader.java
@@ -17,6 +17,9 @@
 
 package com.android.settings.search;
 
+import static com.android.settings.search.IndexDatabaseHelper.IndexColumns;
+import static com.android.settings.search.IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX;
+
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
@@ -28,9 +31,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import static com.android.settings.search.IndexDatabaseHelper.IndexColumns;
-import static com.android.settings.search.IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX;
-
 /**
  * AsyncTask to retrieve Settings, First party app and any intent based results.
  */
@@ -191,10 +191,12 @@
      * @return A set of the matching results.
      */
     private Set<SearchResult> query(String whereClause, String[] selection, int baseRank) {
-        SQLiteDatabase database = IndexDatabaseHelper.getInstance(mContext).getReadableDatabase();
-        final Cursor resultCursor = database.query(TABLE_PREFS_INDEX, SELECT_COLUMNS, whereClause,
-                selection, null, null, null);
-        return mConverter.convertCursor(mSiteMapManager, resultCursor, baseRank);
+        final SQLiteDatabase database =
+                IndexDatabaseHelper.getInstance(mContext).getReadableDatabase();
+        try (Cursor resultCursor = database.query(TABLE_PREFS_INDEX, SELECT_COLUMNS, whereClause,
+                selection, null, null, null)) {
+            return mConverter.convertCursor(mSiteMapManager, resultCursor, baseRank);
+        }
     }
 
     /**
diff --git a/src/com/android/settings/search/DynamicIndexableContentMonitor.java b/src/com/android/settings/search/DynamicIndexableContentMonitor.java
deleted file mode 100644
index 0758387..0000000
--- a/src/com/android/settings/search/DynamicIndexableContentMonitor.java
+++ /dev/null
@@ -1,489 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.search;
-
-import android.accessibilityservice.AccessibilityService;
-import android.accessibilityservice.AccessibilityServiceInfo;
-import android.app.Activity;
-import android.app.LoaderManager;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.Loader;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-import android.database.ContentObserver;
-import android.hardware.input.InputManager;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.print.PrintManager;
-import android.print.PrintServicesLoader;
-import android.printservice.PrintServiceInfo;
-import android.provider.Settings;
-import android.provider.UserDictionary;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
-import android.util.Log;
-import android.view.accessibility.AccessibilityManager;
-import android.view.inputmethod.InputMethod;
-import android.view.inputmethod.InputMethodInfo;
-import android.view.inputmethod.InputMethodManager;
-
-import com.android.internal.content.PackageMonitor;
-import com.android.settings.accessibility.AccessibilitySettings;
-import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment;
-import com.android.settings.inputmethod.PhysicalKeyboardFragment;
-import com.android.settings.inputmethod.VirtualKeyboardFragment;
-import com.android.settings.language.LanguageAndInputSettings;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.print.PrintSettingsFragment;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public final class DynamicIndexableContentMonitor implements
-        LoaderManager.LoaderCallbacks<List<PrintServiceInfo>> {
-    // Shorten the class name because log TAG can be at most 23 chars.
-    private static final String TAG = "DynamicContentMonitor";
-
-    private static final long DELAY_PROCESS_PACKAGE_CHANGE = 2000;
-    // A PackageMonitor shared among Settings activities.
-    private static final PackageChangeMonitor PACKAGE_CHANGE_MONITOR = new PackageChangeMonitor();
-
-    // Null if not initialized.
-    @Nullable private DatabaseIndexingManager mIndexManager;
-    private Context mContext;
-    private boolean mHasFeaturePrinting;
-
-    @VisibleForTesting
-    static Intent getAccessibilityServiceIntent(String packageName) {
-        final Intent intent = new Intent(AccessibilityService.SERVICE_INTERFACE);
-        intent.setPackage(packageName);
-        return intent;
-    }
-
-    @VisibleForTesting
-    static Intent getIMEServiceIntent(String packageName) {
-        final Intent intent = new Intent(InputMethod.SERVICE_INTERFACE);
-        intent.setPackage(packageName);
-        return intent;
-    }
-
-    @VisibleForTesting
-    static void resetForTesting() {
-        InputDevicesMonitor.getInstance().resetForTesting();
-        AccessibilityServicesMonitor.getInstance().resetForTesting();
-        InputMethodServicesMonitor.getInstance().resetForTesting();
-    }
-
-    /**
-     * This instance holds a set of content monitor singleton objects.
-     *
-     * This object is created every time a sub-settings that extends {@code SettingsActivity}
-     * is created.
-     */
-    public DynamicIndexableContentMonitor() {}
-
-    /**
-     * Creates and initializes a set of content monitor singleton objects if not yet exist.
-     * Also starts loading the list of print services.
-     * <code>mIndex</code> has non-null value after successfully initialized.
-     *
-     * @param activity used to get {@link LoaderManager}.
-     * @param loaderId id for loading print services.
-     */
-    public void register(Activity activity, int loaderId) {
-        final boolean isUserUnlocked = activity
-                .getSystemService(UserManager.class)
-                .isUserUnlocked();
-        register(activity, loaderId, FeatureFactory.getFactory(activity)
-                        .getSearchFeatureProvider().getIndexingManager(activity), isUserUnlocked);
-    }
-
-    /**
-     * For testing to inject {@link DatabaseIndexingManager} object.
-     * Also because currently Robolectric doesn't support API 24, we can not test code that calls
-     * {@link UserManager#isUserUnlocked()}.
-     */
-    @VisibleForTesting
-    void register(Activity activity, int loaderId, DatabaseIndexingManager indexManager,
-                  boolean isUserUnlocked) {
-        if (!isUserUnlocked) {
-            Log.w(TAG, "Skipping content monitoring because user is locked");
-            return;
-        }
-        final Context context = activity.getApplicationContext();
-        mContext = context;
-        mIndexManager = indexManager;
-
-        PACKAGE_CHANGE_MONITOR.registerMonitor(context);
-        mHasFeaturePrinting = context.getPackageManager()
-                .hasSystemFeature(PackageManager.FEATURE_PRINTING);
-        if (mHasFeaturePrinting) {
-            activity.getLoaderManager().initLoader(loaderId, null /* args */, this /* callbacks */);
-        }
-
-        // Watch for input device changes.
-        InputDevicesMonitor.getInstance().initialize(context, mIndexManager);
-
-        // Start tracking packages.
-        AccessibilityServicesMonitor.getInstance().initialize(context, mIndexManager);
-        InputMethodServicesMonitor.getInstance().initialize(context, mIndexManager);
-    }
-
-    /**
-     * Aborts loading the list of print services.
-     * Note that a set of content monitor singletons keep alive while Settings app is running.
-     *
-     * @param activity user to get {@link LoaderManager}.
-     * @param loaderId id for loading print services.
-     */
-    public void unregister(Activity activity, int loaderId) {
-        if (mIndexManager == null) return;
-
-        PACKAGE_CHANGE_MONITOR.unregisterMonitor();
-        if (mHasFeaturePrinting) {
-            activity.getLoaderManager().destroyLoader(loaderId);
-        }
-    }
-
-    @Override
-    public Loader<List<PrintServiceInfo>> onCreateLoader(int id, Bundle args) {
-        return new PrintServicesLoader(
-                (PrintManager) mContext.getSystemService(Context.PRINT_SERVICE), mContext,
-                PrintManager.ALL_SERVICES);
-    }
-
-    @Override
-    public void onLoadFinished(Loader<List<PrintServiceInfo>> loader,
-            List<PrintServiceInfo> services) {
-        mIndexManager.updateFromClassNameResource(PrintSettingsFragment.class.getName(),
-                true /* includeInSearchResults */);
-    }
-
-    @Override
-    public void onLoaderReset(Loader<List<PrintServiceInfo>> loader) {
-        // nothing to do
-    }
-
-    // A singleton that monitors input devices changes and updates indexes of physical keyboards.
-    private static class InputDevicesMonitor implements InputManager.InputDeviceListener {
-
-        // Null if not initialized.
-        @Nullable private DatabaseIndexingManager mIndexManager;
-        private InputManager mInputManager;
-
-        private InputDevicesMonitor() {}
-
-        private static class SingletonHolder {
-            private static final InputDevicesMonitor INSTANCE = new InputDevicesMonitor();
-        }
-
-        static InputDevicesMonitor getInstance() {
-            return SingletonHolder.INSTANCE;
-        }
-
-        @VisibleForTesting
-        synchronized void resetForTesting() {
-            if (mIndexManager != null) {
-                mInputManager.unregisterInputDeviceListener(this /* listener */);
-            }
-            mIndexManager = null;
-        }
-
-        synchronized void initialize(Context context, DatabaseIndexingManager indexManager) {
-            if (mIndexManager != null) return;
-            mIndexManager = indexManager;
-            mInputManager = (InputManager) context.getSystemService(Context.INPUT_SERVICE);
-            buildIndex();
-
-            // Watch for input device changes.
-            mInputManager.registerInputDeviceListener(this /* listener */, null /* handler */);
-        }
-
-        private void buildIndex() {
-            mIndexManager.updateFromClassNameResource(PhysicalKeyboardFragment.class.getName(),
-                    true /* includeInSearchResults */);
-        }
-
-        @Override
-        public void onInputDeviceAdded(int deviceId) {
-            buildIndex();
-        }
-
-        @Override
-        public void onInputDeviceRemoved(int deviceId) {
-            buildIndex();
-        }
-
-        @Override
-        public void onInputDeviceChanged(int deviceId) {
-            buildIndex();
-        }
-    }
-
-    // A singleton that monitors package installing, uninstalling, enabling, and disabling.
-    // Then updates indexes of accessibility services and input methods.
-    private static class PackageChangeMonitor extends PackageMonitor {
-        private static final String TAG = PackageChangeMonitor.class.getSimpleName();
-
-        // Null if not initialized. Guarded by {@link #mLock}.
-        @Nullable private PackageManager mPackageManager;
-        private final Object mLock = new Object();
-
-        public void registerMonitor(Context context) {
-            synchronized (mLock) {
-                if (mPackageManager != null) {
-                    return;
-                }
-                mPackageManager = context.getPackageManager();
-
-                // Start tracking packages. Use background thread for monitoring. Note that no need
-                // to unregister this monitor. This should be alive while Settings app is running.
-                super.register(context, null /* thread */, UserHandle.CURRENT, false);
-            }
-        }
-
-        public void unregisterMonitor() {
-            synchronized (mLock) {
-                if (mPackageManager == null) {
-                    return;
-                }
-                super.unregister();
-                mPackageManager = null;
-            }
-        }
-
-        // Covers installed, appeared external storage with the package, upgraded.
-        @Override
-        public void onPackageAppeared(String packageName, int reason) {
-            postPackageAvailable(packageName);
-        }
-
-        // Covers uninstalled, removed external storage with the package.
-        @Override
-        public void onPackageDisappeared(String packageName, int reason) {
-            postPackageUnavailable(packageName);
-        }
-
-        // Covers enabled, disabled.
-        @Override
-        public void onPackageModified(String packageName) {
-            try {
-                final int state = mPackageManager.getApplicationEnabledSetting(packageName);
-                if (state == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT
-                        || state == PackageManager.COMPONENT_ENABLED_STATE_ENABLED) {
-                    postPackageAvailable(packageName);
-                } else {
-                    postPackageUnavailable(packageName);
-                }
-            } catch (IllegalArgumentException e) {
-                Log.e(TAG, "Package does not exist: " + packageName, e);
-            }
-        }
-
-        private void postPackageAvailable(final String packageName) {
-            getRegisteredHandler().postDelayed(() -> {
-                AccessibilityServicesMonitor.getInstance().onPackageAvailable(packageName);
-                InputMethodServicesMonitor.getInstance().onPackageAvailable(packageName);
-            }, DELAY_PROCESS_PACKAGE_CHANGE);
-        }
-
-        private void postPackageUnavailable(final String packageName) {
-            getRegisteredHandler().postDelayed(() -> {
-                AccessibilityServicesMonitor.getInstance().onPackageUnavailable(packageName);
-                InputMethodServicesMonitor.getInstance().onPackageUnavailable(packageName);
-            }, DELAY_PROCESS_PACKAGE_CHANGE);
-        }
-    }
-
-    // A singleton that holds list of available accessibility services and updates search index.
-    private static class AccessibilityServicesMonitor {
-
-        // Null if not initialized.
-        @Nullable private DatabaseIndexingManager mIndexManager;
-        private PackageManager mPackageManager;
-        private final List<String> mAccessibilityServices = new ArrayList<>();
-
-        private AccessibilityServicesMonitor() {}
-
-        private static class SingletonHolder {
-            private static final AccessibilityServicesMonitor INSTANCE =
-                    new AccessibilityServicesMonitor();
-        }
-
-        static AccessibilityServicesMonitor getInstance() {
-            return SingletonHolder.INSTANCE;
-        }
-
-        @VisibleForTesting
-        synchronized void resetForTesting() {
-            mIndexManager = null;
-        }
-
-        synchronized void initialize(Context context, DatabaseIndexingManager index) {
-            if (mIndexManager != null) return;
-            mIndexManager = index;
-            mPackageManager = context.getPackageManager();
-            mAccessibilityServices.clear();
-            buildIndex();
-
-            // Cache accessibility service packages to know when they go away.
-            AccessibilityManager accessibilityManager = (AccessibilityManager) context
-                    .getSystemService(Context.ACCESSIBILITY_SERVICE);
-            for (final AccessibilityServiceInfo accessibilityService
-                    : accessibilityManager.getInstalledAccessibilityServiceList()) {
-                ResolveInfo resolveInfo = accessibilityService.getResolveInfo();
-                if (resolveInfo != null && resolveInfo.serviceInfo != null) {
-                    mAccessibilityServices.add(resolveInfo.serviceInfo.packageName);
-                }
-            }
-        }
-
-        private void buildIndex() {
-            mIndexManager.updateFromClassNameResource(AccessibilitySettings.class.getName(),
-                    true /* includeInSearchResults */);
-        }
-
-        synchronized void onPackageAvailable(String packageName) {
-            if (mIndexManager == null) return;
-            if (mAccessibilityServices.contains(packageName)) return;
-
-            final Intent intent = getAccessibilityServiceIntent(packageName);
-            final List<ResolveInfo> services = mPackageManager
-                    .queryIntentServices(intent, 0 /* flags */);
-            if (services == null || services.isEmpty()) return;
-            mAccessibilityServices.add(packageName);
-            buildIndex();
-        }
-
-        synchronized void onPackageUnavailable(String packageName) {
-            if (mIndexManager == null) return;
-            if (!mAccessibilityServices.remove(packageName)) return;
-            buildIndex();
-        }
-    }
-
-    // A singleton that holds list of available input methods and updates search index.
-    // Also it monitors user dictionary changes and updates search index.
-    private static class InputMethodServicesMonitor extends ContentObserver {
-
-        private static final Uri ENABLED_INPUT_METHODS_CONTENT_URI =
-                Settings.Secure.getUriFor(Settings.Secure.ENABLED_INPUT_METHODS);
-
-        // Null if not initialized.
-        @Nullable private DatabaseIndexingManager mIndexManager;
-        private PackageManager mPackageManager;
-        private ContentResolver mContentResolver;
-        private final List<String> mInputMethodServices = new ArrayList<>();
-
-        private InputMethodServicesMonitor() {
-            // No need for handler because {@link #onChange(boolean,Uri)} is short and quick.
-            super(null /* handler */);
-        }
-
-        private static class SingletonHolder {
-            private static final InputMethodServicesMonitor INSTANCE =
-                    new InputMethodServicesMonitor();
-        }
-
-        static InputMethodServicesMonitor getInstance() {
-            return SingletonHolder.INSTANCE;
-        }
-
-        @VisibleForTesting
-        synchronized void resetForTesting() {
-            if (mIndexManager != null) {
-                mContentResolver.unregisterContentObserver(this /* observer */);
-            }
-            mIndexManager = null;
-        }
-
-        synchronized void initialize(Context context, DatabaseIndexingManager indexManager) {
-            final boolean hasFeatureIme = context.getPackageManager()
-                    .hasSystemFeature(PackageManager.FEATURE_INPUT_METHODS);
-            if (!hasFeatureIme) return;
-
-            if (mIndexManager != null) return;
-            mIndexManager = indexManager;
-            mPackageManager = context.getPackageManager();
-            mContentResolver = context.getContentResolver();
-            mInputMethodServices.clear();
-            // Build index of {@link UserDictionary}.
-            buildIndex(LanguageAndInputSettings.class);
-            // Build index of IMEs.
-            buildIndex(VirtualKeyboardFragment.class);
-            buildIndex(AvailableVirtualKeyboardFragment.class);
-
-            // Cache IME service packages to know when they go away.
-            final InputMethodManager inputMethodManager = (InputMethodManager) context
-                    .getSystemService(Context.INPUT_METHOD_SERVICE);
-            for (final InputMethodInfo inputMethod : inputMethodManager.getInputMethodList()) {
-                ServiceInfo serviceInfo = inputMethod.getServiceInfo();
-                if (serviceInfo != null) {
-                    mInputMethodServices.add(serviceInfo.packageName);
-                }
-            }
-
-            // TODO: Implements by JobScheduler with TriggerContentUri parameters.
-            // Watch for related content URIs.
-            mContentResolver.registerContentObserver(UserDictionary.Words.CONTENT_URI,
-                    true /* notifyForDescendants */, this /* observer */);
-            // Watch for changing enabled IMEs.
-            mContentResolver.registerContentObserver(ENABLED_INPUT_METHODS_CONTENT_URI,
-                    false /* notifyForDescendants */, this /* observer */);
-        }
-
-        private void buildIndex(Class<?> indexClass) {
-            mIndexManager.updateFromClassNameResource(indexClass.getName(),
-                    true /* includeInSearchResults */);
-        }
-
-        synchronized void onPackageAvailable(String packageName) {
-            if (mIndexManager == null) return;
-            if (mInputMethodServices.contains(packageName)) return;
-
-            final Intent intent = getIMEServiceIntent(packageName);
-            final List<ResolveInfo> services = mPackageManager
-                    .queryIntentServices(intent, 0 /* flags */);
-            if (services == null || services.isEmpty()) return;
-            mInputMethodServices.add(packageName);
-            buildIndex(VirtualKeyboardFragment.class);
-            buildIndex(AvailableVirtualKeyboardFragment.class);
-        }
-
-        synchronized void onPackageUnavailable(String packageName) {
-            if (mIndexManager == null) return;
-            if (!mInputMethodServices.remove(packageName)) return;
-            buildIndex(VirtualKeyboardFragment.class);
-            buildIndex(AvailableVirtualKeyboardFragment.class);
-        }
-
-        @Override
-        public void onChange(boolean selfChange, Uri uri) {
-            if (ENABLED_INPUT_METHODS_CONTENT_URI.equals(uri)) {
-                buildIndex(VirtualKeyboardFragment.class);
-                buildIndex(AvailableVirtualKeyboardFragment.class);
-            } else if (UserDictionary.Words.CONTENT_URI.equals(uri)) {
-                buildIndex(LanguageAndInputSettings.class);
-            }
-        }
-    }
-}
diff --git a/src/com/android/settings/search/Indexable.java b/src/com/android/settings/search/Indexable.java
index 2ec4ac0..505f41b 100644
--- a/src/com/android/settings/search/Indexable.java
+++ b/src/com/android/settings/search/Indexable.java
@@ -18,7 +18,8 @@
 
 import android.content.Context;
 import android.provider.SearchIndexableResource;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.List;
 
@@ -69,8 +70,9 @@
 
         /**
          * @param context
-         * @return a list of {@link PreferenceController} for ResultPayload data during Indexing.
+         * @return a list of {@link AbstractPreferenceController} for ResultPayload data during
+         * Indexing.
          */
-        List<PreferenceController> getPreferenceControllers(Context context);
+        List<AbstractPreferenceController> getPreferenceControllers(Context context);
     }
 }
diff --git a/src/com/android/settings/search/InputDeviceResultLoader.java b/src/com/android/settings/search/InputDeviceResultLoader.java
new file mode 100644
index 0000000..61e1ad1
--- /dev/null
+++ b/src/com/android/settings/search/InputDeviceResultLoader.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.search;
+
+import static android.content.Context.INPUT_METHOD_SERVICE;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ServiceInfo;
+import android.hardware.input.InputManager;
+import android.hardware.input.KeyboardLayout;
+import android.support.annotation.VisibleForTesting;
+import android.view.InputDevice;
+import android.view.inputmethod.InputMethodInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.view.inputmethod.InputMethodSubtype;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.SiteMapManager;
+import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment;
+import com.android.settings.inputmethod.PhysicalKeyboardFragment;
+import com.android.settings.utils.AsyncLoader;
+import com.android.settingslib.inputmethod.InputMethodAndSubtypeUtil;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+/**
+ * Search result for input devices (physical/virtual keyboard, game controllers, etc)
+ */
+public class InputDeviceResultLoader extends AsyncLoader<Set<? extends SearchResult>> {
+    private static final int NAME_NO_MATCH = -1;
+
+    @VisibleForTesting
+    static final String PHYSICAL_KEYBOARD_FRAGMENT = PhysicalKeyboardFragment.class.getName();
+    @VisibleForTesting
+    static final String VIRTUAL_KEYBOARD_FRAGMENT =
+            AvailableVirtualKeyboardFragment.class.getName();
+
+    private final SiteMapManager mSiteMapManager;
+    private final InputManager mInputManager;
+    private final InputMethodManager mImm;
+    private final PackageManager mPackageManager;
+    @VisibleForTesting
+    final String mQuery;
+
+    private List<String> mPhysicalKeyboardBreadcrumb;
+    private List<String> mVirtualKeyboardBreadcrumb;
+
+    public InputDeviceResultLoader(Context context, String query, SiteMapManager mapManager) {
+        super(context);
+        mQuery = query;
+        mSiteMapManager = mapManager;
+        mInputManager = (InputManager) context.getSystemService(Context.INPUT_SERVICE);
+        mImm = (InputMethodManager) context.getSystemService(INPUT_METHOD_SERVICE);
+        mPackageManager = context.getPackageManager();
+    }
+
+    @Override
+    protected void onDiscardResult(Set<? extends SearchResult> result) {
+    }
+
+    @Override
+    public Set<? extends SearchResult> loadInBackground() {
+        final Set<SearchResult> results = new HashSet<>();
+        results.addAll(buildPhysicalKeyboardSearchResults());
+        results.addAll(buildVirtualKeyboardSearchResults());
+        return results;
+    }
+
+    private Set<SearchResult> buildPhysicalKeyboardSearchResults() {
+        final Set<SearchResult> results = new HashSet<>();
+        final Context context = getContext();
+        final String screenTitle = context.getString(R.string.physical_keyboard_title);
+
+        for (final InputDevice device : getPhysicalFullKeyboards()) {
+            final String deviceName = device.getName();
+            final int wordDiff = InstalledAppResultLoader.getWordDifference(deviceName, mQuery);
+            if (wordDiff == NAME_NO_MATCH) {
+                continue;
+            }
+            final String keyboardLayoutDescriptor = mInputManager
+                    .getCurrentKeyboardLayoutForInputDevice(device.getIdentifier());
+            final KeyboardLayout keyboardLayout = (keyboardLayoutDescriptor != null)
+                    ? mInputManager.getKeyboardLayout(keyboardLayoutDescriptor) : null;
+            final String summary = (keyboardLayout != null)
+                    ? keyboardLayout.toString()
+                    : context.getString(R.string.keyboard_layout_default_label);
+            final String key = deviceName;
+
+            final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(context,
+                    PHYSICAL_KEYBOARD_FRAGMENT, key, screenTitle);
+            results.add(new SearchResult.Builder()
+                    .setTitle(deviceName)
+                    .setPayload(new ResultPayload(intent))
+                    .setStableId(Objects.hash(PHYSICAL_KEYBOARD_FRAGMENT, key))
+                    .setSummary(summary)
+                    .setRank(wordDiff)
+                    .addBreadcrumbs(getPhysicalKeyboardBreadCrumb())
+                    .build());
+        }
+        return results;
+    }
+
+    private Set<SearchResult> buildVirtualKeyboardSearchResults() {
+        final Set<SearchResult> results = new HashSet<>();
+        final Context context = getContext();
+        final String screenTitle = context.getString(R.string.add_virtual_keyboard);
+        final List<InputMethodInfo> inputMethods = mImm.getInputMethodList();
+        for (InputMethodInfo info : inputMethods) {
+            final String title = info.loadLabel(mPackageManager).toString();
+            final String summary = InputMethodAndSubtypeUtil
+                    .getSubtypeLocaleNameListAsSentence(getAllSubtypesOf(info), context, info);
+            int wordDiff = InstalledAppResultLoader.getWordDifference(title, mQuery);
+            if (wordDiff == NAME_NO_MATCH) {
+                wordDiff = InstalledAppResultLoader.getWordDifference(summary, mQuery);
+            }
+            if (wordDiff == NAME_NO_MATCH) {
+                continue;
+            }
+            final ServiceInfo serviceInfo = info.getServiceInfo();
+            final String key = new ComponentName(serviceInfo.packageName, serviceInfo.name)
+                    .flattenToString();
+            final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(context,
+                    VIRTUAL_KEYBOARD_FRAGMENT, key, screenTitle);
+            results.add(new SearchResult.Builder()
+                    .setTitle(title)
+                    .setSummary(summary)
+                    .setRank(wordDiff)
+                    .setStableId(Objects.hash(VIRTUAL_KEYBOARD_FRAGMENT, key))
+                    .addBreadcrumbs(getVirtualKeyboardBreadCrumb())
+                    .setPayload(new ResultPayload(intent))
+                    .build());
+        }
+        return results;
+    }
+
+    private List<String> getPhysicalKeyboardBreadCrumb() {
+        if (mPhysicalKeyboardBreadcrumb == null || mPhysicalKeyboardBreadcrumb.isEmpty()) {
+            final Context context = getContext();
+            mPhysicalKeyboardBreadcrumb = mSiteMapManager.buildBreadCrumb(
+                    context, PHYSICAL_KEYBOARD_FRAGMENT,
+                    context.getString(R.string.physical_keyboard_title));
+        }
+        return mPhysicalKeyboardBreadcrumb;
+    }
+
+
+    private List<String> getVirtualKeyboardBreadCrumb() {
+        if (mVirtualKeyboardBreadcrumb == null || mVirtualKeyboardBreadcrumb.isEmpty()) {
+            final Context context = getContext();
+            mVirtualKeyboardBreadcrumb = mSiteMapManager.buildBreadCrumb(
+                    context, VIRTUAL_KEYBOARD_FRAGMENT,
+                    context.getString(R.string.add_virtual_keyboard));
+        }
+        return mVirtualKeyboardBreadcrumb;
+    }
+
+    private List<InputDevice> getPhysicalFullKeyboards() {
+        final List<InputDevice> keyboards = new ArrayList<>();
+        final int[] deviceIds = InputDevice.getDeviceIds();
+        if (deviceIds != null) {
+            for (int deviceId : deviceIds) {
+                final InputDevice device = InputDevice.getDevice(deviceId);
+                if (device != null && !device.isVirtual() && device.isFullKeyboard()) {
+                    keyboards.add(device);
+                }
+            }
+        }
+        return keyboards;
+    }
+
+    private static List<InputMethodSubtype> getAllSubtypesOf(final InputMethodInfo imi) {
+        final int subtypeCount = imi.getSubtypeCount();
+        final List<InputMethodSubtype> allSubtypes = new ArrayList<>(subtypeCount);
+        for (int index = 0; index < subtypeCount; index++) {
+            allSubtypes.add(imi.getSubtypeAt(index));
+        }
+        return allSubtypes;
+    }
+}
diff --git a/src/com/android/settings/search/InstalledAppResultLoader.java b/src/com/android/settings/search/InstalledAppResultLoader.java
index 6340a61..9d80b73 100644
--- a/src/com/android/settings/search/InstalledAppResultLoader.java
+++ b/src/com/android/settings/search/InstalledAppResultLoader.java
@@ -163,8 +163,9 @@
      * appName: Abcde, query: bc, Returns NAME_NO_MATCH
      * appName: Abcde, query: xyz, Returns NAME_NO_MATCH
      * appName: Abc de, query: de, Returns 4
+     * TODO: Move this to a common util class.
      */
-    private int getWordDifference(String appName, String query) {
+    static int getWordDifference(String appName, String query) {
         if (TextUtils.isEmpty(appName) || TextUtils.isEmpty(query)) {
             return NAME_NO_MATCH;
         }
diff --git a/src/com/android/settings/search/SavedQueryController.java b/src/com/android/settings/search/SavedQueryController.java
index f6a3ff6..eaba3d6 100644
--- a/src/com/android/settings/search/SavedQueryController.java
+++ b/src/com/android/settings/search/SavedQueryController.java
@@ -21,19 +21,23 @@
 import android.content.Context;
 import android.content.Loader;
 import android.os.Bundle;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
 
+import com.android.settings.R;
 import com.android.settings.overlay.FeatureFactory;
 
 import java.util.List;
 
-public class SavedQueryController implements LoaderManager.LoaderCallbacks {
+public class SavedQueryController implements LoaderManager.LoaderCallbacks,
+        MenuItem.OnMenuItemClickListener {
 
     // TODO: make a generic background task manager to handle one-off tasks like this one.
-
-    private static final int LOADER_ID_SAVE_QUERY_TASK = 0;
-    private static final int LOADER_ID_REMOVE_QUERY_TASK = 1;
-    private static final int LOADER_ID_SAVED_QUERIES = 2;
     private static final String ARG_QUERY = "remove_query";
+    private static final String TAG = "SearchSavedQueryCtrl";
+
+    private static final int MENU_SEARCH_HISTORY = 1000;
 
     private final Context mContext;
     private final LoaderManager mLoaderManager;
@@ -52,11 +56,11 @@
     @Override
     public Loader onCreateLoader(int id, Bundle args) {
         switch (id) {
-            case LOADER_ID_SAVE_QUERY_TASK:
+            case SearchFragment.SearchLoaderId.SAVE_QUERY_TASK:
                 return new SavedQueryRecorder(mContext, args.getString(ARG_QUERY));
-            case LOADER_ID_REMOVE_QUERY_TASK:
-                return new SavedQueryRemover(mContext, args.getString(ARG_QUERY));
-            case LOADER_ID_SAVED_QUERIES:
+            case SearchFragment.SearchLoaderId.REMOVE_QUERY_TASK:
+                return new SavedQueryRemover(mContext);
+            case SearchFragment.SearchLoaderId.SAVED_QUERIES:
                 return mSearchFeatureProvider.getSavedQueryLoader(mContext);
         }
         return null;
@@ -65,10 +69,14 @@
     @Override
     public void onLoadFinished(Loader loader, Object data) {
         switch (loader.getId()) {
-            case LOADER_ID_REMOVE_QUERY_TASK:
-                mLoaderManager.restartLoader(LOADER_ID_SAVED_QUERIES, null, this);
+            case SearchFragment.SearchLoaderId.REMOVE_QUERY_TASK:
+                mLoaderManager.restartLoader(SearchFragment.SearchLoaderId.SAVED_QUERIES,
+                        null /* args */, this /* callback */);
                 break;
-            case LOADER_ID_SAVED_QUERIES:
+            case SearchFragment.SearchLoaderId.SAVED_QUERIES:
+                if (SettingsSearchIndexablesProvider.DEBUG) {
+                    Log.d(TAG, "Saved queries loaded");
+                }
                 mResultAdapter.displaySavedQuery((List<SearchResult>) data);
                 break;
         }
@@ -76,22 +84,44 @@
 
     @Override
     public void onLoaderReset(Loader loader) {
+    }
 
+    @Override
+    public boolean onMenuItemClick(MenuItem item) {
+        if (item.getItemId() != MENU_SEARCH_HISTORY) {
+            return false;
+        }
+        removeQueries();
+        return true;
+    }
+
+    public void buildMenuItem(Menu menu) {
+        final MenuItem item =
+                menu.add(Menu.NONE, MENU_SEARCH_HISTORY, Menu.NONE, R.string.search_clear_history);
+        item.setOnMenuItemClickListener(this);
     }
 
     public void saveQuery(String query) {
         final Bundle args = new Bundle();
         args.putString(ARG_QUERY, query);
-        mLoaderManager.restartLoader(LOADER_ID_SAVE_QUERY_TASK, args, this);
+        mLoaderManager.restartLoader(SearchFragment.SearchLoaderId.SAVE_QUERY_TASK, args,
+                this /* callback */);
     }
 
-    public void removeQuery(String query) {
+    /**
+     * Remove all saved queries from DB
+     */
+    public void removeQueries() {
         final Bundle args = new Bundle();
-        args.putString(ARG_QUERY, query);
-        mLoaderManager.restartLoader(LOADER_ID_REMOVE_QUERY_TASK, args, this);
+        mLoaderManager.restartLoader(SearchFragment.SearchLoaderId.REMOVE_QUERY_TASK, args,
+                this /* callback */);
     }
 
     public void loadSavedQueries() {
-        mLoaderManager.restartLoader(LOADER_ID_SAVED_QUERIES, null, this);
+        if (SettingsSearchIndexablesProvider.DEBUG) {
+            Log.d(TAG, "loading saved queries");
+        }
+        mLoaderManager.restartLoader(SearchFragment.SearchLoaderId.SAVED_QUERIES, null /* args */,
+                this /* callback */);
     }
 }
diff --git a/src/com/android/settings/search/SavedQueryLoader.java b/src/com/android/settings/search/SavedQueryLoader.java
index 87457f5..e8efe85 100644
--- a/src/com/android/settings/search/SavedQueryLoader.java
+++ b/src/com/android/settings/search/SavedQueryLoader.java
@@ -34,7 +34,7 @@
 public class SavedQueryLoader extends AsyncLoader<List<? extends SearchResult>> {
 
     // Max number of proposed suggestions
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    @VisibleForTesting
     static final int MAX_PROPOSED_SUGGESTIONS = 5;
 
     private final SQLiteDatabase mDatabase;
@@ -51,15 +51,17 @@
 
     @Override
     public List<? extends SearchResult> loadInBackground() {
-        Cursor cursor = mDatabase.query(IndexDatabaseHelper.Tables.TABLE_SAVED_QUERIES /* table */,
+        try (final Cursor cursor = mDatabase.query(
+                IndexDatabaseHelper.Tables.TABLE_SAVED_QUERIES /* table */,
                 new String[]{SavedQueriesColumns.QUERY} /* columns */,
                 null /* selection */,
                 null /* selectionArgs */,
                 null /* groupBy */,
                 null /* having */,
                 "rowId DESC" /* orderBy */,
-                String.valueOf(MAX_PROPOSED_SUGGESTIONS) /* limit */);
-        return convertCursorToResult(cursor);
+                String.valueOf(MAX_PROPOSED_SUGGESTIONS) /* limit */)) {
+            return convertCursorToResult(cursor);
+        }
     }
 
     private List<SearchResult> convertCursorToResult(Cursor cursor) {
diff --git a/src/com/android/settings/search/SavedQueryRemover.java b/src/com/android/settings/search/SavedQueryRemover.java
index 47bb3ba..77334a5 100644
--- a/src/com/android/settings/search/SavedQueryRemover.java
+++ b/src/com/android/settings/search/SavedQueryRemover.java
@@ -17,25 +17,21 @@
 
 package com.android.settings.search;
 
+import static com.android.settings.search.IndexDatabaseHelper.Tables.TABLE_SAVED_QUERIES;
+
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
 import android.util.Log;
 
-import com.android.settings.search.IndexDatabaseHelper;
 import com.android.settings.utils.AsyncLoader;
 
-import static com.android.settings.search.IndexDatabaseHelper.Tables.TABLE_SAVED_QUERIES;
-
 public class SavedQueryRemover extends AsyncLoader<Void> {
 
     private static final String LOG_TAG = "SavedQueryRemover";
 
-    private final String mQuery;
-
-    public SavedQueryRemover(Context context, String query) {
+    public SavedQueryRemover(Context context) {
         super(context);
-        mQuery = query;
     }
 
     @Override
@@ -44,8 +40,8 @@
         try {
             // First, delete all saved queries that are the same
             database.delete(TABLE_SAVED_QUERIES,
-                    IndexDatabaseHelper.SavedQueriesColumns.QUERY + " = ?",
-                    new String[]{mQuery});
+                    null /* where */,
+                    null /* whereArgs */);
         } catch (Exception e) {
             Log.d(LOG_TAG, "Cannot update saved Search queries", e);
         }
diff --git a/src/com/android/settings/search/SavedQueryViewHolder.java b/src/com/android/settings/search/SavedQueryViewHolder.java
index 14509b6..a8d449d 100644
--- a/src/com/android/settings/search/SavedQueryViewHolder.java
+++ b/src/com/android/settings/search/SavedQueryViewHolder.java
@@ -25,12 +25,10 @@
 public class SavedQueryViewHolder extends SearchViewHolder {
 
     public final TextView titleView;
-    public final View removeButton;
 
     public SavedQueryViewHolder(View view) {
         super(view);
         titleView = view.findViewById(android.R.id.title);
-        removeButton = view.findViewById(android.R.id.icon);
     }
 
     @Override
@@ -40,8 +38,7 @@
 
     @Override
     public void onBind(SearchFragment fragment, SearchResult result) {
+        itemView.setOnClickListener(v -> fragment.onSavedQueryClicked(result.title));
         titleView.setText(result.title);
-        titleView.setOnClickListener(v -> fragment.onSavedQueryClicked(result.title));
-        removeButton.setOnClickListener(v -> fragment.onRemoveSavedQueryClicked(result.title));
     }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/search/SearchFeatureProvider.java b/src/com/android/settings/search/SearchFeatureProvider.java
index 2fbebba..956808d 100644
--- a/src/com/android/settings/search/SearchFeatureProvider.java
+++ b/src/com/android/settings/search/SearchFeatureProvider.java
@@ -16,16 +16,12 @@
  */
 package com.android.settings.search;
 
-import android.app.Activity;
 import android.content.Context;
-import android.view.Menu;
 import android.view.View;
 
 import com.android.settings.dashboard.SiteMapManager;
 import com.android.settings.search.ranking.SearchResultsRankerCallback;
 
-import java.util.List;
-
 /**
  * FeatureProvider for Settings Search
  */
@@ -47,6 +43,17 @@
     InstalledAppResultLoader getInstalledAppSearchLoader(Context context, String query);
 
     /**
+     * Returns a new loader to search accessibility services.
+     */
+    AccessibilityServiceResultLoader getAccessibilityServiceResultLoader(Context context,
+            String query);
+
+    /**
+     * Returns a new loader to search input devices.
+     */
+    InputDeviceResultLoader getInputDeviceResultLoader(Context context, String query);
+
+    /**
      * Returns a new loader to get all recently saved queries search terms.
      */
     SavedQueryLoader getSavedQueryLoader(Context context);
@@ -99,8 +106,8 @@
     /**
      * Query search results based on the input query.
      *
-     * @param context application context
-     * @param query input user query
+     * @param context                     application context
+     * @param query                       input user query
      * @param searchResultsRankerCallback {@link SearchResultsRankerCallback}
      */
     default void querySearchResults(Context context, String query,
@@ -116,8 +123,8 @@
     /**
      * Notify that a search result is clicked.
      *
-     * @param context application context
-     * @param query input user query
+     * @param context      application context
+     * @param query        input user query
      * @param searchResult clicked result
      */
     default void searchResultClicked(Context context, String query, SearchResult searchResult) {
@@ -130,4 +137,17 @@
         return false;
     }
 
+    /**
+     * @return smart ranking timeout in milliseconds.
+     */
+    default long smartSearchRankingTimeoutMs(Context context) {
+        return 300L;
+    }
+
+    /**
+     * Prepare for search ranking predictions to avoid latency on the first prediction call.
+     */
+    default void searchRankingWarmup(Context context) {
+    }
+
 }
diff --git a/src/com/android/settings/search/SearchFeatureProviderImpl.java b/src/com/android/settings/search/SearchFeatureProviderImpl.java
index 2bcd383..400cf8f 100644
--- a/src/com/android/settings/search/SearchFeatureProviderImpl.java
+++ b/src/com/android/settings/search/SearchFeatureProviderImpl.java
@@ -19,6 +19,8 @@
 
 import android.content.Context;
 import android.text.TextUtils;
+import android.util.Log;
+
 import com.android.settings.applications.PackageManagerWrapperImpl;
 import com.android.settings.dashboard.SiteMapManager;
 import com.android.settings.overlay.FeatureFactory;
@@ -53,6 +55,18 @@
     }
 
     @Override
+    public AccessibilityServiceResultLoader getAccessibilityServiceResultLoader(Context context,
+            String query) {
+        return new AccessibilityServiceResultLoader(context, cleanQuery(query),
+                getSiteMapManager());
+    }
+
+    @Override
+    public InputDeviceResultLoader getInputDeviceResultLoader(Context context, String query) {
+        return new InputDeviceResultLoader(context, cleanQuery(query), getSiteMapManager());
+    }
+
+    @Override
     public SavedQueryLoader getSavedQueryLoader(Context context) {
         return new SavedQueryLoader(context);
     }
@@ -80,6 +94,9 @@
 
     @Override
     public void updateIndexAsync(Context context, IndexingCallback callback) {
+        if (SettingsSearchIndexablesProvider.DEBUG) {
+            Log.d(TAG, "updating index async");
+        }
         getIndexingManager(context).indexDatabase(callback);
     }
 
diff --git a/src/com/android/settings/search/SearchFragment.java b/src/com/android/settings/search/SearchFragment.java
index 69c2062..092404c 100644
--- a/src/com/android/settings/search/SearchFragment.java
+++ b/src/com/android/settings/search/SearchFragment.java
@@ -32,6 +32,8 @@
 import android.util.Pair;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
@@ -75,13 +77,21 @@
     private static final String STATE_NEVER_ENTERED_QUERY = "state_never_entered_query";
     private static final String STATE_RESULT_CLICK_COUNT = "state_result_click_count";
 
-    // Loader IDs
-    @VisibleForTesting
-    static final int LOADER_ID_DATABASE = 1;
-    @VisibleForTesting
-    static final int LOADER_ID_INSTALLED_APPS = 2;
+    static final class SearchLoaderId {
+        // Search Query IDs
+        public static final int DATABASE = 1;
+        public static final int INSTALLED_APPS = 2;
+        public static final int ACCESSIBILITY_SERVICES = 3;
+        public static final int INPUT_DEVICES = 4;
 
-    private static final int NUM_QUERY_LOADERS = 2;
+        // Saved Query IDs
+        public static final int SAVE_QUERY_TASK = 5;
+        public static final int REMOVE_QUERY_TASK = 6;
+        public static final int SAVED_QUERIES = 7;
+    }
+
+
+    private static final int NUM_QUERY_LOADERS = 4;
 
     @VisibleForTesting
     AtomicInteger mUnfinishedLoadersCount = new AtomicInteger(NUM_QUERY_LOADERS);
@@ -104,7 +114,8 @@
     @VisibleForTesting
     SearchFeatureProvider mSearchFeatureProvider;
 
-    private SearchResultsAdapter mSearchAdapter;
+    @VisibleForTesting
+    SearchResultsAdapter mSearchAdapter;
 
     @VisibleForTesting
     RecyclerView mResultsRecyclerView;
@@ -138,6 +149,7 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        long startTime = System.currentTimeMillis();
         setHasOptionsMenu(true);
 
         final LoaderManager loaderManager = getLoaderManager();
@@ -162,6 +174,15 @@
         } else {
             Log.w(TAG, "Cannot update the Indexer as we are running low on storage space!");
         }
+        if (SettingsSearchIndexablesProvider.DEBUG) {
+            Log.d(TAG, "onCreate spent " + (System.currentTimeMillis() - startTime) + " ms");
+        }
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        mSavedQueryController.buildMenuItem(menu);
     }
 
     @Override
@@ -211,6 +232,10 @@
     @Override
     public void onResume() {
         super.onResume();
+        Context appContext = getContext().getApplicationContext();
+        if (mSearchFeatureProvider.isSmartSearchRankingEnabled(appContext)) {
+            mSearchFeatureProvider.searchRankingWarmup(appContext);
+        }
         requery();
     }
 
@@ -262,8 +287,10 @@
 
         if (isEmptyQuery) {
             final LoaderManager loaderManager = getLoaderManager();
-            loaderManager.destroyLoader(LOADER_ID_DATABASE);
-            loaderManager.destroyLoader(LOADER_ID_INSTALLED_APPS);
+            loaderManager.destroyLoader(SearchLoaderId.DATABASE);
+            loaderManager.destroyLoader(SearchLoaderId.INSTALLED_APPS);
+            loaderManager.destroyLoader(SearchLoaderId.ACCESSIBILITY_SERVICES);
+            loaderManager.destroyLoader(SearchLoaderId.INPUT_DEVICES);
             mShowingSavedQuery = true;
             mSavedQueryController.loadSavedQueries();
             mSearchFeatureProvider.hideFeedbackButton();
@@ -288,10 +315,14 @@
         final Activity activity = getActivity();
 
         switch (id) {
-            case LOADER_ID_DATABASE:
+            case SearchLoaderId.DATABASE:
                 return mSearchFeatureProvider.getDatabaseSearchLoader(activity, mQuery);
-            case LOADER_ID_INSTALLED_APPS:
+            case SearchLoaderId.INSTALLED_APPS:
                 return mSearchFeatureProvider.getInstalledAppSearchLoader(activity, mQuery);
+            case SearchLoaderId.ACCESSIBILITY_SERVICES:
+                return mSearchFeatureProvider.getAccessibilityServiceResultLoader(activity, mQuery);
+            case SearchLoaderId.INPUT_DEVICES:
+                return mSearchFeatureProvider.getInputDeviceResultLoader(activity, mQuery);
             default:
                 return null;
         }
@@ -324,8 +355,13 @@
             mSavedQueryController.loadSavedQueries();
         } else {
             final LoaderManager loaderManager = getLoaderManager();
-            loaderManager.initLoader(LOADER_ID_DATABASE, null, this);
-            loaderManager.initLoader(LOADER_ID_INSTALLED_APPS, null, this);
+            loaderManager.initLoader(SearchLoaderId.DATABASE, null /* args */, this /* callback */);
+            loaderManager.initLoader(
+                    SearchLoaderId.INSTALLED_APPS, null /* args */, this /* callback */);
+            loaderManager.initLoader(
+                    SearchLoaderId.ACCESSIBILITY_SERVICES, null /* args */, this /* callback */);
+            loaderManager.initLoader(
+                    SearchLoaderId.INPUT_DEVICES, null /* args */, this /* callback */);
         }
 
         requery();
@@ -359,16 +395,18 @@
         onQueryTextChange(queryString);
     }
 
-    public void onRemoveSavedQueryClicked(CharSequence title) {
-        mSavedQueryController.removeQuery(title.toString());
-    }
-
     private void restartLoaders() {
         mShowingSavedQuery = false;
         final LoaderManager loaderManager = getLoaderManager();
         mUnfinishedLoadersCount.set(NUM_QUERY_LOADERS);
-        loaderManager.restartLoader(LOADER_ID_DATABASE, null /* args */, this /* callback */);
-        loaderManager.restartLoader(LOADER_ID_INSTALLED_APPS, null /* args */, this /* callback */);
+        loaderManager.restartLoader(
+                SearchLoaderId.DATABASE, null /* args */, this /* callback */);
+        loaderManager.restartLoader(
+                SearchLoaderId.INSTALLED_APPS, null /* args */, this /* callback */);
+        loaderManager.restartLoader(
+                SearchLoaderId.ACCESSIBILITY_SERVICES, null /* args */, this /* callback */);
+        loaderManager.restartLoader(
+                SearchLoaderId.INPUT_DEVICES, null /* args */, this /* callback */);
     }
 
     public String getQuery() {
@@ -420,13 +458,16 @@
             taggedData.addAll(Arrays.asList(logTaggedData));
         }
         taggedData.add(Pair.create(
-                MetricsEvent.FIELD_SETTINGS_SERACH_RESULT_COUNT,
+                MetricsEvent.FIELD_SETTINGS_SEARCH_RESULT_COUNT,
                 mSearchAdapter.getItemCount()));
         taggedData.add(Pair.create(
-                MetricsEvent.FIELD_SETTINGS_SERACH_RESULT_RANK,
+                MetricsEvent.FIELD_SETTINGS_SEARCH_RESULT_RANK,
                 resultViewHolder.getAdapterPosition()));
         taggedData.add(Pair.create(
-                MetricsEvent.FIELD_SETTINGS_SERACH_QUERY_LENGTH,
+                MetricsEvent.FIELD_SETTINGS_SEARCH_RESULT_ASYNC_RANKING_STATE,
+                mSearchAdapter.getAsyncRankingState()));
+        taggedData.add(Pair.create(
+                MetricsEvent.FIELD_SETTINGS_SEARCH_QUERY_LENGTH,
                 TextUtils.isEmpty(mQuery) ? 0 : mQuery.length()));
 
         mMetricsFeatureProvider.action(getContext(),
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index 31d39b5..b9e944e 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -20,7 +20,6 @@
 import android.support.annotation.DrawableRes;
 import android.support.annotation.VisibleForTesting;
 import android.support.annotation.XmlRes;
-
 import android.text.TextUtils;
 import com.android.settings.DateTimeSettings;
 import com.android.settings.DeviceInfoSettings;
@@ -34,18 +33,20 @@
 import com.android.settings.accessibility.AccessibilityShortcutPreferenceFragment;
 import com.android.settings.accessibility.MagnificationPreferenceFragment;
 import com.android.settings.accounts.UserAndAccountDashboardFragment;
-import com.android.settings.applications.AdvancedAppSettings;
 import com.android.settings.applications.AppAndNotificationDashboardFragment;
+import com.android.settings.applications.DefaultAppSettings;
 import com.android.settings.applications.SpecialAccessSettings;
 import com.android.settings.applications.assist.ManageAssist;
 import com.android.settings.backup.BackupSettingsActivity;
 import com.android.settings.backup.BackupSettingsFragment;
 import com.android.settings.bluetooth.BluetoothSettings;
 import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
-import com.android.settings.support.SupportDashboardActivity;
+import com.android.settings.datausage.DataPlanUsageSummary;
 import com.android.settings.datausage.DataUsageMeteredSettings;
 import com.android.settings.datausage.DataUsageSummary;
+import com.android.settings.deletionhelper.AutomaticStorageManagerSettings;
 import com.android.settings.development.DevelopmentSettings;
+import com.android.settings.deviceinfo.Status;
 import com.android.settings.deviceinfo.StorageDashboardFragment;
 import com.android.settings.deviceinfo.StorageSettings;
 import com.android.settings.display.AmbientDisplaySettings;
@@ -59,6 +60,7 @@
 import com.android.settings.gestures.DoubleTapPowerSettings;
 import com.android.settings.gestures.DoubleTapScreenSettings;
 import com.android.settings.gestures.DoubleTwistGestureSettings;
+import com.android.settings.gestures.GestureSettings;
 import com.android.settings.gestures.PickupGestureSettings;
 import com.android.settings.gestures.SwipeToNotificationSettings;
 import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment;
@@ -78,6 +80,7 @@
 import com.android.settings.print.PrintSettingsFragment;
 import com.android.settings.security.LockscreenDashboardFragment;
 import com.android.settings.sim.SimSettings;
+import com.android.settings.support.SupportDashboardActivity;
 import com.android.settings.system.ResetDashboardFragment;
 import com.android.settings.system.SystemDashboardFragment;
 import com.android.settings.tts.TtsEnginePreferenceFragment;
@@ -86,7 +89,6 @@
 import com.android.settings.wifi.ConfigureWifiSettings;
 import com.android.settings.wifi.SavedAccessPointsWifiSettings;
 import com.android.settings.wifi.WifiSettings;
-
 import java.util.Collection;
 import java.util.HashMap;
 
@@ -101,7 +103,7 @@
     @XmlRes
     public static final int NO_DATA_RES_ID = 0;
 
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    @VisibleForTesting
     static final HashMap<String, SearchIndexableResource> sResMap = new HashMap<>();
 
     @VisibleForTesting
@@ -133,6 +135,7 @@
                 R.drawable.ic_settings_wireless);
         addIndex(BluetoothSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_bluetooth);
         addIndex(SimSettings.class, NO_DATA_RES_ID, R.drawable.ic_sim_sd);
+        addIndex(DataPlanUsageSummary.class, NO_DATA_RES_ID, R.drawable.ic_settings_data_usage);
         addIndex(DataUsageSummary.class, NO_DATA_RES_ID, R.drawable.ic_settings_data_usage);
         addIndex(DataUsageMeteredSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_data_usage);
         addIndex(ScreenZoomSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display);
@@ -156,7 +159,7 @@
         addIndex(PowerUsageAdvanced.class, NO_DATA_RES_ID, R.drawable.ic_settings_battery);
         addIndex(BatterySaverSettings.class,
                 R.xml.battery_saver_settings, R.drawable.ic_settings_battery);
-        addIndex(AdvancedAppSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_applications);
+        addIndex(DefaultAppSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_applications);
         addIndex(ManageAssist.class, NO_DATA_RES_ID, R.drawable.ic_settings_applications);
         addIndex(SpecialAccessSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_applications);
         addIndex(UserSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_multiuser);
@@ -167,6 +170,7 @@
         addIndex(DoubleTwistGestureSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_gestures);
         addIndex(SwipeToNotificationSettings.class, NO_DATA_RES_ID,
                 R.drawable.ic_settings_gestures);
+        addIndex(GestureSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_gestures);
         addIndex(LanguageAndInputSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_language);
         addIndex(LocationSettings.class, R.xml.location_settings, R.drawable.ic_settings_location);
         addIndex(ScanningSettings.class, R.xml.location_scanning, R.drawable.ic_settings_location);
@@ -186,6 +190,7 @@
         addIndex(PrintSettingsFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_print);
         addIndex(DevelopmentSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_development);
         addIndex(DeviceInfoSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_about);
+        addIndex(Status.class, NO_DATA_RES_ID, 0 /* icon */);
         addIndex(LegalSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_about);
         addIndex(ZenModeVisualInterruptionSettings.class,
                 R.xml.zen_mode_visual_interruptions_settings,
@@ -200,7 +205,7 @@
         addIndex(
                 TtsEnginePreferenceFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_language);
         addIndex(LockscreenDashboardFragment.class, R.xml.security_lockscreen_settings,
-            R.drawable.ic_settings_security);
+                R.drawable.ic_settings_security);
         addIndex(MagnificationPreferenceFragment.class, NO_DATA_RES_ID,
                 R.drawable.ic_settings_accessibility);
         addIndex(AccessibilityShortcutPreferenceFragment.class, NO_DATA_RES_ID,
@@ -209,6 +214,10 @@
                 R.drawable.ic_settings_notifications);
         addIndex(DreamSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display);
         addIndex(SupportDashboardActivity.class, NO_DATA_RES_ID, R.drawable.ic_help);
+        addIndex(
+                AutomaticStorageManagerSettings.class,
+                NO_DATA_RES_ID,
+                R.drawable.ic_settings_storage);
     }
 
     private SearchIndexableResources() {
diff --git a/src/com/android/settings/search/SearchResultsAdapter.java b/src/com/android/settings/search/SearchResultsAdapter.java
index d2ace0e..5fedc52 100644
--- a/src/com/android/settings/search/SearchResultsAdapter.java
+++ b/src/com/android/settings/search/SearchResultsAdapter.java
@@ -45,6 +45,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeSet;
 
 public class SearchResultsAdapter extends RecyclerView.Adapter<SearchViewHolder>
         implements SearchResultsRankerCallback {
@@ -55,13 +56,14 @@
 
     @VisibleForTesting
     static final String APP_RESULTS_LOADER_KEY = InstalledAppResultLoader.class.getName();
+    @VisibleForTesting
+    static final String ACCESSIBILITY_LOADER_KEY = AccessibilityServiceResultLoader.class.getName();
+    @VisibleForTesting
+    static final String INPUT_DEVICE_LOADER_KEY = InputDeviceResultLoader.class.getName();
 
     @VisibleForTesting
     static final int MSG_RANKING_TIMED_OUT = 1;
 
-    // TODO(b/38197948): Tune this timeout based on latency of static and async rankings. Also, we
-    // should add a gservices flag to control this.
-    private static final long RANKING_TIMEOUT_MS = 300;
     private final SearchFragment mFragment;
     private final Context mContext;
     private final List<SearchResult> mSearchResults;
@@ -76,11 +78,16 @@
     @IntDef({DISABLED, PENDING_RESULTS, SUCCEEDED, FAILED, TIMED_OUT})
     @Retention(RetentionPolicy.SOURCE)
     private @interface AsyncRankingState {}
-    private static final int DISABLED = 0;
-    private static final int PENDING_RESULTS = 1;
-    private static final int SUCCEEDED = 2;
-    private static final int FAILED = 3;
-    private static final int TIMED_OUT = 4;
+    @VisibleForTesting
+    static final int DISABLED = 0;
+    @VisibleForTesting
+    static final int PENDING_RESULTS = 1;
+    @VisibleForTesting
+    static final int SUCCEEDED = 2;
+    @VisibleForTesting
+    static final int FAILED = 3;
+    @VisibleForTesting
+    static final int TIMED_OUT = 4;
     private @AsyncRankingState int mAsyncRankingState;
 
     public SearchResultsAdapter(SearchFragment fragment,
@@ -235,14 +242,19 @@
             mAsyncRankingState = PENDING_RESULTS;
             mSearchFeatureProvider.cancelPendingSearchQuery(mContext);
             final Handler handler = getHandler();
+            final long timeoutMs = mSearchFeatureProvider.smartSearchRankingTimeoutMs(mContext);
             handler.sendMessageDelayed(
-                    handler.obtainMessage(MSG_RANKING_TIMED_OUT), RANKING_TIMEOUT_MS);
+                    handler.obtainMessage(MSG_RANKING_TIMED_OUT), timeoutMs);
             mSearchFeatureProvider.querySearchResults(mContext, query, this);
         } else {
             mAsyncRankingState = DISABLED;
         }
     }
 
+    @AsyncRankingState int getAsyncRankingState() {
+        return mAsyncRankingState;
+    }
+
     /**
      * Merge the results from each of the loaders into one list for the adapter.
      * Prioritizes results from the local database over installed apps.
@@ -252,13 +264,22 @@
                 getSortedLoadedResults(DB_RESULTS_LOADER_KEY);
         List<? extends SearchResult> installedAppResults =
                 getSortedLoadedResults(APP_RESULTS_LOADER_KEY);
+        List<? extends SearchResult> accessibilityResults =
+                getSortedLoadedResults(ACCESSIBILITY_LOADER_KEY);
+        List<? extends SearchResult> inputDeviceResults =
+                getSortedLoadedResults(INPUT_DEVICE_LOADER_KEY);
+
         int dbSize = databaseResults.size();
         int appSize = installedAppResults.size();
-
+        int a11ySize = accessibilityResults.size();
+        int inputDeviceSize = inputDeviceResults.size();
         int dbIndex = 0;
         int appIndex = 0;
+        int a11yIndex = 0;
+        int inputDeviceIndex = 0;
         int rank = SearchResult.TOP_RANK;
 
+        // TODO: We need a helper method to do k-way merge.
         mStaticallyRankedSearchResults.clear();
         while (rank <= SearchResult.BOTTOM_RANK) {
             while ((dbIndex < dbSize) && (databaseResults.get(dbIndex).rank == rank)) {
@@ -267,6 +288,13 @@
             while ((appIndex < appSize) && (installedAppResults.get(appIndex).rank == rank)) {
                 mStaticallyRankedSearchResults.add(installedAppResults.get(appIndex++));
             }
+            while ((a11yIndex < a11ySize) && (accessibilityResults.get(a11yIndex).rank == rank)) {
+                mStaticallyRankedSearchResults.add(accessibilityResults.get(a11yIndex++));
+            }
+            while (inputDeviceIndex < inputDeviceSize
+                    && inputDeviceResults.get(inputDeviceIndex).rank == rank) {
+                mStaticallyRankedSearchResults.add(inputDeviceResults.get(inputDeviceIndex++));
+            }
             rank++;
         }
 
@@ -276,6 +304,12 @@
         while (appIndex < appSize) {
             mStaticallyRankedSearchResults.add(installedAppResults.get(appIndex++));
         }
+        while(a11yIndex < a11ySize) {
+            mStaticallyRankedSearchResults.add(accessibilityResults.get(a11yIndex++));
+        }
+        while (inputDeviceIndex < inputDeviceSize) {
+            mStaticallyRankedSearchResults.add(inputDeviceResults.get(inputDeviceIndex++));
+        }
     }
 
     private void updateSearchResults() {
@@ -308,35 +342,44 @@
                 getUnsortedLoadedResults(DB_RESULTS_LOADER_KEY);
         List<? extends SearchResult> installedAppResults =
                 getSortedLoadedResults(APP_RESULTS_LOADER_KEY);
+        List<? extends SearchResult> accessibilityResults =
+                getSortedLoadedResults(ACCESSIBILITY_LOADER_KEY);
+        List<? extends SearchResult> inputDeviceResults =
+                getSortedLoadedResults(INPUT_DEVICE_LOADER_KEY);
         int dbSize = databaseResults.size();
         int appSize = installedAppResults.size();
+        int a11ySize = accessibilityResults.size();
+        int inputDeviceSize = inputDeviceResults.size();
 
-        final List<SearchResult> asyncRankingResults = new ArrayList<>(dbSize + appSize);
-        List<SearchResult> databaseResultsSortedByScores = new ArrayList<>(databaseResults);
-        Collections.sort(databaseResultsSortedByScores, new Comparator<SearchResult>() {
-            @Override
-            public int compare(SearchResult o1, SearchResult o2) {
-                float score1 = getRankingScoreByStableId(o1.stableId);
-                float score2 = getRankingScoreByStableId(o2.stableId);
-                if (score1 > score2) {
-                    return -1;
-                } else if (score1 == score2) {
-                    return 0;
-                } else {
-                    return 1;
-                }
-            }
-        });
-        asyncRankingResults.addAll(databaseResultsSortedByScores);
-        // App results are not ranked by async ranking and appended at the end of the list.
+        final List<SearchResult> asyncRankingResults = new ArrayList<>(
+                dbSize + appSize + a11ySize + inputDeviceSize);
+        TreeSet<SearchResult> dbResultsSortedByScores = new TreeSet<>(
+                new Comparator<SearchResult>() {
+                    @Override
+                    public int compare(SearchResult o1, SearchResult o2) {
+                        float score1 = getRankingScoreByStableId(o1.stableId);
+                        float score2 = getRankingScoreByStableId(o2.stableId);
+                        if (score1 > score2) {
+                            return -1;
+                        } else if (score1 == score2) {
+                            return 0;
+                        } else {
+                            return 1;
+                        }
+                    }
+                });
+        dbResultsSortedByScores.addAll(databaseResults);
+        asyncRankingResults.addAll(dbResultsSortedByScores);
+        // Other results are not ranked by async ranking and appended at the end of the list.
         asyncRankingResults.addAll(installedAppResults);
+        asyncRankingResults.addAll(accessibilityResults);
+        asyncRankingResults.addAll(inputDeviceResults);
         return asyncRankingResults;
     }
 
     @VisibleForTesting
     Set<? extends SearchResult> getUnsortedLoadedResults(String loaderKey) {
-        return mResultsMap.containsKey(loaderKey) ?
-                mResultsMap.get(loaderKey) : new HashSet<SearchResult>();
+        return mResultsMap.containsKey(loaderKey) ? mResultsMap.get(loaderKey) : new HashSet<>();
     }
 
     @VisibleForTesting
@@ -390,7 +433,8 @@
         return mHandler;
     }
 
-    private void postSearchResults(List<SearchResult> newSearchResults, boolean detectMoves) {
+    @VisibleForTesting
+    public void postSearchResults(List<SearchResult> newSearchResults, boolean detectMoves) {
         final DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(
                 new SearchResultDiffCallback(mSearchResults, newSearchResults), detectMoves);
         mSearchResults.clear();
diff --git a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
index a13081a..622378b 100644
--- a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
+++ b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
@@ -16,18 +16,6 @@
 
 package com.android.settings.search;
 
-import android.content.Context;
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import android.provider.SearchIndexableResource;
-import android.provider.SearchIndexablesProvider;
-import android.util.Log;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-
 import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE;
 import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_CLASS_NAME;
 import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_ICON_RESID;
@@ -40,9 +28,30 @@
 import static android.provider.SearchIndexablesContract.INDEXABLES_XML_RES_COLUMNS;
 import static android.provider.SearchIndexablesContract.NON_INDEXABLES_KEYS_COLUMNS;
 
+import android.content.Context;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.provider.SearchIndexableResource;
+import android.provider.SearchIndexablesProvider;
+import android.util.ArraySet;
+import android.util.Log;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+
 public class SettingsSearchIndexablesProvider extends SearchIndexablesProvider {
+    public static final boolean DEBUG = false;
     private static final String TAG = "SettingsSearchProvider";
 
+    private static final Collection<String> INVALID_KEYS;
+
+    static {
+        INVALID_KEYS = new ArraySet<>();
+        INVALID_KEYS.add(null);
+        INVALID_KEYS.add("");
+    }
+
     @Override
     public boolean onCreate() {
         return true;
@@ -84,6 +93,10 @@
         final Context context = getContext();
 
         for (SearchIndexableResource sir : SearchIndexableResources.values()) {
+            if (DEBUG) {
+                Log.d(TAG, "Getting non-indexable from " + sir.className);
+            }
+            final long startTime = System.currentTimeMillis();
             final Class<?> clazz = DatabaseIndexingUtils.getIndexableClass(sir.className);
             if (clazz == null) {
                 Log.d(TAG, "SearchIndexableResource '" + sir.className +
@@ -95,22 +108,28 @@
                     DatabaseIndexingUtils.getSearchIndexProvider(clazz);
 
             if (provider == null) {
-                Log.d(TAG, "Unable to get SearchIndexableProvider from " +
-                        Indexable.class.getName());
+                Log.d(TAG, "Unable to get SearchIndexableProvider from " + clazz);
                 continue;
             }
 
             List<String> providerNonIndexableKeys = provider.getNonIndexableKeys(context);
 
             if (providerNonIndexableKeys == null || providerNonIndexableKeys.isEmpty()) {
+                if (DEBUG) {
+                    final long totalTime = System.currentTimeMillis() - startTime;
+                    Log.d(TAG, "No indexable, total time " + totalTime);
+                }
                 continue;
             }
 
-            if (providerNonIndexableKeys.removeAll(Collections.singleton(null))
-                    || providerNonIndexableKeys.removeAll(Collections.singleton(""))) {
+            if (providerNonIndexableKeys.removeAll(INVALID_KEYS)) {
                 Log.v(TAG, clazz.getName() + " tried to add an empty non-indexable key");
             }
-
+            if (DEBUG) {
+                final long totalTime = System.currentTimeMillis() - startTime;
+                Log.d(TAG, "Non-indexables " + providerNonIndexableKeys.size() + ", total time "
+                        + totalTime);
+            }
             values.addAll(providerNonIndexableKeys);
         }
 
diff --git a/src/com/android/settings/search/XmlParserUtils.java b/src/com/android/settings/search/XmlParserUtils.java
index c81381c..b4ffc53 100644
--- a/src/com/android/settings/search/XmlParserUtils.java
+++ b/src/com/android/settings/search/XmlParserUtils.java
@@ -17,11 +17,11 @@
 
 package com.android.settings.search;
 
+import android.annotation.Nullable;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import android.util.TypedValue;
-
 import com.android.settings.R;
 
 /**
@@ -87,17 +87,18 @@
                 R.styleable.Preference_android_fragment);
     }
 
+    @Nullable
     private static String getData(Context context, AttributeSet set, int[] attrs, int resId) {
         final TypedArray ta = context.obtainStyledAttributes(set, attrs);
         String data = ta.getString(resId);
         ta.recycle();
-        return (data != null) ? data.toString() : null;
+        return data;
     }
 
     private static String getDataEntries(Context context, AttributeSet set, int[] attrs, int resId) {
         final TypedArray sa = context.obtainStyledAttributes(set, attrs);
         final TypedValue tv = sa.peekValue(resId);
-
+        sa.recycle();
         String[] data = null;
         if (tv != null && tv.type == TypedValue.TYPE_REFERENCE) {
             if (tv.resourceId != 0) {
diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java
index e239a43..b679b73 100644
--- a/src/com/android/settings/security/LockscreenDashboardFragment.java
+++ b/src/com/android/settings/security/LockscreenDashboardFragment.java
@@ -23,10 +23,10 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.accounts.AddUserWhenLockedPreferenceController;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.notification.LockScreenNotificationPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
@@ -73,8 +73,8 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
-        final List<PreferenceController> controllers = new ArrayList<>();
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         final Lifecycle lifecycle = getLifecycle();
         final LockScreenNotificationPreferenceController notificationController =
             new LockScreenNotificationPreferenceController(context,
@@ -111,8 +111,8 @@
             }
 
             @Override
-            public List<PreferenceController> getPreferenceControllers(Context context) {
-                final List<PreferenceController> controllers = new ArrayList<>();
+            public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+                final List<AbstractPreferenceController> controllers = new ArrayList<>();
                 controllers.add(new LockScreenNotificationPreferenceController(context));
                 controllers.add(new AddUserWhenLockedPreferenceController(context));
                 controllers.add(new OwnerInfoPreferenceController(
diff --git a/src/com/android/settings/security/OwnerInfoPreferenceController.java b/src/com/android/settings/security/OwnerInfoPreferenceController.java
index a687cb9..cae4d10 100644
--- a/src/com/android/settings/security/OwnerInfoPreferenceController.java
+++ b/src/com/android/settings/security/OwnerInfoPreferenceController.java
@@ -24,16 +24,17 @@
 import android.support.v7.preference.PreferenceScreen;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.OwnerInfoSettings;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedPreference;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
-public class OwnerInfoPreferenceController extends PreferenceController
-        implements LifecycleObserver, OnResume {
+public class OwnerInfoPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver, OnResume {
 
     private static final String KEY_OWNER_INFO = "owner_info_settings";
     private static final int MY_USER_ID = UserHandle.myUserId();
diff --git a/src/com/android/settings/security/SecurityFeatureProviderImpl.java b/src/com/android/settings/security/SecurityFeatureProviderImpl.java
index 8c6d343..47f7a1b 100644
--- a/src/com/android/settings/security/SecurityFeatureProviderImpl.java
+++ b/src/com/android/settings/security/SecurityFeatureProviderImpl.java
@@ -17,31 +17,30 @@
 package com.android.settings.security;
 
 import android.content.Context;
-import android.content.Intent;
 import android.content.IContentProvider;
+import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.os.Looper;
-import com.android.settings.R;
-import com.android.settings.trustagent.TrustAgentManager;
-import com.android.settings.trustagent.TrustAgentManagerImpl;
-import com.android.settingslib.drawer.DashboardCategory;
 import android.support.annotation.VisibleForTesting;
-import android.support.v4.content.ContextCompat;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.Pair;
 
+import com.android.settings.R;
+import com.android.settings.trustagent.TrustAgentManager;
+import com.android.settings.trustagent.TrustAgentManagerImpl;
+import com.android.settingslib.drawer.DashboardCategory;
 import com.android.settingslib.drawer.Tile;
 import com.android.settingslib.drawer.TileUtils;
 
-import java.util.concurrent.Executors;
-import java.util.TreeMap;
 import java.util.Map;
+import java.util.TreeMap;
+import java.util.concurrent.Executors;
 
 /** Implementation for {@code SecurityFeatureProvider}. */
 public class SecurityFeatureProviderImpl implements SecurityFeatureProvider {
diff --git a/src/com/android/settings/support/SupportDashboardActivity.java b/src/com/android/settings/support/SupportDashboardActivity.java
index 819d5f7..d3fcf9a 100644
--- a/src/com/android/settings/support/SupportDashboardActivity.java
+++ b/src/com/android/settings/support/SupportDashboardActivity.java
@@ -47,8 +47,8 @@
             supportFeatureProvider.startSupportV2(this);
         } else {
             startActivity(new Intent(this, LegacySupportActivity.class));
-            finish();
         }
+        finish();
     }
 
     /**
diff --git a/src/com/android/settings/system/FactoryResetPreferenceController.java b/src/com/android/settings/system/FactoryResetPreferenceController.java
index 4379105..cdeeaef 100644
--- a/src/com/android/settings/system/FactoryResetPreferenceController.java
+++ b/src/com/android/settings/system/FactoryResetPreferenceController.java
@@ -15,31 +15,24 @@
  */
 package com.android.settings.system;
 
-import android.accounts.Account;
-import android.accounts.AccountManager;
 import android.content.Context;
-import android.content.pm.UserInfo;
-import android.os.UserHandle;
 import android.os.UserManager;
-import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-import java.util.List;
-
-public class FactoryResetPreferenceController extends PreferenceController {
+public class FactoryResetPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
     /** Key of the "Factory reset" preference in {@link R.xml.reset_dashboard_fragment}. */
     private static final String KEY_FACTORY_RESET = "factory_reset";
 
     private final UserManager mUm;
-    private final AccountManager mAm;
 
     public FactoryResetPreferenceController(Context context) {
         super(context);
         mUm = (UserManager) context.getSystemService(Context.USER_SERVICE);
-        mAm = (AccountManager) context.getSystemService(Context.ACCOUNT_SERVICE);
     }
 
     /** Hide "Factory reset" settings for secondary users, except demo users. */
@@ -52,22 +45,4 @@
     public String getPreferenceKey() {
         return KEY_FACTORY_RESET;
     }
-
-    @Override
-    public void updateState(Preference preference) {
-        final List<UserInfo> profiles = mUm.getProfiles(UserHandle.myUserId());
-        int accountsCount = 0;
-        for (UserInfo userInfo : profiles) {
-            final int profileId = userInfo.id;
-            Account[] accounts = mAm.getAccountsAsUser(profileId);
-            accountsCount += accounts.length;
-        }
-        if (accountsCount == 0) {
-            preference.setSummary(R.string.master_clear_summary);
-        } else {
-            preference.setSummary(mContext.getResources().getQuantityString(
-                    R.plurals.master_clear_with_account_summary,
-                    accountsCount, accountsCount));
-        }
-    }
 }
diff --git a/src/com/android/settings/system/ResetDashboardFragment.java b/src/com/android/settings/system/ResetDashboardFragment.java
index c04e374..48295a4 100644
--- a/src/com/android/settings/system/ResetDashboardFragment.java
+++ b/src/com/android/settings/system/ResetDashboardFragment.java
@@ -22,11 +22,11 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.applications.ResetAppPrefPreferenceController;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.network.NetworkResetPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
@@ -52,13 +52,13 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
         return buildPreferenceControllers(context, getLifecycle());
     }
 
-    private static List<PreferenceController> buildPreferenceControllers(Context context,
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
             Lifecycle lifecycle) {
-        final List<PreferenceController> controllers = new ArrayList<>();
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new NetworkResetPreferenceController(context));
         controllers.add(new FactoryResetPreferenceController(context));
         controllers.add(new ResetAppPrefPreferenceController(context, lifecycle));
@@ -79,7 +79,7 @@
                 }
 
                 @Override
-                public List<PreferenceController> getPreferenceControllers(Context context) {
+                public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
                     return buildPreferenceControllers(context, null /* lifecycle */);
                 }
             };
diff --git a/src/com/android/settings/system/SystemDashboardFragment.java b/src/com/android/settings/system/SystemDashboardFragment.java
index fd164be..2485cce 100644
--- a/src/com/android/settings/system/SystemDashboardFragment.java
+++ b/src/com/android/settings/system/SystemDashboardFragment.java
@@ -22,12 +22,13 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.backup.BackupSettingsActivityPreferenceController;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.deviceinfo.AdditionalSystemUpdatePreferenceController;
 import com.android.settings.deviceinfo.SystemUpdatePreferenceController;
+import com.android.settings.gestures.GesturesSettingPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -60,15 +61,16 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
         return buildPreferenceControllers(context);
     }
 
-    private static List<PreferenceController> buildPreferenceControllers(Context context) {
-        final List<PreferenceController> controllers = new ArrayList<>();
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new SystemUpdatePreferenceController(context, UserManager.get(context)));
         controllers.add(new AdditionalSystemUpdatePreferenceController(context));
         controllers.add(new BackupSettingsActivityPreferenceController(context));
+        controllers.add(new GesturesSettingPreferenceController(context));
         return controllers;
     }
 
@@ -86,7 +88,7 @@
                 }
 
                 @Override
-                public List<PreferenceController> getPreferenceControllers(Context context) {
+                public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
                     return buildPreferenceControllers(context);
                 }
 
diff --git a/src/com/android/settings/tts/OWNERS b/src/com/android/settings/tts/OWNERS
new file mode 100644
index 0000000..01068dc
--- /dev/null
+++ b/src/com/android/settings/tts/OWNERS
@@ -0,0 +1,6 @@
+# Default reviewers for this and subdirectories.
+fergus@google.com
+nielse@google.com
+ssancho@google.com
+
+# Emergency approvers in case the above are not available
\ No newline at end of file
diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java
index e8823a6..c566967 100644
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -777,7 +777,11 @@
         if (KEY_TTS_ENGINE_PREFERENCE.equals(p.getKey())) {
             EngineInfo info = mEnginesHelper.getEngineInfo(mCurrentEngine);
             final Intent settingsIntent = mEnginesHelper.getSettingsIntent(info.name);
-            startActivity(settingsIntent);
+            if (settingsIntent != null) {
+                startActivity(settingsIntent);
+            } else {
+                Log.e(TAG, "settingsIntent is null");
+            }
         }
     }
 
diff --git a/src/com/android/settings/users/OWNERS b/src/com/android/settings/users/OWNERS
new file mode 100644
index 0000000..59096be
--- /dev/null
+++ b/src/com/android/settings/users/OWNERS
@@ -0,0 +1,6 @@
+# Default reviewers for this and subdirectories.
+dling@google.com
+yamasani@google.com
+zhfan@google.com
+
+# Emergency approvers in case the above are not available
\ No newline at end of file
diff --git a/src/com/android/settings/utils/FileSizeFormatter.java b/src/com/android/settings/utils/FileSizeFormatter.java
index e56388a..c0d360f 100644
--- a/src/com/android/settings/utils/FileSizeFormatter.java
+++ b/src/com/android/settings/utils/FileSizeFormatter.java
@@ -16,11 +16,22 @@
 
 package com.android.settings.utils;
 
+import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.content.Context;
 import android.content.res.Resources;
+import android.icu.text.DecimalFormat;
+import android.icu.text.MeasureFormat;
+import android.icu.text.NumberFormat;
+import android.icu.util.Measure;
+import android.icu.util.MeasureUnit;
 import android.text.BidiFormatter;
+import android.text.TextUtils;
 import android.text.format.Formatter;
+import android.view.View;
+
+import java.math.BigDecimal;
+import java.util.Locale;
 
 /**
  * Utility class to aid in formatting file sizes always with the same unit. This is modified from
@@ -31,6 +42,61 @@
     public static final long MEGABYTE_IN_BYTES = KILOBYTE_IN_BYTES * 1000;
     public static final long GIGABYTE_IN_BYTES = MEGABYTE_IN_BYTES * 1000;
 
+    private static class RoundedBytesResult {
+        public final float value;
+        public final MeasureUnit units;
+        public final int fractionDigits;
+        public final long roundedBytes;
+
+        public RoundedBytesResult(
+                float value, MeasureUnit units, int fractionDigits, long roundedBytes) {
+            this.value = value;
+            this.units = units;
+            this.fractionDigits = fractionDigits;
+            this.roundedBytes = roundedBytes;
+        }
+    }
+
+    private static Locale localeFromContext(@NonNull Context context) {
+        return context.getResources().getConfiguration().locale;
+    }
+
+    private static String bidiWrap(@NonNull Context context, String source) {
+        final Locale locale = localeFromContext(context);
+        if (TextUtils.getLayoutDirectionFromLocale(locale) == View.LAYOUT_DIRECTION_RTL) {
+            return BidiFormatter.getInstance(true /* RTL*/).unicodeWrap(source);
+        } else {
+            return source;
+        }
+    }
+
+    private static NumberFormat getNumberFormatter(Locale locale, int fractionDigits) {
+        final NumberFormat numberFormatter = NumberFormat.getInstance(locale);
+        numberFormatter.setMinimumFractionDigits(fractionDigits);
+        numberFormatter.setMaximumFractionDigits(fractionDigits);
+        numberFormatter.setGroupingUsed(false);
+        if (numberFormatter instanceof DecimalFormat) {
+            // We do this only for DecimalFormat, since in the general NumberFormat case, calling
+            // setRoundingMode may throw an exception.
+            numberFormatter.setRoundingMode(BigDecimal.ROUND_HALF_UP);
+        }
+        return numberFormatter;
+    }
+
+    private static String formatMeasureShort(Locale locale, NumberFormat numberFormatter,
+            float value, MeasureUnit units) {
+        final MeasureFormat measureFormatter = MeasureFormat.getInstance(
+                locale, MeasureFormat.FormatWidth.SHORT, numberFormatter);
+        return measureFormatter.format(new Measure(value, units));
+    }
+
+    private static String formatRoundedBytesResult(
+            @NonNull Context context, @NonNull RoundedBytesResult input) {
+        final Locale locale = localeFromContext(context);
+        final NumberFormat numberFormatter = getNumberFormatter(locale, input.fractionDigits);
+        return formatMeasureShort(locale, numberFormatter, input.value, input.units);
+    }
+
     /**
      * Formats a content size to be in the form of bytes, kilobytes, megabytes, etc.
      *
@@ -47,23 +113,17 @@
      *
      * @param context Context to use to load the localized units
      * @param sizeBytes size value to be formatted, in bytes
-     * @param suffix String id for the unit suffix.
-     * @param mult Amount of bytes in the unit. * @return formatted string with the number
+     * @param unit The unit used for formatting.
+     * @param mult Amount of bytes in the unit.
+     * @return formatted string with the number
      */
     public static String formatFileSize(
-            @Nullable Context context, long sizeBytes, int suffix, long mult) {
+            @Nullable Context context, long sizeBytes, MeasureUnit unit, long mult) {
         if (context == null) {
             return "";
         }
-        final Formatter.BytesResult res =
-                formatBytes(context.getResources(), sizeBytes, suffix, mult);
-        return BidiFormatter.getInstance()
-                .unicodeWrap(context.getString(getFileSizeSuffix(context), res.value, res.units));
-    }
-
-    private static int getFileSizeSuffix(Context context) {
-        final Resources res = context.getResources();
-        return res.getIdentifier("fileSizeSuffix", "string", "android");
+        final RoundedBytesResult res = formatBytes(sizeBytes, unit, mult);
+        return bidiWrap(context, formatRoundedBytesResult(context, res));
     }
 
     /**
@@ -76,8 +136,8 @@
      * @param suffix String id for the unit suffix.
      * @param mult Amount of bytes in the unit.
      */
-    private static Formatter.BytesResult formatBytes(
-            Resources res, long sizeBytes, int suffix, long mult) {
+    private static RoundedBytesResult formatBytes(
+            long sizeBytes, MeasureUnit unit, long mult) {
         final boolean isNegative = (sizeBytes < 0);
         float result = isNegative ? -sizeBytes : sizeBytes;
         result = result / mult;
@@ -85,32 +145,29 @@
         // compute the rounded value. String.format("%f", 0.1) might not return "0.1" due to
         // floating point errors.
         final int roundFactor;
-        final String roundFormat;
+        final int roundDigits;
         if (mult == 1) {
             roundFactor = 1;
-            roundFormat = "%.0f";
+            roundDigits = 0;
         } else if (result < 1) {
             roundFactor = 100;
-            roundFormat = "%.2f";
+            roundDigits = 2;
         } else if (result < 10) {
             roundFactor = 10;
-            roundFormat = "%.1f";
+            roundDigits = 1;
         } else { // 10 <= result < 100
             roundFactor = 1;
-            roundFormat = "%.0f";
+            roundDigits = 0;
         }
 
         if (isNegative) {
             result = -result;
         }
-        final String roundedString = String.format(roundFormat, result);
 
         // Note this might overflow if abs(result) >= Long.MAX_VALUE / 100, but that's like 80PB so
         // it's okay (for now)...
         final long roundedBytes = (((long) Math.round(result * roundFactor)) * mult / roundFactor);
 
-        final String units = res.getString(suffix);
-
-        return new Formatter.BytesResult(roundedString, units, roundedBytes);
+        return new RoundedBytesResult(result, unit, roundDigits, roundedBytes);
     }
 }
diff --git a/src/com/android/settings/utils/ManagedServiceSettings.java b/src/com/android/settings/utils/ManagedServiceSettings.java
index ae393fd..7a888db 100644
--- a/src/com/android/settings/utils/ManagedServiceSettings.java
+++ b/src/com/android/settings/utils/ManagedServiceSettings.java
@@ -17,9 +17,12 @@
 package com.android.settings.utils;
 
 import android.annotation.Nullable;
+import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.Fragment;
+import android.app.Notification;
+import android.app.NotificationManager;
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
 import android.content.Context;
@@ -55,6 +58,7 @@
     private PackageManager mPm;
     private DevicePolicyManager mDpm;
     protected ServiceListing mServiceListing;
+    protected NotificationManager mNm;
     private IconDrawableFactory mIconDrawableFactory;
 
     abstract protected Config getConfig();
@@ -70,6 +74,7 @@
         mContext = getActivity();
         mPm = mContext.getPackageManager();
         mDpm = (DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        mNm = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
         mIconDrawableFactory = IconDrawableFactory.newInstance(mContext);
         mServiceListing = new ServiceListing(mContext, mConfig);
         mServiceListing.addCallback(new ServiceListing.Callback() {
@@ -90,8 +95,12 @@
     @Override
     public void onResume() {
         super.onResume();
-        mServiceListing.reload();
-        mServiceListing.setListening(true);
+        if (!ActivityManager.isLowRamDeviceStatic()) {
+            mServiceListing.reload();
+            mServiceListing.setListening(true);
+        } else {
+            setEmptyText(R.string.disabled_low_ram_device);
+        }
     }
 
     @Override
@@ -129,7 +138,7 @@
                 pref.setTitle(summary);
             }
             pref.setKey(cn.flattenToString());
-            pref.setChecked(mServiceListing.isEnabled(cn));
+            pref.setChecked(isServiceEnabled(cn));
             if (managedProfileId != UserHandle.USER_NULL
                     && !mDpm.isNotificationListenerServicePermitted(
                             service.packageName, managedProfileId)) {
@@ -153,6 +162,10 @@
         return UserHandle.myUserId();
     }
 
+    protected boolean isServiceEnabled(ComponentName cn) {
+        return mServiceListing.isEnabled(cn);
+    }
+
     protected boolean setEnabled(ComponentName service, String title, boolean enable) {
         if (!enable) {
             // the simple version: disabling
@@ -170,6 +183,10 @@
         }
     }
 
+    protected void enable(ComponentName service) {
+        mServiceListing.setEnabled(service, true);
+    }
+
     public static class ScaryWarningDialogFragment extends InstrumentedDialogFragment {
         static final String KEY_COMPONENT = "c";
         static final String KEY_LABEL = "l";
@@ -207,7 +224,7 @@
                     .setPositiveButton(R.string.allow,
                             new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialog, int id) {
-                                    parent.mServiceListing.setEnabled(cn, true);
+                                    parent.enable(cn);
                                 }
                             })
                     .setNegativeButton(R.string.deny,
@@ -223,7 +240,6 @@
     public static class Config {
         public String tag;
         public String setting;
-        public String secondarySetting;
         public String intentAction;
         public String permission;
         public String noun;
diff --git a/src/com/android/settings/utils/ZenServiceListing.java b/src/com/android/settings/utils/ZenServiceListing.java
index 167b066..40a4f34 100644
--- a/src/com/android/settings/utils/ZenServiceListing.java
+++ b/src/com/android/settings/utils/ZenServiceListing.java
@@ -16,6 +16,7 @@
 package com.android.settings.utils;
 
 import android.app.ActivityManager;
+import android.app.NotificationManager;
 import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -35,16 +36,16 @@
 
 public class ZenServiceListing {
 
-    private final ContentResolver mContentResolver;
     private final Context mContext;
     private final ManagedServiceSettings.Config mConfig;
     private final Set<ServiceInfo> mApprovedServices = new ArraySet<ServiceInfo>();
     private final List<Callback> mZenCallbacks = new ArrayList<>();
+    private final NotificationManager mNm;
 
     public ZenServiceListing(Context context, ManagedServiceSettings.Config config) {
         mContext = context;
         mConfig = config;
-        mContentResolver = context.getContentResolver();
+        mNm = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
     }
 
     public ServiceInfo findService(final ComponentName cn) {
@@ -67,23 +68,18 @@
 
     public void reloadApprovedServices() {
         mApprovedServices.clear();
-        String[] settings = {mConfig.setting, mConfig.secondarySetting};
 
-        for (String setting : settings) {
-            if (!TextUtils.isEmpty(setting)) {
-                final String flat = Settings.Secure.getString(mContentResolver, setting);
-                if (!TextUtils.isEmpty(flat)) {
-                    final List<String> names = Arrays.asList(flat.split(":"));
-                    List<ServiceInfo> services = new ArrayList<>();
-                    getServices(mConfig, services, mContext.getPackageManager());
-                    for (ServiceInfo service : services) {
-                        if (matchesApprovedPackage(names, service.getComponentName())) {
-                            mApprovedServices.add(service);
-                        }
-                    }
-                }
+        List<String> enabledNotificationListenerPkgs = mNm.getEnabledNotificationListenerPackages();
+        List<ServiceInfo> services = new ArrayList<>();
+        getServices(mConfig, services, mContext.getPackageManager());
+        for (ServiceInfo service : services) {
+            final String servicePackage = service.getComponentName().getPackageName();
+            if (mNm.isNotificationPolicyAccessGrantedForPackage(servicePackage)
+                || enabledNotificationListenerPkgs.contains(servicePackage)) {
+                mApprovedServices.add(service);
             }
         }
+
         if (!mApprovedServices.isEmpty()) {
             for (Callback callback : mZenCallbacks) {
                 callback.onServicesReloaded(mApprovedServices);
@@ -91,25 +87,6 @@
         }
     }
 
-    // Setting could contain: the component name of the condition provider, the package name of
-    // the condition provider, the component name of the notification listener.
-    private boolean matchesApprovedPackage(List<String> approved, ComponentName serviceOwner) {
-        String flatCn = serviceOwner.flattenToString();
-        if (approved.contains(flatCn) || approved.contains(serviceOwner.getPackageName())) {
-            return true;
-        }
-        for (String entry : approved) {
-            if (!TextUtils.isEmpty(entry)) {
-                ComponentName approvedComponent = ComponentName.unflattenFromString(entry);
-                if (approvedComponent != null && approvedComponent.getPackageName().equals(
-                        serviceOwner.getPackageName())) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
     private static int getServices(ManagedServiceSettings.Config c, List<ServiceInfo> list,
             PackageManager pm) {
         int services = 0;
diff --git a/src/com/android/settings/vpn2/AppManagementFragment.java b/src/com/android/settings/vpn2/AppManagementFragment.java
index 9981b2f..9e215d1 100644
--- a/src/com/android/settings/vpn2/AppManagementFragment.java
+++ b/src/com/android/settings/vpn2/AppManagementFragment.java
@@ -15,6 +15,8 @@
  */
 package com.android.settings.vpn2;
 
+import static android.app.AppOpsManager.OP_ACTIVATE_VPN;
+
 import android.annotation.NonNull;
 import android.app.AlertDialog;
 import android.app.AppOpsManager;
@@ -27,7 +29,6 @@
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.net.ConnectivityManager;
 import android.net.IConnectivityManager;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.os.ServiceManager;
@@ -45,13 +46,11 @@
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import com.android.settingslib.RestrictedSwitchPreference;
 import com.android.settingslib.RestrictedPreference;
+import com.android.settingslib.RestrictedSwitchPreference;
 
 import java.util.List;
 
-import static android.app.AppOpsManager.OP_ACTIVATE_VPN;
-
 public class AppManagementFragment extends SettingsPreferenceFragment
         implements Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener,
         ConfirmLockdownFragment.ConfirmLockdownListener {
@@ -223,19 +222,6 @@
                 isEnabled ? mPackageName : null, isLockdown);
     }
 
-    @VisibleForTesting
-    static boolean isAlwaysOnSupportedByApp(@NonNull ApplicationInfo appInfo) {
-        final int targetSdk = appInfo.targetSdkVersion;
-        if (targetSdk < Build.VERSION_CODES.N) {
-            if (Log.isLoggable(TAG, Log.DEBUG)) {
-                Log.d(TAG, "Package " + appInfo.packageName + " targets SDK version: " + targetSdk
-                        + "; must target at least " + Build.VERSION_CODES.N + " to use always-on.");
-            }
-            return false;
-        }
-        return true;
-    }
-
     private void updateUI() {
         if (isAdded()) {
             final boolean alwaysOn = isVpnAlwaysOn();
@@ -257,7 +243,7 @@
             mPreferenceForget.checkRestrictionAndSetDisabled(UserManager.DISALLOW_CONFIG_VPN,
                     mUserId);
 
-            if (isAlwaysOnSupportedByApp(mPackageInfo.applicationInfo)) {
+            if (mConnectivityManager.isAlwaysOnVpnPackageSupportedForUser(mUserId, mPackageName)) {
                 // setSummary doesn't override the admin message when user restriction is applied
                 mPreferenceAlwaysOn.setSummary(R.string.vpn_always_on_summary);
                 // setEnabled is not required here, as checkRestrictionAndSetDisabled
diff --git a/src/com/android/settings/webview/WebViewAppPreferenceController.java b/src/com/android/settings/webview/WebViewAppPreferenceController.java
index 2f3246c..c774093 100644
--- a/src/com/android/settings/webview/WebViewAppPreferenceController.java
+++ b/src/com/android/settings/webview/WebViewAppPreferenceController.java
@@ -26,7 +26,6 @@
 
     private static final String WEBVIEW_APP_KEY = "select_webview_provider";
 
-    private final Context mContext;
     private final WebViewUpdateServiceWrapper mWebViewUpdateServiceWrapper;
     private Preference mPreference;
 
@@ -37,7 +36,6 @@
     public WebViewAppPreferenceController(Context context,
             WebViewUpdateServiceWrapper webviewUpdateServiceWrapper) {
         super(context);
-        mContext = context;
         mWebViewUpdateServiceWrapper = webviewUpdateServiceWrapper;
     }
 
diff --git a/src/com/android/settings/widget/ActionBarShadowController.java b/src/com/android/settings/widget/ActionBarShadowController.java
index 0c6b02f..3ffa0ac 100644
--- a/src/com/android/settings/widget/ActionBarShadowController.java
+++ b/src/com/android/settings/widget/ActionBarShadowController.java
@@ -121,7 +121,7 @@
             final boolean shouldShowShadow = view.canScrollVertically(-1);
             if (mAnchorView != null) {
                 mAnchorView.setElevation(shouldShowShadow ? ELEVATION_HIGH : ELEVATION_LOW);
-            } else {
+            } else if (mActivity != null) { // activity can become null when running monkey
                 final ActionBar actionBar = mActivity.getActionBar();
                 if (actionBar != null) {
                     actionBar.setElevation(shouldShowShadow ? ELEVATION_HIGH : ELEVATION_LOW);
diff --git a/src/com/android/settings/widget/DonutView.java b/src/com/android/settings/widget/DonutView.java
index b50a50a..330249b 100644
--- a/src/com/android/settings/widget/DonutView.java
+++ b/src/com/android/settings/widget/DonutView.java
@@ -17,19 +17,24 @@
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;
 import android.graphics.Paint;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.Typeface;
+import android.support.annotation.ColorRes;
 import android.text.TextPaint;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
 
 import com.android.settings.R;
 import com.android.settings.Utils;
 
+import java.util.Locale;
+
 /**
  * DonutView represents a donut graph. It visualizes a certain percentage of fullness with a
  * corresponding label with the fullness on the inside (i.e. "50%" inside of the donut).
@@ -46,6 +51,9 @@
     private TextPaint mBigNumberPaint;
     private String mPercentString;
     private String mFullString;
+    private boolean mShowPercentString = true;
+    private int mMeterBackgroundColor;
+    private int mMeterConsumedColor;
 
     public DonutView(Context context) {
         super(context);
@@ -53,35 +61,63 @@
 
     public DonutView(Context context, AttributeSet attrs) {
         super(context, attrs);
-        mStrokeWidth = context.getResources().getDimension(R.dimen.storage_donut_thickness);
-        final ColorFilter mAccentColorFilter =
-                new PorterDuffColorFilter(
-                        Utils.getColorAttr(context, android.R.attr.colorAccent),
-                        PorterDuff.Mode.SRC_IN);
+        mMeterBackgroundColor = context.getColor(R.color.meter_background_color);
+        mMeterConsumedColor = Utils.getDefaultColor(mContext, R.color.meter_consumed_color);
+        boolean applyColorAccent = true;
+        Resources resources = context.getResources();
+        mStrokeWidth = resources.getDimension(R.dimen.storage_donut_thickness);
+
+        if (attrs != null) {
+            TypedArray styledAttrs = context.obtainStyledAttributes(attrs, R.styleable.DonutView);
+            mMeterBackgroundColor = styledAttrs.getColor(R.styleable.DonutView_meterBackgroundColor,
+                    mMeterBackgroundColor);
+            mMeterConsumedColor = styledAttrs.getColor(R.styleable.DonutView_meterConsumedColor,
+                    mMeterConsumedColor);
+            applyColorAccent = styledAttrs.getBoolean(R.styleable.DonutView_applyColorAccent,
+                    true);
+            mShowPercentString = styledAttrs.getBoolean(R.styleable.DonutView_showPercentString,
+                    true);
+            mStrokeWidth = styledAttrs.getDimensionPixelSize(R.styleable.DonutView_thickness,
+                    (int) mStrokeWidth);
+            styledAttrs.recycle();
+        }
 
         mBackgroundCircle = new Paint();
         mBackgroundCircle.setAntiAlias(true);
         mBackgroundCircle.setStrokeCap(Paint.Cap.BUTT);
         mBackgroundCircle.setStyle(Paint.Style.STROKE);
         mBackgroundCircle.setStrokeWidth(mStrokeWidth);
-        mBackgroundCircle.setColorFilter(mAccentColorFilter);
-        mBackgroundCircle.setColor(context.getColor(R.color.meter_background_color));
+        mBackgroundCircle.setColor(mMeterBackgroundColor);
 
         mFilledArc = new Paint();
         mFilledArc.setAntiAlias(true);
         mFilledArc.setStrokeCap(Paint.Cap.BUTT);
         mFilledArc.setStyle(Paint.Style.STROKE);
         mFilledArc.setStrokeWidth(mStrokeWidth);
-        mFilledArc.setColor(Utils.getDefaultColor(mContext, R.color.meter_consumed_color));
-        mFilledArc.setColorFilter(mAccentColorFilter);
+        mFilledArc.setColor(mMeterConsumedColor);
 
-        Resources resources = context.getResources();
+        if (applyColorAccent) {
+            final ColorFilter mAccentColorFilter =
+                    new PorterDuffColorFilter(
+                            Utils.getColorAttr(context, android.R.attr.colorAccent),
+                            PorterDuff.Mode.SRC_IN);
+            mBackgroundCircle.setColorFilter(mAccentColorFilter);
+            mFilledArc.setColorFilter(mAccentColorFilter);
+        }
+
+        final Locale locale = resources.getConfiguration().locale;
+        final int layoutDirection = TextUtils.getLayoutDirectionFromLocale(locale);
+        final int bidiFlags = (layoutDirection == LAYOUT_DIRECTION_LTR)
+                ? Paint.BIDI_LTR
+                : Paint.BIDI_RTL;
+
         mTextPaint = new TextPaint();
         mTextPaint.setColor(Utils.getColorAccent(getContext()));
         mTextPaint.setAntiAlias(true);
         mTextPaint.setTextSize(
                 resources.getDimension(R.dimen.storage_donut_view_label_text_size));
         mTextPaint.setTextAlign(Paint.Align.CENTER);
+        mTextPaint.setBidiFlags(bidiFlags);
 
         mBigNumberPaint = new TextPaint();
         mBigNumberPaint.setColor(Utils.getColorAccent(getContext()));
@@ -92,13 +128,16 @@
         mBigNumberPaint.setTypeface(Typeface.create(
                 context.getString(com.android.internal.R.string.config_headlineFontFamily),
                 Typeface.NORMAL));
+        mBigNumberPaint.setBidiFlags(bidiFlags);
     }
 
     @Override
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
         drawDonut(canvas);
-        drawInnerText(canvas);
+        if (mShowPercentString) {
+            drawInnerText(canvas);
+        }
     }
 
     private void drawDonut(Canvas canvas) {
@@ -154,6 +193,28 @@
         invalidate();
     }
 
+    @ColorRes
+    public int getMeterBackgroundColor() {
+        return mMeterBackgroundColor;
+    }
+
+    public void setMeterBackgroundColor(@ColorRes int meterBackgroundColor) {
+        mMeterBackgroundColor = meterBackgroundColor;
+        mBackgroundCircle.setColor(meterBackgroundColor);
+        invalidate();
+    }
+
+    @ColorRes
+    public int getMeterConsumedColor() {
+        return mMeterConsumedColor;
+    }
+
+    public void setMeterConsumedColor(@ColorRes int meterConsumedColor) {
+        mMeterConsumedColor = meterConsumedColor;
+        mFilledArc.setColor(meterConsumedColor);
+        invalidate();
+    }
+
     private float getTextHeight(TextPaint paint) {
         // Technically, this should be the cap height, but I can live with the descent - ascent.
         return paint.descent() - paint.ascent();
diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java
index 8f64920..c38ad02 100644
--- a/src/com/android/settings/widget/EntityHeaderController.java
+++ b/src/com/android/settings/widget/EntityHeaderController.java
@@ -39,7 +39,6 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.android.settings.AppHeader;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.applications.AppInfoBase;
@@ -59,15 +58,13 @@
 public class EntityHeaderController {
 
     @IntDef({ActionType.ACTION_NONE,
-            ActionType.ACTION_APP_INFO,
             ActionType.ACTION_APP_PREFERENCE,
             ActionType.ACTION_NOTIF_PREFERENCE})
     @Retention(RetentionPolicy.SOURCE)
     public @interface ActionType {
         int ACTION_NONE = 0;
-        int ACTION_APP_INFO = 1;
-        int ACTION_APP_PREFERENCE = 2;
-        int ACTION_NOTIF_PREFERENCE = 3;
+        int ACTION_APP_PREFERENCE = 1;
+        int ACTION_NOTIF_PREFERENCE = 2;
     }
 
     public static final String PREF_KEY_APP_HEADER = "pref_app_header";
@@ -94,6 +91,8 @@
     @ActionType
     private int mAction2;
 
+    private boolean mHasAppInfoLink;
+
     private boolean mIsInstantApp;
 
     /**
@@ -177,6 +176,11 @@
         return this;
     }
 
+    public EntityHeaderController setHasAppInfoLink(boolean hasAppInfoLink) {
+        mHasAppInfoLink = hasAppInfoLink;
+        return this;
+    }
+
     public EntityHeaderController setButtonActions(@ActionType int action1,
             @ActionType int action2) {
         mAction1 = action1;
@@ -211,6 +215,7 @@
         final LayoutPreference pref = new LayoutPreference(uiContext, done(activity));
         // Makes sure it's the first preference onscreen.
         pref.setOrder(-1000);
+        pref.setSelectable(false);
         pref.setKey(PREF_KEY_APP_HEADER);
         return pref;
     }
@@ -243,14 +248,40 @@
      * Only binds entity header with button actions.
      */
     public EntityHeaderController bindHeaderButtons() {
-        ImageButton button1 = mHeader.findViewById(android.R.id.button1);
-        ImageButton button2 = mHeader.findViewById(android.R.id.button2);
-
+        final View entityHeaderContent = mHeader.findViewById(R.id.entity_header_content);
+        final ImageButton button1 = mHeader.findViewById(android.R.id.button1);
+        final ImageButton button2 = mHeader.findViewById(android.R.id.button2);
+        bindAppInfoLink(entityHeaderContent);
         bindButton(button1, mAction1);
         bindButton(button2, mAction2);
         return this;
     }
 
+    private void bindAppInfoLink(View entityHeaderContent) {
+        if (!mHasAppInfoLink) {
+            // Caller didn't ask for app link, skip.
+            return;
+        }
+        if (entityHeaderContent == null
+                || mPackageName == null
+                || mPackageName.equals(Utils.OS_PKG)
+                || mUid == UserHandle.USER_NULL) {
+            Log.w(TAG, "Missing ingredients to build app info link, skip");
+            return;
+        }
+        entityHeaderContent.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                AppInfoBase.startAppInfoFragment(
+                        InstalledAppDetails.class, R.string.application_info_label,
+                        mPackageName, mUid, mFragment, 0 /* request */,
+                        mMetricsCategory);
+
+            }
+        });
+        return;
+    }
+
     public EntityHeaderController styleActionBar(Activity activity) {
         if (activity == null) {
             Log.w(TAG, "No activity, cannot style actionbar.");
@@ -284,29 +315,6 @@
             return;
         }
         switch (action) {
-            case ActionType.ACTION_APP_INFO: {
-                if (mPackageName == null || mPackageName.equals(Utils.OS_PKG)
-                        || mUid == UserHandle.USER_NULL
-                        || !AppHeader.includeAppInfo(mFragment)) {
-                    button.setVisibility(View.GONE);
-                } else {
-                    button.setContentDescription(
-                            mAppContext.getString(R.string.application_info_label));
-                    button.setImageResource(com.android.settings.R.drawable.ic_info);
-                    button.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            AppInfoBase.startAppInfoFragment(
-                                    InstalledAppDetails.class, R.string.application_info_label,
-                                    mPackageName, mUid, mFragment, 0 /* request */,
-                                    mMetricsCategory);
-
-                        }
-                    });
-                    button.setVisibility(View.VISIBLE);
-                }
-                return;
-            }
             case ActionType.ACTION_NOTIF_PREFERENCE: {
                 if (mAppNotifPrefIntent == null) {
                     button.setVisibility(View.GONE);
@@ -328,6 +336,7 @@
                 final Intent intent = resolveIntent(
                         new Intent(Intent.ACTION_APPLICATION_PREFERENCES).setPackage(mPackageName));
                 if (intent == null) {
+                    button.setImageDrawable(null);
                     button.setVisibility(View.GONE);
                     return;
                 }
@@ -340,6 +349,7 @@
                         mFragment.startActivity(intent);
                     }
                 });
+                button.setImageResource(R.drawable.ic_settings_24dp);
                 button.setVisibility(View.VISIBLE);
                 return;
             }
diff --git a/src/com/android/settings/widget/FixedLineSummaryPreference.java b/src/com/android/settings/widget/FixedLineSummaryPreference.java
index c83dff4..efc8aa2 100644
--- a/src/com/android/settings/widget/FixedLineSummaryPreference.java
+++ b/src/com/android/settings/widget/FixedLineSummaryPreference.java
@@ -21,7 +21,6 @@
 import android.text.TextUtils.TruncateAt;
 import android.util.AttributeSet;
 import android.widget.TextView;
-
 import com.android.settings.R;
 
 /**
@@ -41,6 +40,7 @@
         } else {
             mSummaryLineCount = 1;
         }
+        a.recycle();
     }
 
     public void setSummaryLineCount(int count) {
diff --git a/src/com/android/settings/widget/LabeledSeekBar.java b/src/com/android/settings/widget/LabeledSeekBar.java
index f1a6788..8e5a30b 100644
--- a/src/com/android/settings/widget/LabeledSeekBar.java
+++ b/src/com/android/settings/widget/LabeledSeekBar.java
@@ -201,6 +201,7 @@
             int posBase = Math.max(0,
                     ((int) x - LabeledSeekBar.this.getPaddingStart()) / getHalfVirtualViewWidth());
             posBase = (posBase + 1) / 2;
+            posBase = Math.min(posBase, LabeledSeekBar.this.getMax());
             return mIsLayoutRtl ? LabeledSeekBar.this.getMax() - posBase : posBase;
         }
 
diff --git a/src/com/android/settings/widget/LoadingViewController.java b/src/com/android/settings/widget/LoadingViewController.java
new file mode 100644
index 0000000..294e55e
--- /dev/null
+++ b/src/com/android/settings/widget/LoadingViewController.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.widget;
+
+import android.os.Handler;
+import android.os.Looper;
+import android.view.View;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
+
+/**
+ * A helper class that manages show/hide loading spinner.
+ */
+public class LoadingViewController {
+
+    private static final long DELAY_SHOW_LOADING_CONTAINER_THRESHOLD_MS = 100L;
+
+    public final Handler mFgHandler;
+    public final View mLoadingView;
+    public final View mContentView;
+
+    public LoadingViewController(View loadingView, View contentView) {
+        mLoadingView = loadingView;
+        mContentView = contentView;
+        mFgHandler = new Handler(Looper.getMainLooper());
+    }
+
+    private Runnable mShowLoadingContainerRunnable = new Runnable() {
+        public void run() {
+            handleLoadingContainer(false /* done */, false /* animate */);
+        }
+    };
+
+    public void showContent(boolean animate) {
+        // Cancel any pending task to show the loading animation and show the list of
+        // apps directly.
+        mFgHandler.removeCallbacks(mShowLoadingContainerRunnable);
+        handleLoadingContainer(true /* show */, animate);
+    }
+
+    public void showLoadingViewDelayed() {
+        mFgHandler.postDelayed(
+                mShowLoadingContainerRunnable, DELAY_SHOW_LOADING_CONTAINER_THRESHOLD_MS);
+    }
+
+    public void handleLoadingContainer(boolean done, boolean animate) {
+        handleLoadingContainer(mLoadingView, mContentView, done, animate);
+    }
+
+    /**
+     * Show/hide loading view and content view.
+     *
+     * @param loading The loading spinner view
+     * @param content The content view
+     * @param done    If true, content is set visible and loading is set invisible.
+     * @param animate Whether or not content/loading views should animate in/out.
+     */
+    public static void handleLoadingContainer(View loading, View content, boolean done,
+            boolean animate) {
+        setViewShown(loading, !done, animate);
+        setViewShown(content, done, animate);
+    }
+
+    private static void setViewShown(final View view, boolean shown, boolean animate) {
+        if (animate) {
+            Animation animation = AnimationUtils.loadAnimation(view.getContext(),
+                    shown ? android.R.anim.fade_in : android.R.anim.fade_out);
+            if (shown) {
+                view.setVisibility(View.VISIBLE);
+            } else {
+                animation.setAnimationListener(new Animation.AnimationListener() {
+                    @Override
+                    public void onAnimationStart(Animation animation) {
+                    }
+
+                    @Override
+                    public void onAnimationRepeat(Animation animation) {
+                    }
+
+                    @Override
+                    public void onAnimationEnd(Animation animation) {
+                        view.setVisibility(View.INVISIBLE);
+                    }
+                });
+            }
+            view.startAnimation(animation);
+        } else {
+            view.clearAnimation();
+            view.setVisibility(shown ? View.VISIBLE : View.INVISIBLE);
+        }
+    }
+}
diff --git a/src/com/android/settings/widget/RadioButtonPickerFragment.java b/src/com/android/settings/widget/RadioButtonPickerFragment.java
index 2444539..6854793 100644
--- a/src/com/android/settings/widget/RadioButtonPickerFragment.java
+++ b/src/com/android/settings/widget/RadioButtonPickerFragment.java
@@ -118,7 +118,7 @@
             String key, CandidateInfo info, String defaultKey, String systemDefaultKey) {
     }
 
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    @VisibleForTesting
     public void updateCandidates() {
         mCandidates.clear();
         final List<? extends CandidateInfo> candidateList = getCandidates();
@@ -139,16 +139,18 @@
             nonePref.setOnClickListener(this);
             screen.addPreference(nonePref);
         }
-        for (Map.Entry<String, CandidateInfo> app : mCandidates.entrySet()) {
-            RadioButtonPreference pref = new RadioButtonPreference(getPrefContext());
-            bindPreference(pref, app.getKey(), app.getValue(), defaultKey);
-            bindPreferenceExtra(pref, app.getKey(), app.getValue(), defaultKey, systemDefaultKey);
-            screen.addPreference(pref);
+        if (candidateList != null) {
+            for (CandidateInfo info : candidateList) {
+                RadioButtonPreference pref = new RadioButtonPreference(getPrefContext());
+                bindPreference(pref, info.getKey(), info, defaultKey);
+                bindPreferenceExtra(pref, info.getKey(), info, defaultKey, systemDefaultKey);
+                screen.addPreference(pref);
+            }
         }
         mayCheckOnlyRadioButton();
     }
 
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    @VisibleForTesting
     public RadioButtonPreference bindPreference(RadioButtonPreference pref,
             String key, CandidateInfo info, String defaultKey) {
         pref.setTitle(info.loadLabel());
@@ -162,7 +164,7 @@
         return pref;
     }
 
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    @VisibleForTesting
     public void updateCheckedState(String selectedKey) {
         final PreferenceScreen screen = getPreferenceScreen();
         if (screen != null) {
@@ -180,7 +182,7 @@
         }
     }
 
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    @VisibleForTesting
     public void mayCheckOnlyRadioButton() {
         final PreferenceScreen screen = getPreferenceScreen();
         // If there is only 1 thing on screen, select it.
diff --git a/src/com/android/settings/widget/SwitchBar.java b/src/com/android/settings/widget/SwitchBar.java
index 7bf6a83..3d30638 100644
--- a/src/com/android/settings/widget/SwitchBar.java
+++ b/src/com/android/settings/widget/SwitchBar.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.widget;
 
+import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Parcel;
@@ -41,8 +43,6 @@
 
 import java.util.ArrayList;
 
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
 public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedChangeListener,
         View.OnClickListener {
 
@@ -71,8 +71,7 @@
 
     private String mMetricsTag;
 
-    private ArrayList<OnSwitchChangeListener> mSwitchChangeListeners =
-            new ArrayList<OnSwitchChangeListener>();
+    private final ArrayList<OnSwitchChangeListener> mSwitchChangeListeners = new ArrayList<>();
 
     private static int[] XML_ATTRIBUTES = {
             R.attr.switchBarMarginStart, R.attr.switchBarMarginEnd,
diff --git a/src/com/android/settings/widget/ValidatedEditTextPreference.java b/src/com/android/settings/widget/ValidatedEditTextPreference.java
new file mode 100644
index 0000000..58c62eb
--- /dev/null
+++ b/src/com/android/settings/widget/ValidatedEditTextPreference.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.widget;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.support.annotation.VisibleForTesting;
+import android.text.Editable;
+import android.text.InputType;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+import android.widget.EditText;
+
+import com.android.settingslib.CustomEditTextPreference;
+
+/**
+ * {@code EditTextPreference} that supports input validation.
+ */
+public class ValidatedEditTextPreference extends CustomEditTextPreference {
+
+    public interface Validator {
+        boolean isTextValid(String value);
+    }
+
+    private final EditTextWatcher mTextWatcher = new EditTextWatcher();
+    private Validator mValidator;
+    private boolean mIsPassword;
+
+    public ValidatedEditTextPreference(Context context, AttributeSet attrs,
+            int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public ValidatedEditTextPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public ValidatedEditTextPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public ValidatedEditTextPreference(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected void onBindDialogView(View view) {
+        super.onBindDialogView(view);
+        final EditText editText = view.findViewById(android.R.id.edit);
+        if (editText != null && !TextUtils.isEmpty(editText.getText())) {
+            editText.setSelection(editText.getText().length());
+        }
+        if (mValidator != null && editText != null) {
+            editText.removeTextChangedListener(mTextWatcher);
+            if (mIsPassword) {
+                editText.setInputType(
+                        InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+                editText.setMaxLines(1);
+            }
+            editText.addTextChangedListener(mTextWatcher);
+        }
+    }
+
+    public void setIsPassword(boolean isPassword) {
+        mIsPassword = isPassword;
+    }
+
+    @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+    public boolean isPassword() {
+        return mIsPassword;
+    }
+
+    public void setValidator(Validator validator) {
+        mValidator = validator;
+    }
+
+    private class EditTextWatcher implements TextWatcher {
+        @Override
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
+        }
+
+        @Override
+        public void beforeTextChanged(CharSequence s, int start, int before, int count) {
+        }
+
+        @Override
+        public void afterTextChanged(Editable s) {
+            final EditText editText = getEditText();
+            if (mValidator != null && editText != null) {
+                final AlertDialog dialog = (AlertDialog) getDialog();
+                final boolean valid = mValidator.isTextValid(editText.getText().toString());
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(valid);
+            }
+        }
+    }
+
+}
diff --git a/src/com/android/settings/widget/VideoPreference.java b/src/com/android/settings/widget/VideoPreference.java
index e06ef56..a3ac6a3 100644
--- a/src/com/android/settings/widget/VideoPreference.java
+++ b/src/com/android/settings/widget/VideoPreference.java
@@ -45,6 +45,7 @@
     private MediaPlayer mMediaPlayer;
     private boolean mAnimationAvailable;
     private boolean mVideoReady;
+    private boolean mVideoPaused;
     private int mPreviewResource;
 
     public VideoPreference(Context context, AttributeSet attrs) {
@@ -100,9 +101,11 @@
                 if (mMediaPlayer.isPlaying()) {
                     mMediaPlayer.pause();
                     playButton.setVisibility(View.VISIBLE);
+                    mVideoPaused = true;
                 } else {
                     mMediaPlayer.start();
                     playButton.setVisibility(View.GONE);
+                    mVideoPaused = false;
                 }
             }
         });
@@ -131,8 +134,14 @@
 
             @Override
             public void onSurfaceTextureUpdated(SurfaceTexture surfaceTexture) {
-                if (mVideoReady && imageView.getVisibility() == View.VISIBLE) {
-                    imageView.setVisibility(View.GONE);
+                if (mVideoReady) {
+                    if (imageView.getVisibility() == View.VISIBLE) {
+                        imageView.setVisibility(View.GONE);
+                    }
+                    if (!mVideoPaused && mMediaPlayer != null && !mMediaPlayer.isPlaying()) {
+                        mMediaPlayer.start();
+                        playButton.setVisibility(View.GONE);
+                    }
                 }
                 if (mMediaPlayer != null && !mMediaPlayer.isPlaying() &&
                         playButton.getVisibility() != View.VISIBLE) {
@@ -152,7 +161,8 @@
         super.onDetached();
     }
 
-    public void onViewVisible() {
+    public void onViewVisible(boolean videoPaused) {
+        mVideoPaused = videoPaused;
         if (mVideoReady && mMediaPlayer != null && !mMediaPlayer.isPlaying()) {
             mMediaPlayer.seekTo(0);
         }
@@ -163,4 +173,9 @@
             mMediaPlayer.pause();
         }
     }
+
+    public boolean isVideoPaused() {
+        return mVideoPaused;
+    }
+
 }
diff --git a/src/com/android/settings/wifi/CellularFallbackPreferenceController.java b/src/com/android/settings/wifi/CellularFallbackPreferenceController.java
index 4e9174c..2baf261 100644
--- a/src/com/android/settings/wifi/CellularFallbackPreferenceController.java
+++ b/src/com/android/settings/wifi/CellularFallbackPreferenceController.java
@@ -22,13 +22,15 @@
 import android.support.v7.preference.Preference;
 import android.text.TextUtils;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 /**
- * {@link PreferenceController} that controls whether we should fall back to celluar when wifi is
- * bad.
+ * {@link AbstractPreferenceController} that controls whether we should fall back to celluar when
+ * wifi is bad.
  */
-public class CellularFallbackPreferenceController extends PreferenceController {
+public class CellularFallbackPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
 
     private static final String KEY_CELLULAR_FALLBACK = "wifi_cellular_data_fallback";
 
diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java
index c3aaba5..4199a6d 100644
--- a/src/com/android/settings/wifi/ConfigureWifiSettings.java
+++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java
@@ -19,13 +19,14 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 import android.net.NetworkScoreManager;
 import android.net.wifi.WifiManager;
 import android.provider.SearchIndexableResource;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.network.NetworkScoreManagerWrapper;
 import com.android.settings.network.NetworkScorerPickerPreferenceController;
@@ -33,6 +34,7 @@
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.wifi.p2p.WifiP2pPreferenceController;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -42,6 +44,8 @@
 
     private static final String TAG = "ConfigureWifiSettings";
 
+    public static final String KEY_IP_ADDRESS = "current_ip_address";
+
     private WifiWakeupPreferenceController mWifiWakeupPreferenceController;
     private UseOpenWifiPreferenceController mUseOpenWifiPreferenceController;
 
@@ -74,15 +78,15 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
         final NetworkScoreManagerWrapper networkScoreManagerWrapper =
                 new NetworkScoreManagerWrapper(context.getSystemService(NetworkScoreManager.class));
         mWifiWakeupPreferenceController = new WifiWakeupPreferenceController(
-                context, getLifecycle(), networkScoreManagerWrapper);
+                context, getLifecycle());
         mUseOpenWifiPreferenceController = new UseOpenWifiPreferenceController(context, this,
                 networkScoreManagerWrapper, getLifecycle());
         final WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
-        final List<PreferenceController> controllers = new ArrayList<>();
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(mWifiWakeupPreferenceController);
         controllers.add(new NetworkScorerPickerPreferenceController(context,
                 networkScoreManagerWrapper));
@@ -114,5 +118,22 @@
                     sir.xmlResId = R.xml.wifi_configure_settings;
                     return Arrays.asList(sir);
                 }
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    List<String> keys =  super.getNonIndexableKeys(context);
+
+                    // If connected to WiFi, this IP address will be the same as the Status IP.
+                    // Or, if there is no connection they will say unavailable.
+                    ConnectivityManager cm = (ConnectivityManager)
+                            context.getSystemService(Context.CONNECTIVITY_SERVICE);
+                    NetworkInfo info = cm.getActiveNetworkInfo();
+                    if (info == null
+                            || info.getType() == ConnectivityManager.TYPE_WIFI) {
+                        keys.add(KEY_IP_ADDRESS);
+                    }
+
+                    return keys;
+                }
             };
 }
diff --git a/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java b/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java
index 7cf19f2..79b7653 100644
--- a/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java
+++ b/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java
@@ -27,18 +27,19 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
 /**
- * {@link PreferenceController} that controls whether we should notify user when open network is
- * available.
+ * {@link AbstractPreferenceController} that controls whether we should notify user when open
+ * network is available.
  */
-public class NotifyOpenNetworksPreferenceController extends PreferenceController implements
-        LifecycleObserver, OnResume, OnPause {
+public class NotifyOpenNetworksPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {
 
     private static final String KEY_NOTIFY_OPEN_NETWORKS = "notify_open_networks";
     private SettingObserver mSettingObserver;
diff --git a/src/com/android/settings/wifi/OWNERS b/src/com/android/settings/wifi/OWNERS
new file mode 100644
index 0000000..3090f13
--- /dev/null
+++ b/src/com/android/settings/wifi/OWNERS
@@ -0,0 +1,9 @@
+# Default reviewers for this and subdirectories.
+asargent@google.com
+easchwar@google.com
+dling@google.com
+jlapenna@google.com
+sghuman@google.com
+zhfan@google.com
+
+# Emergency approvers in case the above are not available
\ No newline at end of file
diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
index ee4acd1..5cb3679 100644
--- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
+++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
@@ -16,19 +16,20 @@
 
 package com.android.settings.wifi;
 
+import android.annotation.Nullable;
+import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.res.Resources;
 import android.icu.text.Collator;
-import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
-import android.net.wifi.hotspot2.PasspointConfiguration;
 import android.os.Bundle;
 import android.provider.SearchIndexableResource;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 import android.util.Log;
 
+import android.widget.Toast;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
@@ -48,6 +49,7 @@
 
 /**
  * UI to manage saved networks/access points.
+ * TODO(b/64806699): convert to {@link DashboardFragment} with {@link PreferenceController}s
  */
 public class SavedAccessPointsWifiSettings extends SettingsPreferenceFragment
         implements Indexable, WifiDialog.WifiDialogListener {
@@ -78,11 +80,28 @@
         }
     };
 
+    private final WifiManager.ActionListener mSaveListener = new WifiManager.ActionListener() {
+        @Override
+        public void onSuccess() {
+            initPreferences();
+        }
+        @Override
+        public void onFailure(int reason) {
+            Activity activity = getActivity();
+            if (activity != null) {
+                Toast.makeText(activity,
+                    R.string.wifi_failed_save_message,
+                    Toast.LENGTH_SHORT).show();
+            }
+        }
+    };
+
     private WifiDialog mDialog;
     private WifiManager mWifiManager;
     private AccessPoint mDlgAccessPoint;
     private Bundle mAccessPointSavedState;
     private AccessPoint mSelectedAccessPoint;
+    private Preference mAddNetworkPreference;
 
     private AccessPointPreference.UserBadgeCache mUserBadgeCache;
 
@@ -142,23 +161,38 @@
                 preference.setIcon(null);
                 preferenceScreen.addPreference(preference);
             }
+            preference.setOrder(i);
         }
 
         removeCachedPrefs(preferenceScreen);
 
+        if (mAddNetworkPreference == null) {
+            mAddNetworkPreference = new Preference(getPrefContext());
+            mAddNetworkPreference.setIcon(R.drawable.ic_menu_add_inset);
+            mAddNetworkPreference.setTitle(R.string.wifi_add_network);
+        }
+        mAddNetworkPreference.setOrder(accessPointsSize);
+        preferenceScreen.addPreference(mAddNetworkPreference);
+
         if(getPreferenceScreen().getPreferenceCount() < 1) {
             Log.w(TAG, "Saved networks activity loaded, but there are no saved networks!");
         }
     }
 
-    private void showDialog(LongPressAccessPointPreference accessPoint, boolean edit) {
+    private void showWifiDialog(@Nullable LongPressAccessPointPreference accessPoint) {
         if (mDialog != null) {
             removeDialog(WifiSettings.WIFI_DIALOG_ID);
             mDialog = null;
         }
 
-        // Save the access point and edit mode
-        mDlgAccessPoint = accessPoint.getAccessPoint();
+        if (accessPoint != null) {
+            // Save the access point and edit mode
+            mDlgAccessPoint = accessPoint.getAccessPoint();
+        } else {
+            // No access point is selected. Clear saved state.
+            mDlgAccessPoint = null;
+            mAccessPointSavedState = null;
+        }
 
         showDialog(WifiSettings.WIFI_DIALOG_ID);
     }
@@ -167,17 +201,24 @@
     public Dialog onCreateDialog(int dialogId) {
         switch (dialogId) {
             case WifiSettings.WIFI_DIALOG_ID:
-                if (mDlgAccessPoint == null) { // For re-launch from saved state
-                    mDlgAccessPoint = new AccessPoint(getActivity(), mAccessPointSavedState);
-                    // Reset the saved access point data
-                    mAccessPointSavedState = null;
+                if (mDlgAccessPoint == null && mAccessPointSavedState == null) {
+                    // Add new network
+                    mDialog = WifiDialog.createFullscreen(getActivity(), this, null,
+                            WifiConfigUiBase.MODE_CONNECT);
+                } else {
+                    // Modify network
+                    if (mDlgAccessPoint == null) {
+                        // Restore AP from save state
+                        mDlgAccessPoint = new AccessPoint(getActivity(), mAccessPointSavedState);
+                        // Reset the saved access point data
+                        mAccessPointSavedState = null;
+                    }
+                    mDialog = WifiDialog.createModal(getActivity(), this, mDlgAccessPoint,
+                            WifiConfigUiBase.MODE_VIEW);
                 }
                 mSelectedAccessPoint = mDlgAccessPoint;
 
-                mDialog = new WifiDialog(getActivity(), this, mDlgAccessPoint,
-                        WifiConfigUiBase.MODE_VIEW, true /* hide the submit button */);
                 return mDialog;
-
         }
         return super.onCreateDialog(dialogId);
     }
@@ -228,15 +269,18 @@
 
     @Override
     public void onSubmit(WifiDialog dialog) {
-        // Ignored
+        mWifiManager.save(dialog.getController().getConfig(), mSaveListener);
     }
 
     @Override
     public boolean onPreferenceTreeClick(Preference preference) {
         if (preference instanceof LongPressAccessPointPreference) {
-            showDialog((LongPressAccessPointPreference) preference, false);
+            showWifiDialog((LongPressAccessPointPreference) preference);
             return true;
-        } else{
+        } else if (preference == mAddNetworkPreference) {
+            showWifiDialog(null);
+            return true;
+        } else {
             return super.onPreferenceTreeClick(preference);
         }
     }
diff --git a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java
index cea4d46..d44c8a9 100644
--- a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java
+++ b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java
@@ -20,8 +20,9 @@
 import android.text.TextUtils;
 
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.network.NetworkScoreManagerWrapper;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -30,11 +31,12 @@
 import java.util.List;
 
 /**
- * {@link PreferenceController} that controls whether a user wants to enable the "use open networks
- * automatically" feature provider by the current network recommendation provider.
+ * {@link AbstractPreferenceController} that controls whether a user wants to enable the "use open
+ * networks automatically" feature provider by the current network recommendation provider.
  */
-public class UseOpenWifiPreferenceController extends PreferenceController
-        implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause {
+public class UseOpenWifiPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
+        LifecycleObserver, OnResume, OnPause {
     private static final String KEY_USE_OPEN_WIFI_AUTOMATICALLY = "use_open_wifi_automatically";
     @VisibleForTesting static final int REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY = 400;
 
diff --git a/src/com/android/settings/wifi/WifiApEnabler.java b/src/com/android/settings/wifi/WifiApEnabler.java
index 5d725d8..2a8015b 100644
--- a/src/com/android/settings/wifi/WifiApEnabler.java
+++ b/src/com/android/settings/wifi/WifiApEnabler.java
@@ -32,6 +32,10 @@
 
 import java.util.ArrayList;
 
+/**
+ * @deprecated in favor of WifiTetherPreferenceController and WifiTetherSettings
+ */
+@Deprecated
 public class WifiApEnabler {
     private final Context mContext;
     private final SwitchPreference mSwitch;
@@ -77,7 +81,7 @@
         mContext = context;
         mDataSaverBackend = dataSaverBackend;
         mSwitch = switchPreference;
-        mOriginalSummary = switchPreference.getSummary();
+        mOriginalSummary = context.getText(R.string.wifi_hotspot_off_subtext);
         switchPreference.setPersistent(false);
 
         mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 2a17dfc..6935749 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -110,7 +110,6 @@
     public static final int WIFI_PEAP_PHASE2_AKA        = 4;
     public static final int WIFI_PEAP_PHASE2_AKA_PRIME  = 5;
 
-    private static final int SSID_ASCII_MAX_LENGTH = 32;
 
     /* Phase2 methods supported by PEAP are limited */
     private final ArrayAdapter<String> mPhase2PeapAdapter;
@@ -282,11 +281,17 @@
                 showProxyFields();
                 final CheckBox advancedTogglebox =
                         (CheckBox) mView.findViewById(R.id.wifi_advanced_togglebox);
-                mView.findViewById(R.id.wifi_advanced_toggle).setVisibility(View.VISIBLE);
+                mView.findViewById(R.id.wifi_advanced_toggle).setVisibility(
+                        mAccessPoint.isCarrierAp() ? View.GONE : View.VISIBLE);
                 advancedTogglebox.setOnCheckedChangeListener(this);
                 advancedTogglebox.setChecked(showAdvancedFields);
                 mView.findViewById(R.id.wifi_advanced_fields)
                         .setVisibility(showAdvancedFields ? View.VISIBLE : View.GONE);
+                if (mAccessPoint.isCarrierAp()) {
+                    addRow(group, R.string.wifi_carrier_connect,
+                            String.format(mContext.getString(R.string.wifi_carrier_content),
+                            mAccessPoint.getCarrierName()));
+                }
             }
 
             if (mMode == WifiConfigUiBase.MODE_MODIFY) {
@@ -406,15 +411,23 @@
         submit.setEnabled(isSubmittable());
     }
 
+    boolean isValidPsk(String password) {
+        if (password.length() == 64 && password.matches("[0-9A-Fa-f]{64}")) {
+            return true;
+        } else if (password.length() >= 8 && password.length() <= 63) {
+            return true;
+        }
+        return false;
+    }
+
     boolean isSubmittable() {
         boolean enabled = false;
         boolean passwordInvalid = false;
-
         if (mPasswordView != null
                 && ((mAccessPointSecurity == AccessPoint.SECURITY_WEP
                         && mPasswordView.length() == 0)
                     || (mAccessPointSecurity == AccessPoint.SECURITY_PSK
-                           && (mPasswordView.length() < 8 || mPasswordView.length() > 63)))) {
+                           && !isValidPsk(mPasswordView.getText().toString())))) {
             passwordInvalid = true;
         }
         if ((mSsidView != null && mSsidView.length() == 0)
@@ -463,7 +476,7 @@
 
         if (mSsidView != null) {
             final String ssid = mSsidView.getText().toString();
-            if (ssid.length() > SSID_ASCII_MAX_LENGTH) {
+            if (WifiUtils.isSSIDTooLong(ssid)) {
                 mView.findViewById(R.id.ssid_too_long_warning).setVisibility(View.VISIBLE);
             }
         }
@@ -846,6 +859,10 @@
             mEapIdentityView = (TextView) mView.findViewById(R.id.identity);
             mEapAnonymousView = (TextView) mView.findViewById(R.id.anonymous);
 
+            if (mAccessPoint != null && mAccessPoint.isCarrierAp()) {
+                mEapMethodSpinner.setSelection(mAccessPoint.getCarrierApEapType());
+            }
+
             loadCertificates(
                     mEapCaCertSpinner,
                     Credentials.CA_CERTIFICATE,
@@ -1013,6 +1030,9 @@
                 setUserCertInvisible();
                 setPasswordInvisible();
                 setIdentityInvisible();
+                if (mAccessPoint.isCarrierAp()) {
+                    setEapMethodInvisible();
+                }
                 break;
         }
 
@@ -1078,6 +1098,10 @@
         mView.findViewById(R.id.show_password_layout).setVisibility(View.GONE);
     }
 
+    private void setEapMethodInvisible() {
+        mView.findViewById(R.id.eap).setVisibility(View.GONE);
+    }
+
     private void showIpConfigFields() {
         WifiConfiguration config = null;
 
diff --git a/src/com/android/settings/wifi/WifiDialog.java b/src/com/android/settings/wifi/WifiDialog.java
index f72b4f0..81f2a14 100644
--- a/src/com/android/settings/wifi/WifiDialog.java
+++ b/src/com/android/settings/wifi/WifiDialog.java
@@ -27,6 +27,7 @@
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.wifi.AccessPoint;
 
+// TODO(b/64069122) Have this extend a dialogfragment to handle the fullscreen launch case.
 class WifiDialog extends AlertDialog implements WifiConfigUiBase, DialogInterface.OnClickListener {
 
     public interface WifiDialogListener {
@@ -45,19 +46,31 @@
     private WifiConfigController mController;
     private boolean mHideSubmitButton;
 
-    public WifiDialog(Context context, WifiDialogListener listener, AccessPoint accessPoint,
-            int mode, boolean hideSubmitButton) {
-        this(context, listener, accessPoint, mode);
-        mHideSubmitButton = hideSubmitButton;
+
+    /** Creates a WifiDialog with fullscreen style. It displays in fullscreen mode. */
+    public static WifiDialog createFullscreen(Context context, WifiDialogListener listener,
+            AccessPoint accessPoint, int mode) {
+        return new WifiDialog(context, listener, accessPoint, mode,
+                R.style.Theme_Settings_NoActionBar, false /* hideSubmitButton */);
     }
 
-    public WifiDialog(Context context, WifiDialogListener listener, AccessPoint accessPoint,
-            int mode) {
-        super(context);
+    /**
+     * Creates a WifiDialog with no additional style. It displays as a dialog above the current
+     * view.
+     */
+    public static WifiDialog createModal(Context context, WifiDialogListener listener,
+            AccessPoint accessPoint, int mode) {
+        return new WifiDialog(context, listener, accessPoint, mode, 0 /* style */,
+                mode == WifiConfigUiBase.MODE_VIEW /* hideSubmitButton*/);
+    }
+
+    /* package */ WifiDialog(Context context, WifiDialogListener listener, AccessPoint accessPoint,
+        int mode, int style, boolean hideSubmitButton) {
+        super(context, style);
         mMode = mode;
         mListener = listener;
         mAccessPoint = accessPoint;
-        mHideSubmitButton = false;
+        mHideSubmitButton = hideSubmitButton;
     }
 
     @Override
diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java
index af723c3..4f9c7a6 100644
--- a/src/com/android/settings/wifi/WifiDialogActivity.java
+++ b/src/com/android/settings/wifi/WifiDialogActivity.java
@@ -55,7 +55,7 @@
             accessPoint = new AccessPoint(this, accessPointState);
         }
 
-        WifiDialog dialog = new WifiDialog(this, this, accessPoint, WifiConfigUiBase.MODE_CONNECT);
+        WifiDialog dialog = WifiDialog.createModal(this, this, accessPoint, WifiConfigUiBase.MODE_CONNECT);
         dialog.show();
         dialog.setOnDismissListener(this);
     }
diff --git a/src/com/android/settings/wifi/WifiInfoPreferenceController.java b/src/com/android/settings/wifi/WifiInfoPreferenceController.java
index 238f0e1..ad6ecba 100644
--- a/src/com/android/settings/wifi/WifiInfoPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiInfoPreferenceController.java
@@ -22,23 +22,25 @@
 import android.content.IntentFilter;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
+import android.support.v4.text.BidiFormatter;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
 /**
- * {@link PreferenceController} that updates MAC/IP address.
+ * {@link PreferenceControllerMixin} that updates MAC/IP address.
  */
-public class WifiInfoPreferenceController extends PreferenceController implements
-        LifecycleObserver, OnResume, OnPause {
+public class WifiInfoPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {
 
     private static final String KEY_CURRENT_IP_ADDRESS = "current_ip_address";
     private static final String KEY_MAC_ADDRESS = "mac_address";
@@ -103,7 +105,7 @@
             final String ipAddress = Utils.getWifiIpAddresses(mContext);
             mWifiIpAddressPref.setSummary(ipAddress == null
                     ? mContext.getString(R.string.status_unavailable)
-                    : ipAddress);
+                    : BidiFormatter.getInstance().unicodeWrap(ipAddress));
         }
     }
 
diff --git a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java b/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java
index bc61cff..2fadede 100644
--- a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java
@@ -18,19 +18,20 @@
 import android.content.Context;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.widget.SummaryUpdater;
 import com.android.settings.widget.MasterSwitchPreference;
 import com.android.settings.widget.MasterSwitchController;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
 
-public class WifiMasterSwitchPreferenceController extends PreferenceController
-        implements SummaryUpdater.OnSummaryChangeListener,
+public class WifiMasterSwitchPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, SummaryUpdater.OnSummaryChangeListener,
         LifecycleObserver, OnResume, OnPause, OnStart, OnStop {
 
     public static final String KEY_TOGGLE_WIFI = "toggle_wifi";
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index cc10293..d61b71c 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -37,7 +37,9 @@
 import android.net.wifi.WpsInfo;
 import android.nfc.NfcAdapter;
 import android.os.Bundle;
+import android.os.Handler;
 import android.os.HandlerThread;
+import android.os.PowerManager;
 import android.os.Process;
 import android.provider.Settings;
 import android.support.annotation.VisibleForTesting;
@@ -49,7 +51,6 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.ProgressBar;
 import android.widget.Toast;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -88,7 +89,6 @@
         WifiDialog.WifiDialogListener {
 
     private static final String TAG = "WifiSettings";
-    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
     /* package */ static final int MENU_ID_WPS_PBC = Menu.FIRST;
     private static final int MENU_ID_WPS_PIN = Menu.FIRST + 1;
@@ -140,7 +140,7 @@
     private WifiDialog mDialog;
     private WriteWifiConfigToNfcDialog mWifiToNfcDialog;
 
-    private ProgressBar mProgressHeader;
+    private View mProgressHeader;
 
     // this boolean extra specifies whether to disable the Next button when not connected. Used by
     // account creation outside of setup wizard.
@@ -177,6 +177,12 @@
     // For Search
     private static final String DATA_KEY_REFERENCE = "main_toggle_wifi";
 
+    /**
+     * Tracks whether the user initiated a connection via clicking in order to autoscroll to the
+     * network once connected.
+     */
+    private boolean mClickedConnect;
+
     /* End of "used in Wifi Setup context" */
 
     public WifiSettings() {
@@ -188,7 +194,8 @@
         super.onViewCreated(view, savedInstanceState);
         final Activity activity = getActivity();
         if (activity != null) {
-            mProgressHeader = (ProgressBar) setPinnedHeaderView(R.layout.wifi_progress_header);
+            mProgressHeader = setPinnedHeaderView(R.layout.wifi_progress_header)
+                    .findViewById(R.id.progress_bar_animation);
             setProgressBarVisible(false);
         }
     }
@@ -379,8 +386,8 @@
         }
         setProgressBarVisible(true);
         mWifiTracker.forceUpdate();
-        if (DEBUG) {
-            Log.d(TAG, "WifiSettings force update APs: " + mWifiTracker.getAccessPoints());
+        if (WifiTracker.sVerboseLogging) {
+            Log.i(TAG, "WifiSettings force update APs: " + mWifiTracker.getAccessPoints());
         }
         getView().removeCallbacks(mUpdateAccessPointsRunnable);
         updateAccessPointPreferences();
@@ -626,20 +633,23 @@
     public Dialog onCreateDialog(int dialogId) {
         switch (dialogId) {
             case WIFI_DIALOG_ID:
-                AccessPoint ap = mDlgAccessPoint; // For manual launch
-                if (ap == null) { // For re-launch from saved state
-                    if (mAccessPointSavedState != null) {
-                        ap = new AccessPoint(getActivity(), mAccessPointSavedState);
-                        // For repeated orientation changes
-                        mDlgAccessPoint = ap;
+                if (mDlgAccessPoint == null && mAccessPointSavedState == null) {
+                    // add new network
+                    mDialog = WifiDialog
+                            .createFullscreen(getActivity(), this, mDlgAccessPoint, mDialogMode);
+                } else {
+                    // modify network
+                    if (mDlgAccessPoint == null) {
+                        // restore AP from save state
+                        mDlgAccessPoint = new AccessPoint(getActivity(), mAccessPointSavedState);
                         // Reset the saved access point data
                         mAccessPointSavedState = null;
                     }
+                    mDialog = WifiDialog
+                            .createModal(getActivity(), this, mDlgAccessPoint, mDialogMode);
                 }
-                // If it's null, fine, it's for Add Network
-                mSelectedAccessPoint = ap;
-                mDialog = new WifiDialog(getActivity(), this, ap, mDialogMode,
-                        /* no hide submit/connect */ false);
+
+                mSelectedAccessPoint = mDlgAccessPoint;
                 return mDialog;
             case WPS_PBC_DIALOG_ID:
                 return new WpsDialog(getActivity(), WpsInfo.PBC);
@@ -694,6 +704,10 @@
     private void updateAccessPointsDelayed() {
         // Safeguard from some delayed event handling
         if (getActivity() != null && !mIsRestricted && mWifiManager.isWifiEnabled()) {
+            Handler handler = getView().getHandler();
+            if (handler != null && handler.hasCallbacks(mUpdateAccessPointsRunnable)) {
+                return;
+            }
             setProgressBarVisible(true);
             getView().postDelayed(mUpdateAccessPointsRunnable, 300 /* delay milliseconds */);
         }
@@ -765,8 +779,8 @@
         }
         // AccessPoints are sorted by the WifiTracker
         final List<AccessPoint> accessPoints = mWifiTracker.getAccessPoints();
-        if (DEBUG) {
-            Log.d(TAG, "updateAccessPoints called for: " + accessPoints);
+        if (WifiTracker.sVerboseLogging) {
+            Log.i(TAG, "updateAccessPoints called for: " + accessPoints);
         }
 
         boolean hasAvailableAccessPoints = false;
@@ -854,10 +868,11 @@
         }
 
         // Is the previous currently connected SSID different from the new one?
-        if (!((AccessPointPreference)
-                mConnectedAccessPointPreferenceCategory.getPreference(0))
-                        .getAccessPoint().getSsidStr().equals(
-                                connectedAp.getSsidStr())) {
+        AccessPointPreference preference = (AccessPointPreference)
+            (mConnectedAccessPointPreferenceCategory.getPreference(0));
+        // The AccessPoints need to be the same reference to ensure that updates are reflected
+        // in the UI.
+        if (preference.getAccessPoint() != connectedAp) {
             removeConnectedAccessPointPreference();
             addConnectedAccessPointPreference(connectedAp);
             return true;
@@ -890,6 +905,10 @@
 
         mConnectedAccessPointPreferenceCategory.addPreference(pref);
         mConnectedAccessPointPreferenceCategory.setVisible(true);
+        if (mClickedConnect) {
+            mClickedConnect = false;
+            scrollToPreference(mConnectedAccessPointPreferenceCategory);
+        }
     }
 
     /** Removes all preferences and hide the {@link #mConnectedAccessPointPreferenceCategory}. */
@@ -906,9 +925,8 @@
                 getContentResolver(), Settings.Global.WIFI_WAKEUP_AVAILABLE, defaultWakeupAvailable)
                 == 1;
         if (wifiWakeupAvailable) {
-            boolean wifiWakeupEnabled = Settings.Global.getInt(
-                    getContentResolver(), Settings.Global.WIFI_WAKEUP_ENABLED, 0) == 1;
-            mConfigureWifiSettingsPreference.setSummary(getString(wifiWakeupEnabled
+            mConfigureWifiSettingsPreference.setSummary(getString(
+                    isWifiWakeupEnabled()
                     ? R.string.wifi_configure_settings_preference_summary_wakeup_on
                     : R.string.wifi_configure_settings_preference_summary_wakeup_off));
         }
@@ -923,6 +941,20 @@
         }
     }
 
+    private boolean isWifiWakeupEnabled() {
+        PowerManager powerManager = (PowerManager) getSystemService(Context.POWER_SERVICE);
+        ContentResolver contentResolver = getContentResolver();
+        return Settings.Global.getInt(contentResolver,
+                        Settings.Global.WIFI_WAKEUP_ENABLED, 0) == 1
+                && Settings.Global.getInt(contentResolver,
+                        Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1
+                && Settings.Global.getInt(contentResolver,
+                        Settings.Global.AIRPLANE_MODE_ON, 0) == 0
+                && Settings.Global.getInt(contentResolver,
+                        Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED, 0) == 1
+                && !powerManager.isPowerSaveMode();
+    }
+
     private void setOffMessage() {
         final CharSequence title = getText(R.string.wifi_empty_list_wifi_off);
         // Don't use WifiManager.isScanAlwaysAvailable() to check the Wi-Fi scanning mode. Instead,
@@ -956,7 +988,7 @@
 
     protected void setProgressBarVisible(boolean visible) {
         if (mProgressHeader != null) {
-            mProgressHeader.setVisibility(visible ? View.VISIBLE : View.INVISIBLE);
+            mProgressHeader.setVisibility(visible ? View.VISIBLE : View.GONE);
         }
     }
 
@@ -1035,7 +1067,7 @@
         mMetricsFeatureProvider.action(getActivity(), MetricsEvent.ACTION_WIFI_CONNECT,
                 isSavedNetwork);
         mWifiManager.connect(config, mConnectListener);
-        scrollToPreference(mConnectedAccessPointPreferenceCategory);
+        mClickedConnect = true;
     }
 
     protected void connect(final int networkId, boolean isSavedNetwork) {
@@ -1118,7 +1150,7 @@
      * @param config The WiFi config.
      * @return true if the config is not editable through Settings.
      */
-    static boolean isEditabilityLockedDown(Context context, WifiConfiguration config) {
+    public static boolean isEditabilityLockedDown(Context context, WifiConfiguration config) {
         return !canModifyNetwork(context, config);
     }
 
diff --git a/src/com/android/settings/wifi/WifiUtils.java b/src/com/android/settings/wifi/WifiUtils.java
new file mode 100644
index 0000000..7bd69db
--- /dev/null
+++ b/src/com/android/settings/wifi/WifiUtils.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi;
+
+import android.text.TextUtils;
+
+public class WifiUtils {
+
+    private static final int SSID_ASCII_MIN_LENGTH = 1;
+    private static final int SSID_ASCII_MAX_LENGTH = 32;
+    private static final int PASSWORD_MIN_LENGTH = 8;
+    private static final int PASSWORD_MAX_LENGTH = 63;
+
+
+    public static boolean isSSIDTooLong(String ssid) {
+        if (TextUtils.isEmpty(ssid)) {
+            return false;
+        }
+        return ssid.length() > SSID_ASCII_MAX_LENGTH;
+    }
+
+    public static boolean isSSIDTooShort(String ssid) {
+        if (TextUtils.isEmpty(ssid)) {
+            return true;
+        }
+        return ssid.length() < SSID_ASCII_MIN_LENGTH;
+    }
+
+    public static boolean isPasswordValid(String password) {
+        if (TextUtils.isEmpty(password)) {
+            return false;
+        }
+        final int length = password.length();
+        return length >= PASSWORD_MIN_LENGTH && length <= PASSWORD_MAX_LENGTH;
+    }
+}
diff --git a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
index f174b4f..efb8aa6 100644
--- a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
@@ -26,29 +26,28 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
-import com.android.settings.R;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.network.NetworkScoreManagerWrapper;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
 /**
- * {@link PreferenceController} that controls whether the Wi-Fi Wakeup feature should be enabled.
+ * {@link PreferenceControllerMixin} that controls whether the Wi-Fi Wakeup feature should be
+ * enabled.
  */
-public class WifiWakeupPreferenceController extends PreferenceController implements
-        LifecycleObserver, OnResume, OnPause {
+public class WifiWakeupPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {
 
     private static final String KEY_ENABLE_WIFI_WAKEUP = "enable_wifi_wakeup";
-    private final NetworkScoreManagerWrapper mNetworkScoreManager;
     private SettingObserver mSettingObserver;
 
-    public WifiWakeupPreferenceController(
-            Context context, Lifecycle lifecycle, NetworkScoreManagerWrapper networkScoreManager) {
+    public WifiWakeupPreferenceController(Context context, Lifecycle lifecycle) {
         super(context);
-        mNetworkScoreManager = networkScoreManager;
         lifecycle.addObserver(this);
     }
 
@@ -114,11 +113,9 @@
         boolean networkRecommendationsEnabled = Settings.Global.getInt(
                 mContext.getContentResolver(),
                 Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED, 0) == 1;
-        boolean activeScorerSet = mNetworkScoreManager.getActiveScorerPackage() != null;
-        enableWifiWakeup.setEnabled(
-                networkRecommendationsEnabled && wifiScanningEnabled && activeScorerSet);
+        enableWifiWakeup.setEnabled(networkRecommendationsEnabled && wifiScanningEnabled);
 
-        if (!activeScorerSet) {
+        if (!networkRecommendationsEnabled) {
             enableWifiWakeup.setSummary(R.string.wifi_wakeup_summary_scoring_disabled);
         } else if (!wifiScanningEnabled) {
             enableWifiWakeup.setSummary(R.string.wifi_wakeup_summary_scanning_disabled);
diff --git a/src/com/android/settings/wifi/WpsPreferenceController.java b/src/com/android/settings/wifi/WpsPreferenceController.java
index 7aaa7eb..f636593 100644
--- a/src/com/android/settings/wifi/WpsPreferenceController.java
+++ b/src/com/android/settings/wifi/WpsPreferenceController.java
@@ -29,18 +29,19 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
 /**
- * {@link PreferenceController} that shows Dialog for WPS progress. Disabled when Wi-Fi is off.
+ * {@link PreferenceControllerMixin} that shows Dialog for WPS progress. Disabled when Wi-Fi is off.
  */
-public class WpsPreferenceController extends PreferenceController implements
-        LifecycleObserver, OnPause, OnResume {
+public class WpsPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver, OnPause, OnResume {
 
     private static final String KEY_WPS_PUSH = "wps_push_button";
     private static final String KEY_WPS_PIN = "wps_pin_entry";
diff --git a/src/com/android/settings/wifi/details/WifiDetailActionBarObserver.java b/src/com/android/settings/wifi/details/WifiDetailActionBarObserver.java
new file mode 100644
index 0000000..81413d2
--- /dev/null
+++ b/src/com/android/settings/wifi/details/WifiDetailActionBarObserver.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.wifi.details;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.os.Bundle;
+import com.android.settings.R;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnCreate;
+
+/**
+ * ActionBar lifecycle observer for {@link WifiNetworkDetailsFragment}.
+ */
+public class WifiDetailActionBarObserver implements LifecycleObserver, OnCreate {
+
+    private final Fragment mFragment;
+    private final Context mContext;
+
+    public WifiDetailActionBarObserver(Context context, Fragment fragment) {
+        mContext = context;
+        mFragment = fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        if (mFragment.getActivity() != null) {
+            mFragment.getActivity().getActionBar()
+                    .setTitle(mContext.getString(R.string.wifi_details_title));
+        }
+    }
+}
diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
index b28a731..c9c251e 100644
--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
+++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
@@ -19,6 +19,8 @@
 import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;
 import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
 
+import static com.android.settings.wifi.WifiSettings.isEditabilityLockedDown;
+
 import android.app.Fragment;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -40,6 +42,7 @@
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.os.Handler;
+import android.support.v4.text.BidiFormatter;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
 import android.support.v7.preference.PreferenceScreen;
@@ -54,11 +57,12 @@
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.applications.LayoutPreference;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.vpn2.ConnectivityManagerWrapper;
 import com.android.settings.widget.EntityHeaderController;
 import com.android.settings.wifi.WifiDetailPreference;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -76,8 +80,8 @@
  * Controller for logic pertaining to displaying Wifi information for the
  * {@link WifiNetworkDetailsFragment}.
  */
-public class WifiDetailPreferenceController extends PreferenceController implements
-        LifecycleObserver, OnPause, OnResume {
+public class WifiDetailPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver, OnPause, OnResume {
     private static final String TAG = "WifiDetailsPrefCtrl";
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
@@ -244,7 +248,6 @@
 
         mButtonsPref = (LayoutPreference) screen.findPreference(KEY_BUTTONS_PREF);
         mSignInButton = mButtonsPref.findViewById(R.id.signin_button);
-        mSignInButton.setText(R.string.support_sign_in_button_text);
         mSignInButton.setOnClickListener(view -> signIntoNetwork());
 
         mSignalStrengthPref =
@@ -264,7 +267,6 @@
 
         mSecurityPref.setDetailText(mAccessPoint.getSecurityString(false /* concise */));
         mForgetButton = mButtonsPref.findViewById(R.id.forget_button);
-        mForgetButton.setText(R.string.forget);
         mForgetButton.setOnClickListener(view -> forgetNetwork());
     }
 
@@ -441,7 +443,8 @@
         updatePreference(mDnsPref, dnsServers);
 
         if (ipv6Addresses.length() > 0) {
-            mIpv6AddressPref.setSummary(ipv6Addresses.toString());
+            mIpv6AddressPref.setSummary(
+                    BidiFormatter.getInstance().unicodeWrap(ipv6Addresses.toString()));
             mIpv6Category.setVisible(true);
         } else {
             mIpv6Category.setVisible(false);
@@ -462,7 +465,9 @@
      * Returns whether the network represented by this preference can be forgotten.
      */
     private boolean canForgetNetwork() {
-        return mWifiInfo != null && mWifiInfo.isEphemeral() || mWifiConfig != null;
+        // TODO(65396674): create test for the locked down scenario
+        return (mWifiInfo != null && mWifiInfo.isEphemeral())
+                || (mWifiConfig != null && !isEditabilityLockedDown(mContext, mWifiConfig));
     }
 
     /**
diff --git a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
index 664ac7f..8145d77 100644
--- a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
+++ b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
@@ -21,15 +21,14 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.vpn2.ConnectivityManagerWrapperImpl;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.wifi.AccessPoint;
-
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -39,13 +38,18 @@
  * {@link AccessPoint#saveWifiState(Bundle)} in order to properly render this page.
  */
 public class WifiNetworkDetailsFragment extends DashboardFragment {
+
     private static final String TAG = "WifiNetworkDetailsFrg";
 
     private AccessPoint mAccessPoint;
     private WifiDetailPreferenceController mWifiDetailPreferenceController;
+    private WifiDetailActionBarObserver mWifiDetailActionBarObserver;
 
     @Override
     public void onAttach(Context context) {
+        mWifiDetailActionBarObserver = new WifiDetailActionBarObserver(context, this);
+        getLifecycle().addObserver(mWifiDetailActionBarObserver);
+
         mAccessPoint = new AccessPoint(context, getArguments());
         super.onAttach(context);
     }
@@ -66,7 +70,7 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
         ConnectivityManager cm = context.getSystemService(ConnectivityManager.class);
         mWifiDetailPreferenceController = new WifiDetailPreferenceController(
                 mAccessPoint,
@@ -78,8 +82,6 @@
                 context.getSystemService(WifiManager.class),
                 mMetricsFeatureProvider);
 
-        ArrayList<PreferenceController> controllers = new ArrayList(1);
-        controllers.add(mWifiDetailPreferenceController);
-        return controllers;
+        return new ArrayList<>(Collections.singletonList(mWifiDetailPreferenceController));
     }
 }
diff --git a/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java b/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java
index 3df1978..e777626 100644
--- a/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java
+++ b/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java
@@ -21,9 +21,11 @@
 import android.support.v7.preference.PreferenceGroup;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public abstract class P2pCategoryPreferenceController extends PreferenceController {
+public abstract class P2pCategoryPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
 
     protected PreferenceGroup mCategory;
 
diff --git a/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java b/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java
index ca992a9..9ed3158 100644
--- a/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java
+++ b/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java
@@ -22,9 +22,11 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class P2pThisDevicePreferenceController extends PreferenceController {
+public class P2pThisDevicePreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin {
 
     private Preference mPreference;
 
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java b/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java
index 3eb2b7b..2d5e25f 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java
@@ -24,17 +24,18 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
 /**
- * {@link PreferenceController} to toggle Wifi Direct preference on Wi-Fi state.
+ * {@link PreferenceControllerMixin} to toggle Wifi Direct preference on Wi-Fi state.
  */
-public class WifiP2pPreferenceController extends PreferenceController implements
-        LifecycleObserver, OnPause, OnResume {
+public class WifiP2pPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver, OnPause, OnResume {
 
     private static final String KEY_WIFI_DIRECT = "wifi_direct";
 
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index cd328d9..fa276d9 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -51,8 +51,8 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -168,8 +168,8 @@
     }
 
     @Override
-    protected List<PreferenceController> getPreferenceControllers(Context context) {
-        final List<PreferenceController> controllers = new ArrayList<>();
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
         mPersistentCategoryController =
                 new P2pPersistentCategoryPreferenceController(context);
         mPeerCategoryController =
@@ -186,7 +186,8 @@
         final Activity activity = getActivity();
         mWifiP2pManager = (WifiP2pManager) getSystemService(Context.WIFI_P2P_SERVICE);
         if (mWifiP2pManager != null) {
-            mChannel = mWifiP2pManager.initialize(activity, getActivity().getMainLooper(), null);
+            mChannel = mWifiP2pManager.initialize(activity.getApplicationContext(),
+                    getActivity().getMainLooper(), null);
             if (mChannel == null) {
                 //Failure to set up connection
                 Log.e(TAG, "Failed to set up connection with wifi p2p service");
diff --git a/src/com/android/settings/wifi/tether/NoOpOnStartTetheringCallback.java b/src/com/android/settings/wifi/tether/NoOpOnStartTetheringCallback.java
new file mode 100644
index 0000000..c491603
--- /dev/null
+++ b/src/com/android/settings/wifi/tether/NoOpOnStartTetheringCallback.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.tether;
+
+import android.net.ConnectivityManager;
+
+class NoOpOnStartTetheringCallback {
+
+    public static ConnectivityManager.OnStartTetheringCallback newInstance() {
+        return new ConnectivityManager.OnStartTetheringCallback() {
+        };
+    }
+}
diff --git a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java
new file mode 100644
index 0000000..5a08c58
--- /dev/null
+++ b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.tether;
+
+import static android.net.wifi.WifiConfiguration.AP_BAND_2GHZ;
+import static android.net.wifi.WifiConfiguration.AP_BAND_5GHZ;
+
+import android.content.Context;
+import android.net.wifi.WifiConfiguration;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+
+public class WifiTetherApBandPreferenceController extends WifiTetherBasePreferenceController {
+
+    private static final String PREF_KEY = "wifi_tether_network_ap_band";
+    private static final String[] BAND_VALUES =
+            {String.valueOf(AP_BAND_2GHZ), String.valueOf(AP_BAND_5GHZ)};
+
+    private final String[] mBandEntries;
+    private int mBandIndex;
+
+    public WifiTetherApBandPreferenceController(Context context,
+            OnTetherConfigUpdateListener listener) {
+        super(context, listener);
+        mBandEntries = mContext.getResources().getStringArray(R.array.wifi_ap_band_config_full);
+        final WifiConfiguration config = mWifiManager.getWifiApConfiguration();
+        if (config == null) {
+            mBandIndex = 0;
+        } else if (is5GhzBandSupported()) {
+            mBandIndex = config.apBand;
+        } else {
+            config.apBand = 0;
+            mWifiManager.setWifiApConfiguration(config);
+            mBandIndex = config.apBand;
+        }
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        ListPreference preference = (ListPreference) mPreference;
+        if (!is5GhzBandSupported()) {
+            preference.setEnabled(false);
+            preference.setSummary(R.string.wifi_ap_choose_2G);
+        } else {
+            preference.setEntries(mBandEntries);
+            preference.setEntryValues(BAND_VALUES);
+            preference.setSummary(mBandEntries[mBandIndex]);
+            preference.setValue(String.valueOf(mBandIndex));
+        }
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return PREF_KEY;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        mBandIndex = Integer.parseInt((String) newValue);
+        preference.setSummary(mBandEntries[mBandIndex]);
+        mListener.onTetherConfigUpdated();
+        return true;
+    }
+
+    private boolean is5GhzBandSupported() {
+        final String countryCode = mWifiManager.getCountryCode();
+        if (!mWifiManager.isDualBandSupported() || countryCode == null) {
+            return false;
+        }
+        return true;
+    }
+
+    public int getBandIndex() {
+        return mBandIndex;
+    }
+}
diff --git a/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java
new file mode 100644
index 0000000..b6aba1b
--- /dev/null
+++ b/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.tether;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.wifi.WifiManager;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+public abstract class WifiTetherBasePreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
+
+    public interface OnTetherConfigUpdateListener {
+        void onTetherConfigUpdated();
+    }
+
+    protected final WifiManager mWifiManager;
+    protected final String[] mWifiRegexs;
+    protected final ConnectivityManager mCm;
+    protected final OnTetherConfigUpdateListener mListener;
+
+    protected Preference mPreference;
+
+    public WifiTetherBasePreferenceController(Context context,
+            OnTetherConfigUpdateListener listener) {
+        super(context);
+        mListener = listener;
+        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+        mCm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        mWifiRegexs = mCm.getTetherableWifiRegexs();
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mWifiManager != null && mWifiRegexs != null && mWifiRegexs.length > 0;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+}
diff --git a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
new file mode 100644
index 0000000..acb36b1
--- /dev/null
+++ b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.tether;
+
+import android.content.Context;
+import android.net.wifi.WifiConfiguration;
+import android.support.v7.preference.EditTextPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.widget.ValidatedEditTextPreference;
+import com.android.settings.wifi.WifiUtils;
+
+public class WifiTetherPasswordPreferenceController extends WifiTetherBasePreferenceController
+        implements ValidatedEditTextPreference.Validator {
+
+    private static final String PREF_KEY = "wifi_tether_network_password";
+
+    private String mPassword;
+
+    public WifiTetherPasswordPreferenceController(Context context,
+            OnTetherConfigUpdateListener listener) {
+        super(context, listener);
+        final WifiConfiguration config = mWifiManager.getWifiApConfiguration();
+        if (config != null) {
+            mPassword = config.preSharedKey;
+        }
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return PREF_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        ((ValidatedEditTextPreference) mPreference).setValidator(this);
+        updatePasswordDisplay((EditTextPreference) mPreference);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        mPassword = (String) newValue;
+        updatePasswordDisplay((EditTextPreference) mPreference);
+        mListener.onTetherConfigUpdated();
+        return true;
+    }
+
+    public String getPassword() {
+        return mPassword;
+    }
+
+    @Override
+    public boolean isTextValid(String value) {
+        return WifiUtils.isPasswordValid(value);
+    }
+
+    private void updatePasswordDisplay(EditTextPreference preference) {
+        preference.setText(mPassword);
+        preference.setSummary(mPassword);
+    }
+}
diff --git a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
new file mode 100644
index 0000000..a216f9d
--- /dev/null
+++ b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
@@ -0,0 +1,213 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.tether;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.ConnectivityManager;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import android.provider.Settings;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.BidiFormatter;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.widget.MasterSwitchController;
+import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+import java.util.List;
+
+public class WifiTetherPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop {
+
+    public static final IntentFilter WIFI_TETHER_INTENT_FILTER;
+    private static final String WIFI_TETHER_SETTINGS = "wifi_tether";
+
+    private final ConnectivityManager mConnectivityManager;
+    private final String[] mWifiRegexs;
+    private final WifiManager mWifiManager;
+    private final Lifecycle mLifecycle;
+    private WifiTetherSwitchBarController mSwitchController;
+    private MasterSwitchPreference mPreference;
+
+    static {
+        WIFI_TETHER_INTENT_FILTER = new IntentFilter(WifiManager.WIFI_AP_STATE_CHANGED_ACTION);
+        WIFI_TETHER_INTENT_FILTER.addAction(ConnectivityManager.ACTION_TETHER_STATE_CHANGED);
+        WIFI_TETHER_INTENT_FILTER.addAction(Intent.ACTION_AIRPLANE_MODE_CHANGED);
+    }
+
+    public WifiTetherPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context);
+        mConnectivityManager =
+                (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+        mWifiRegexs = mConnectivityManager.getTetherableWifiRegexs();
+        mLifecycle = lifecycle;
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mWifiRegexs != null
+                && mWifiRegexs.length != 0
+                && WifiTetherSettings.isTetherSettingPageEnabled()
+                && !Utils.isMonkeyRunning();
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = (MasterSwitchPreference) screen.findPreference(WIFI_TETHER_SETTINGS);
+        if (mPreference == null) {
+            // unavailable
+            return;
+        }
+        mSwitchController = new WifiTetherSwitchBarController(
+                mContext, new MasterSwitchController(mPreference));
+        mLifecycle.addObserver(mSwitchController);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return WIFI_TETHER_SETTINGS;
+    }
+
+    @Override
+    public void onStart() {
+        if (mPreference != null) {
+            mContext.registerReceiver(mReceiver, WIFI_TETHER_INTENT_FILTER);
+            clearSummaryForAirplaneMode();
+        }
+    }
+
+    @Override
+    public void onStop() {
+        if (mPreference != null) {
+            mContext.unregisterReceiver(mReceiver);
+        }
+    }
+
+    //
+    // Everything below is copied from WifiApEnabler
+    //
+    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (WifiManager.WIFI_AP_STATE_CHANGED_ACTION.equals(action)) {
+                int state = intent.getIntExtra(
+                        WifiManager.EXTRA_WIFI_AP_STATE, WifiManager.WIFI_AP_STATE_FAILED);
+                int reason = intent.getIntExtra(WifiManager.EXTRA_WIFI_AP_FAILURE_REASON,
+                        WifiManager.SAP_START_FAILURE_GENERAL);
+                handleWifiApStateChanged(state, reason);
+            } else if (ConnectivityManager.ACTION_TETHER_STATE_CHANGED.equals(action)) {
+                List<String> active = intent.getStringArrayListExtra(
+                        ConnectivityManager.EXTRA_ACTIVE_TETHER);
+                List<String> errored = intent.getStringArrayListExtra(
+                        ConnectivityManager.EXTRA_ERRORED_TETHER);
+                updateTetherState(active.toArray(), errored.toArray());
+            } else if (Intent.ACTION_AIRPLANE_MODE_CHANGED.equals(action)) {
+                clearSummaryForAirplaneMode();
+            }
+        }
+    };
+
+    private void handleWifiApStateChanged(int state, int reason) {
+        switch (state) {
+            case WifiManager.WIFI_AP_STATE_ENABLING:
+                mPreference.setSummary(R.string.wifi_tether_starting);
+                break;
+            case WifiManager.WIFI_AP_STATE_ENABLED:
+                /**
+                 * Summary on enable is handled by tether
+                 * broadcast notice
+                 */
+                break;
+            case WifiManager.WIFI_AP_STATE_DISABLING:
+                mPreference.setSummary(R.string.wifi_tether_stopping);
+                break;
+            case WifiManager.WIFI_AP_STATE_DISABLED:
+                mPreference.setSummary(R.string.wifi_hotspot_off_subtext);
+                clearSummaryForAirplaneMode();
+                break;
+            default:
+                if (reason == WifiManager.SAP_START_FAILURE_NO_CHANNEL) {
+                    mPreference.setSummary(R.string.wifi_sap_no_channel_error);
+                } else {
+                    mPreference.setSummary(R.string.wifi_error);
+                }
+                clearSummaryForAirplaneMode();
+        }
+    }
+
+    private void updateTetherState(Object[] tethered, Object[] errored) {
+        boolean wifiTethered = matchRegex(tethered);
+        boolean wifiErrored = matchRegex(errored);
+
+        if (wifiTethered) {
+            WifiConfiguration wifiConfig = mWifiManager.getWifiApConfiguration();
+            updateConfigSummary(wifiConfig);
+        } else if (wifiErrored) {
+            mPreference.setSummary(R.string.wifi_error);
+        } else {
+            mPreference.setSummary(R.string.wifi_hotspot_off_subtext);
+        }
+    }
+
+    private boolean matchRegex(Object[] tethers) {
+        for (Object o : tethers) {
+            String s = (String) o;
+            for (String regex : mWifiRegexs) {
+                if (s.matches(regex)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private void updateConfigSummary(WifiConfiguration wifiConfig) {
+        final String s = mContext.getString(
+                com.android.internal.R.string.wifi_tether_configure_ssid_default);
+
+        mPreference.setSummary(mContext.getString(R.string.wifi_tether_enabled_subtext,
+                BidiFormatter.getInstance().unicodeWrap(
+                        (wifiConfig == null) ? s : wifiConfig.SSID)));
+    }
+
+    private void clearSummaryForAirplaneMode() {
+        boolean isAirplaneMode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.AIRPLANE_MODE_ON, 0) != 0;
+        if (isAirplaneMode) {
+            mPreference.setSummary(R.string.summary_placeholder);
+        }
+    }
+    //
+    // Everything above is copied from WifiApEnabler
+    //
+}
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java
new file mode 100644
index 0000000..a4c6c67
--- /dev/null
+++ b/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.tether;
+
+import android.content.Context;
+import android.net.wifi.WifiConfiguration;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.EditTextPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.widget.ValidatedEditTextPreference;
+import com.android.settings.wifi.WifiUtils;
+
+public class WifiTetherSSIDPreferenceController extends WifiTetherBasePreferenceController
+        implements ValidatedEditTextPreference.Validator {
+
+    private static final String PREF_KEY = "wifi_tether_network_name";
+    @VisibleForTesting
+    static final String DEFAULT_SSID = "AndroidAP";
+
+    private String mSSID;
+
+    public WifiTetherSSIDPreferenceController(Context context,
+            OnTetherConfigUpdateListener listener) {
+        super(context, listener);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return PREF_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        final WifiConfiguration config = mWifiManager.getWifiApConfiguration();
+        if (config != null) {
+            mSSID = config.SSID;
+        } else {
+            mSSID = DEFAULT_SSID;
+        }
+        ((ValidatedEditTextPreference) mPreference).setValidator(this);
+        updateSsidDisplay((EditTextPreference) mPreference);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        mSSID = (String) newValue;
+        updateSsidDisplay((EditTextPreference) preference);
+        mListener.onTetherConfigUpdated();
+        return true;
+    }
+
+    @Override
+    public boolean isTextValid(String value) {
+        return !WifiUtils.isSSIDTooLong(value) && !WifiUtils.isSSIDTooShort(value);
+    }
+
+    public String getSSID() {
+        return mSSID;
+    }
+
+    private void updateSsidDisplay(EditTextPreference preference) {
+        preference.setText(mSSID);
+        preference.setSummary(mSSID);
+    }
+}
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
new file mode 100644
index 0000000..3a1d5c6
--- /dev/null
+++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.tether;
+
+import static android.net.ConnectivityManager.ACTION_TETHER_STATE_CHANGED;
+import static android.net.wifi.WifiManager.WIFI_AP_STATE_CHANGED_ACTION;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import android.os.Bundle;
+import android.os.SystemProperties;
+import android.os.UserManager;
+import android.support.annotation.VisibleForTesting;
+import android.util.Log;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.dashboard.RestrictedDashboardFragment;
+import com.android.settings.widget.SwitchBar;
+import com.android.settings.widget.SwitchBarController;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class WifiTetherSettings extends RestrictedDashboardFragment
+        implements WifiTetherBasePreferenceController.OnTetherConfigUpdateListener {
+
+    public static boolean isTetherSettingPageEnabled() {
+        return SystemProperties.getBoolean("settings.ui.wifi.tether.enabled", false);
+    }
+
+    private static final IntentFilter TETHER_STATE_CHANGE_FILTER;
+
+    private WifiTetherSwitchBarController mSwitchBarController;
+    private WifiTetherSSIDPreferenceController mSSIDPreferenceController;
+    private WifiTetherPasswordPreferenceController mPasswordPreferenceController;
+    private WifiTetherApBandPreferenceController mApBandPreferenceController;
+
+    private WifiManager mWifiManager;
+    private boolean mRestartWifiApAfterConfigChange;
+
+    @VisibleForTesting
+    TetherChangeReceiver mTetherChangeReceiver;
+
+    static {
+        TETHER_STATE_CHANGE_FILTER = new IntentFilter(ACTION_TETHER_STATE_CHANGED);
+        TETHER_STATE_CHANGE_FILTER.addAction(WIFI_AP_STATE_CHANGED_ACTION);
+    }
+
+    public WifiTetherSettings() {
+        super(UserManager.DISALLOW_CONFIG_TETHERING);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.WIFI_TETHER_SETTINGS;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return "WifiTetherSettings";
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+        mTetherChangeReceiver = new TetherChangeReceiver();
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        // Assume we are in a SettingsActivity. This is only safe because we currently use
+        // SettingsActivity as base for all preference fragments.
+        final SettingsActivity activity = (SettingsActivity) getActivity();
+        final SwitchBar switchBar = activity.getSwitchBar();
+        mSwitchBarController = new WifiTetherSwitchBarController(activity,
+                new SwitchBarController(switchBar));
+        getLifecycle().addObserver(mSwitchBarController);
+        switchBar.show();
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        final Context context = getContext();
+        if (context != null) {
+            context.registerReceiver(mTetherChangeReceiver, TETHER_STATE_CHANGE_FILTER);
+        }
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        final Context context = getContext();
+        if (context != null) {
+            context.unregisterReceiver(mTetherChangeReceiver);
+        }
+    }
+
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.wifi_tether_settings;
+    }
+
+    @Override
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        mSSIDPreferenceController = new WifiTetherSSIDPreferenceController(context, this);
+        mPasswordPreferenceController = new WifiTetherPasswordPreferenceController(context, this);
+        mApBandPreferenceController = new WifiTetherApBandPreferenceController(context, this);
+
+        controllers.add(mSSIDPreferenceController);
+        controllers.add(mPasswordPreferenceController);
+        controllers.add(mApBandPreferenceController);
+        return controllers;
+    }
+
+    @Override
+    public void onTetherConfigUpdated() {
+        final WifiConfiguration config = buildNewConfig();
+        /**
+         * if soft AP is stopped, bring up
+         * else restart with new config
+         * TODO: update config on a running access point when framework support is added
+         */
+        if (mWifiManager.getWifiApState() == WifiManager.WIFI_AP_STATE_ENABLED) {
+            Log.d("TetheringSettings",
+                    "Wifi AP config changed while enabled, stop and restart");
+            mRestartWifiApAfterConfigChange = true;
+            mSwitchBarController.stopTether();
+        }
+        mWifiManager.setWifiApConfiguration(config);
+    }
+
+    private WifiConfiguration buildNewConfig() {
+        final WifiConfiguration config = new WifiConfiguration();
+
+        config.SSID = mSSIDPreferenceController.getSSID();
+        config.preSharedKey = mPasswordPreferenceController.getPassword();
+        config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA2_PSK);
+        config.allowedAuthAlgorithms.set(WifiConfiguration.AuthAlgorithm.OPEN);
+        config.apBand = mApBandPreferenceController.getBandIndex();
+        return config;
+    }
+
+    @VisibleForTesting
+    class TetherChangeReceiver extends BroadcastReceiver {
+        private static final String TAG = "TetherChangeReceiver";
+
+        @Override
+        public void onReceive(Context content, Intent intent) {
+            String action = intent.getAction();
+            if (action.equals(ACTION_TETHER_STATE_CHANGED)) {
+                if (mWifiManager.getWifiApState() == WifiManager.WIFI_AP_STATE_DISABLED
+                        && mRestartWifiApAfterConfigChange) {
+                    mRestartWifiApAfterConfigChange = false;
+                    Log.d(TAG, "Restarting WifiAp due to prior config change.");
+                    mSwitchBarController.startTether();
+                }
+            } else if (action.equals(WIFI_AP_STATE_CHANGED_ACTION)) {
+                int state = intent.getIntExtra(WifiManager.EXTRA_WIFI_AP_STATE, 0);
+                if (state == WifiManager.WIFI_AP_STATE_DISABLED
+                        && mRestartWifiApAfterConfigChange) {
+                    mRestartWifiApAfterConfigChange = false;
+                    Log.d(TAG, "Restarting WifiAp due to prior config change.");
+                    mSwitchBarController.startTether();
+                }
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
new file mode 100644
index 0000000..627bf32
--- /dev/null
+++ b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.tether;
+
+import static android.net.ConnectivityManager.TETHERING_WIFI;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.ConnectivityManager;
+import android.net.wifi.WifiManager;
+import android.os.Handler;
+import android.os.Looper;
+import android.provider.Settings;
+
+import com.android.settings.datausage.DataSaverBackend;
+import com.android.settings.widget.SwitchWidgetController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+public class WifiTetherSwitchBarController implements SwitchWidgetController.OnSwitchChangeListener,
+        LifecycleObserver, OnStart, OnStop {
+
+    private final Context mContext;
+    private final SwitchWidgetController mSwitchBar;
+    private final ConnectivityManager mConnectivityManager;
+    private final DataSaverBackend mDataSaverBackend;
+    private final WifiManager mWifiManager;
+
+    WifiTetherSwitchBarController(Context context, SwitchWidgetController switchBar) {
+        mContext = context;
+        mSwitchBar = switchBar;
+        mDataSaverBackend = new DataSaverBackend(context);
+        mConnectivityManager =
+                (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+        mSwitchBar.setChecked(mWifiManager.getWifiApState() == WifiManager.WIFI_AP_STATE_ENABLED);
+        mSwitchBar.setListener(this);
+    }
+
+    @Override
+    public void onStart() {
+        mSwitchBar.startListening();
+        mContext.registerReceiver(mReceiver,
+                WifiTetherPreferenceController.WIFI_TETHER_INTENT_FILTER);
+    }
+
+    @Override
+    public void onStop() {
+        mSwitchBar.stopListening();
+        mContext.unregisterReceiver(mReceiver);
+    }
+
+    @Override
+    public boolean onSwitchToggled(boolean isChecked) {
+        if (isChecked) {
+            startTether();
+        } else {
+            stopTether();
+        }
+        return true;
+    }
+
+    void stopTether() {
+        mSwitchBar.setEnabled(false);
+        mConnectivityManager.stopTethering(TETHERING_WIFI);
+    }
+
+    void startTether() {
+        mSwitchBar.setEnabled(false);
+        mConnectivityManager.startTethering(TETHERING_WIFI, true /* showProvisioningUi */,
+                NoOpOnStartTetheringCallback.newInstance(), new Handler(Looper.getMainLooper()));
+    }
+
+    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (WifiManager.WIFI_AP_STATE_CHANGED_ACTION.equals(action)) {
+                final int state = intent.getIntExtra(
+                        WifiManager.EXTRA_WIFI_AP_STATE, WifiManager.WIFI_AP_STATE_FAILED);
+                handleWifiApStateChanged(state);
+            } else if (Intent.ACTION_AIRPLANE_MODE_CHANGED.equals(action)) {
+                enableWifiSwitch();
+            }
+        }
+    };
+
+    private void handleWifiApStateChanged(int state) {
+        switch (state) {
+            case WifiManager.WIFI_AP_STATE_ENABLING:
+                mSwitchBar.setEnabled(false);
+                break;
+            case WifiManager.WIFI_AP_STATE_ENABLED:
+                if (!mSwitchBar.isChecked()) {
+                    mSwitchBar.setChecked(true);
+                }
+                enableWifiSwitch();
+                break;
+            case WifiManager.WIFI_AP_STATE_DISABLING:
+                if (mSwitchBar.isChecked()) {
+                    mSwitchBar.setChecked(false);
+                }
+                mSwitchBar.setEnabled(false);
+                break;
+            case WifiManager.WIFI_AP_STATE_DISABLED:
+                mSwitchBar.setChecked(false);
+                enableWifiSwitch();
+                break;
+            default:
+                mSwitchBar.setChecked(false);
+                enableWifiSwitch();
+                break;
+        }
+    }
+
+    private void enableWifiSwitch() {
+        boolean isAirplaneMode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.AIRPLANE_MODE_ON, 0) != 0;
+        if (!isAirplaneMode) {
+            mSwitchBar.setEnabled(!mDataSaverBackend.isDataSaverEnabled());
+        } else {
+            mSwitchBar.setEnabled(false);
+        }
+    }
+}
diff --git a/tests/anomaly-tester/Android.mk b/tests/anomaly-tester/Android.mk
new file mode 100644
index 0000000..ade37db
--- /dev/null
+++ b/tests/anomaly-tester/Android.mk
@@ -0,0 +1,25 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+LOCAL_CERTIFICATE := platform
+
+LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-test \
+    mockito-target \
+    ub-uiautomator \
+    truth-prebuilt \
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_PACKAGE_NAME := AnomalyTester
+
+LOCAL_INSTRUMENTATION_FOR := Settings
+
+LOCAL_USE_AAPT2 := true
+
+include $(BUILD_PACKAGE)
\ No newline at end of file
diff --git a/tests/anomaly-tester/AndroidManifest.xml b/tests/anomaly-tester/AndroidManifest.xml
new file mode 100644
index 0000000..7893b86
--- /dev/null
+++ b/tests/anomaly-tester/AndroidManifest.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.android.settings.anomaly.tester">
+
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.BLUETOOTH"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
+    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
+
+    <application
+        android:allowBackup="false"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@android:style/Theme.Material.Light.DarkActionBar">
+        <uses-library android:name="android.test.runner" />
+        <activity
+            android:name=".AnomalyActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <service
+            android:name=".service.AnomalyService"
+            android:exported="false"/>
+    </application>
+
+    <instrumentation
+        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="com.android.settings"
+        android:label="Settings Test Cases">
+    </instrumentation>
+
+</manifest>
\ No newline at end of file
diff --git a/tests/anomaly-tester/res/layout/activity_main.xml b/tests/anomaly-tester/res/layout/activity_main.xml
new file mode 100644
index 0000000..0561cff
--- /dev/null
+++ b/tests/anomaly-tester/res/layout/activity_main.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:orientation="vertical">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="4"
+        android:padding="4dp"
+        android:textSize="16sp">
+        <TextView
+            android:id="@+id/displayText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:maxLines="100000"/>
+    </ScrollView>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="2dp"
+        android:background="#444444"/>
+
+    <ScrollView
+        android:layout_height="0dp"
+        android:layout_width="match_parent"
+        android:layout_weight="6"
+        android:padding="5dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:gravity="center">
+
+            <include layout="@layout/bluetooth_anomaly"/>
+
+            <include layout="@layout/wakelock_anomaly"/>
+
+        </LinearLayout>
+    </ScrollView>
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/anomaly-tester/res/layout/bluetooth_anomaly.xml b/tests/anomaly-tester/res/layout/bluetooth_anomaly.xml
new file mode 100644
index 0000000..87e61b0
--- /dev/null
+++ b/tests/anomaly-tester/res/layout/bluetooth_anomaly.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingBottom="6dp">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Bluetooth Anomaly"
+        android:textSize="16sp"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <EditText
+            android:id="@+id/bluetooth_threshold"
+            android:layout_width="0dp"
+            android:layout_weight="3"
+            android:layout_height="wrap_content"
+            android:hint="Threshold(ms)"
+            android:text="3000"
+            android:inputType="number"/>
+
+        <EditText
+            android:id="@+id/bluetooth_run_time"
+            android:layout_width="0dp"
+            android:layout_weight="3"
+            android:layout_height="wrap_content"
+            android:hint="Run time(ms)"
+            android:text="6000"
+            android:inputType="number"/>
+
+        <Button
+            android:id="@+id/bluetooth_button"
+            android:layout_width="0dp"
+            android:layout_weight="2"
+            android:layout_height="wrap_content"
+            android:text="START"
+            android:onClick="startBluetoothAnomaly"/>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/anomaly-tester/res/layout/wakelock_anomaly.xml b/tests/anomaly-tester/res/layout/wakelock_anomaly.xml
new file mode 100644
index 0000000..08cb795
--- /dev/null
+++ b/tests/anomaly-tester/res/layout/wakelock_anomaly.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingBottom="6dp">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Wakelock Anomaly"
+        android:textSize="16sp"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <EditText
+            android:id="@+id/wakelock_threshold"
+            android:layout_width="0dp"
+            android:layout_weight="3"
+            android:layout_height="wrap_content"
+            android:hint="Threshold(ms)"
+            android:text="3000"
+            android:inputType="number"/>
+
+        <EditText
+            android:id="@+id/wakelock_run_time"
+            android:layout_width="0dp"
+            android:layout_weight="3"
+            android:layout_height="wrap_content"
+            android:hint="Run time(ms)"
+            android:text="6000"
+            android:inputType="number"/>
+
+        <Button
+            android:id="@+id/wakelock_button"
+            android:layout_width="0dp"
+            android:layout_weight="2"
+            android:layout_height="wrap_content"
+            android:text="START"
+            android:onClick="startWakelockAnomaly"/>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/anomaly-tester/res/values-af/strings.xml b/tests/anomaly-tester/res/values-af/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-af/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-am/strings.xml b/tests/anomaly-tester/res/values-am/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-am/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-ar/strings.xml b/tests/anomaly-tester/res/values-ar/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-ar/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-az/strings.xml b/tests/anomaly-tester/res/values-az/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-az/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-bg/strings.xml b/tests/anomaly-tester/res/values-bg/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-bg/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-bn/strings.xml b/tests/anomaly-tester/res/values-bn/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-bn/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-ca/strings.xml b/tests/anomaly-tester/res/values-ca/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-ca/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-cs/strings.xml b/tests/anomaly-tester/res/values-cs/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-cs/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-da/strings.xml b/tests/anomaly-tester/res/values-da/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-da/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-de/strings.xml b/tests/anomaly-tester/res/values-de/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-de/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-el/strings.xml b/tests/anomaly-tester/res/values-el/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-el/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-en-rAU/strings.xml b/tests/anomaly-tester/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-en-rAU/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-en-rGB/strings.xml b/tests/anomaly-tester/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-en-rGB/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-en-rIN/strings.xml b/tests/anomaly-tester/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-en-rIN/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-es-rUS/strings.xml b/tests/anomaly-tester/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-es-rUS/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-es/strings.xml b/tests/anomaly-tester/res/values-es/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-es/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-et/strings.xml b/tests/anomaly-tester/res/values-et/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-et/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-eu/strings.xml b/tests/anomaly-tester/res/values-eu/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-eu/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-fa/strings.xml b/tests/anomaly-tester/res/values-fa/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-fa/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-fi/strings.xml b/tests/anomaly-tester/res/values-fi/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-fi/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-fr-rCA/strings.xml b/tests/anomaly-tester/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-fr-rCA/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-fr/strings.xml b/tests/anomaly-tester/res/values-fr/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-fr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-gl/strings.xml b/tests/anomaly-tester/res/values-gl/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-gl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-gu/strings.xml b/tests/anomaly-tester/res/values-gu/strings.xml
new file mode 100644
index 0000000..8c09d6c
--- /dev/null
+++ b/tests/anomaly-tester/res/values-gu/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"અસંગતિ પરીક્ષક"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-hi/strings.xml b/tests/anomaly-tester/res/values-hi/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-hi/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-hr/strings.xml b/tests/anomaly-tester/res/values-hr/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-hr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-hu/strings.xml b/tests/anomaly-tester/res/values-hu/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-hu/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-hy/strings.xml b/tests/anomaly-tester/res/values-hy/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-hy/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-in/strings.xml b/tests/anomaly-tester/res/values-in/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-in/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-is/strings.xml b/tests/anomaly-tester/res/values-is/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-is/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-it/strings.xml b/tests/anomaly-tester/res/values-it/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-it/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-iw/strings.xml b/tests/anomaly-tester/res/values-iw/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-iw/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-ja/strings.xml b/tests/anomaly-tester/res/values-ja/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-ja/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-ka/strings.xml b/tests/anomaly-tester/res/values-ka/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-ka/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-kk/strings.xml b/tests/anomaly-tester/res/values-kk/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-kk/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-km/strings.xml b/tests/anomaly-tester/res/values-km/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-km/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-kn/strings.xml b/tests/anomaly-tester/res/values-kn/strings.xml
new file mode 100644
index 0000000..dace89c
--- /dev/null
+++ b/tests/anomaly-tester/res/values-kn/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"ಅನೋಮಲಿಟೆಸ್ಟರ್"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-ko/strings.xml b/tests/anomaly-tester/res/values-ko/strings.xml
new file mode 100644
index 0000000..d8b6c6a
--- /dev/null
+++ b/tests/anomaly-tester/res/values-ko/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"비정상 상황 테스터"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-ky/strings.xml b/tests/anomaly-tester/res/values-ky/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-ky/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-lo/strings.xml b/tests/anomaly-tester/res/values-lo/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-lo/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-lt/strings.xml b/tests/anomaly-tester/res/values-lt/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-lt/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-lv/strings.xml b/tests/anomaly-tester/res/values-lv/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-lv/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-mk/strings.xml b/tests/anomaly-tester/res/values-mk/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-mk/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-ml/strings.xml b/tests/anomaly-tester/res/values-ml/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-ml/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-mn/strings.xml b/tests/anomaly-tester/res/values-mn/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-mn/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-mr/strings.xml b/tests/anomaly-tester/res/values-mr/strings.xml
new file mode 100644
index 0000000..3472e99
--- /dev/null
+++ b/tests/anomaly-tester/res/values-mr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"विसंगती परीक्षक"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-ms/strings.xml b/tests/anomaly-tester/res/values-ms/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-ms/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-my/strings.xml b/tests/anomaly-tester/res/values-my/strings.xml
new file mode 100644
index 0000000..3535a3f
--- /dev/null
+++ b/tests/anomaly-tester/res/values-my/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"Anomaly စမ်းသပ်ကိရိယာ"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-nb/strings.xml b/tests/anomaly-tester/res/values-nb/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-nb/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-ne/strings.xml b/tests/anomaly-tester/res/values-ne/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-ne/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-nl/strings.xml b/tests/anomaly-tester/res/values-nl/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-nl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-pa/strings.xml b/tests/anomaly-tester/res/values-pa/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-pa/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-pl/strings.xml b/tests/anomaly-tester/res/values-pl/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-pl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-pt-rBR/strings.xml b/tests/anomaly-tester/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-pt-rBR/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-pt-rPT/strings.xml b/tests/anomaly-tester/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-pt-rPT/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-pt/strings.xml b/tests/anomaly-tester/res/values-pt/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-pt/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-ro/strings.xml b/tests/anomaly-tester/res/values-ro/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-ro/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-ru/strings.xml b/tests/anomaly-tester/res/values-ru/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-ru/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-si/strings.xml b/tests/anomaly-tester/res/values-si/strings.xml
new file mode 100644
index 0000000..de39b09
--- /dev/null
+++ b/tests/anomaly-tester/res/values-si/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"විෂමතා පරීක්ෂක"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-sk/strings.xml b/tests/anomaly-tester/res/values-sk/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-sk/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-sl/strings.xml b/tests/anomaly-tester/res/values-sl/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-sl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-sq/strings.xml b/tests/anomaly-tester/res/values-sq/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-sq/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-sr/strings.xml b/tests/anomaly-tester/res/values-sr/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-sr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-sv/strings.xml b/tests/anomaly-tester/res/values-sv/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-sv/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-sw/strings.xml b/tests/anomaly-tester/res/values-sw/strings.xml
new file mode 100644
index 0000000..e8d6de8
--- /dev/null
+++ b/tests/anomaly-tester/res/values-sw/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"Kipengele cha Kubaini Hitilafu"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-ta/strings.xml b/tests/anomaly-tester/res/values-ta/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-ta/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-te/strings.xml b/tests/anomaly-tester/res/values-te/strings.xml
new file mode 100644
index 0000000..f175840
--- /dev/null
+++ b/tests/anomaly-tester/res/values-te/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"అనామలీ టెస్టర్"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-th/strings.xml b/tests/anomaly-tester/res/values-th/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-th/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-tl/strings.xml b/tests/anomaly-tester/res/values-tl/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-tl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-tr/strings.xml b/tests/anomaly-tester/res/values-tr/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-tr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-uk/strings.xml b/tests/anomaly-tester/res/values-uk/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-uk/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-ur/strings.xml b/tests/anomaly-tester/res/values-ur/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-ur/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-uz/strings.xml b/tests/anomaly-tester/res/values-uz/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-uz/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-vi/strings.xml b/tests/anomaly-tester/res/values-vi/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-vi/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-zh-rCN/strings.xml b/tests/anomaly-tester/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-zh-rCN/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-zh-rHK/strings.xml b/tests/anomaly-tester/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-zh-rHK/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-zh-rTW/strings.xml b/tests/anomaly-tester/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..cdc7ee5
--- /dev/null
+++ b/tests/anomaly-tester/res/values-zh-rTW/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values-zu/strings.xml b/tests/anomaly-tester/res/values-zu/strings.xml
new file mode 100644
index 0000000..e28ad50
--- /dev/null
+++ b/tests/anomaly-tester/res/values-zu/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="4895205370884535654">"I-AnomalyTester"</string>
+</resources>
diff --git a/tests/anomaly-tester/res/values/strings.xml b/tests/anomaly-tester/res/values/strings.xml
new file mode 100644
index 0000000..99de34e
--- /dev/null
+++ b/tests/anomaly-tester/res/values/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<resources>
+    <string name="app_name">AnomalyTester</string>
+</resources>
diff --git a/tests/anomaly-tester/src/com/android/settings/anomaly/tester/AnomalyActivity.java b/tests/anomaly-tester/src/com/android/settings/anomaly/tester/AnomalyActivity.java
new file mode 100644
index 0000000..e4567c2
--- /dev/null
+++ b/tests/anomaly-tester/src/com/android/settings/anomaly/tester/AnomalyActivity.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings.anomaly.tester;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.ResultReceiver;
+import android.provider.Settings;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import com.android.settings.anomaly.tester.service.AnomalyService;
+import com.android.settings.anomaly.tester.utils.AnomalyActions;
+import com.android.settings.anomaly.tester.utils.AnomalyPolicyBuilder;
+
+/**
+ * Main activity to control and start anomaly
+ */
+public class AnomalyActivity extends Activity {
+    private static final String TAG = AnomalyActivity.class.getSimpleName();
+
+    public static final String KEY_TARGET_BUTTON = "target_button";
+
+    private AnomalyResultReceiver mResultReceiver;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        mResultReceiver = new AnomalyResultReceiver(new Handler());
+    }
+
+    public void startBluetoothAnomaly(View view) {
+        try {
+            // Enable anomaly detection and change the threshold
+            final String config = new AnomalyPolicyBuilder()
+                    .addPolicy(AnomalyPolicyBuilder.KEY_ANOMALY_DETECTION_ENABLED, true)
+                    .addPolicy(AnomalyPolicyBuilder.KEY_BLUETOOTH_SCAN_DETECTION_ENABLED, true)
+                    .addPolicy(AnomalyPolicyBuilder.KEY_BLUETOOTH_SCAN_THRESHOLD,
+                            getValueFromEditText(R.id.bluetooth_threshold))
+                    .build();
+            Settings.Global.putString(getContentResolver(),
+                    Settings.Global.ANOMALY_DETECTION_CONSTANTS, config);
+
+            // Start the anomaly service
+            Intent intent = new Intent(this, AnomalyService.class);
+            intent.putExtra(AnomalyActions.KEY_ACTION, AnomalyActions.ACTION_BLE_SCAN_UNOPTIMIZED);
+            intent.putExtra(AnomalyActions.KEY_DURATION_MS,
+                    getValueFromEditText(R.id.bluetooth_run_time));
+            intent.putExtra(AnomalyActions.KEY_RESULT_RECEIVER, mResultReceiver);
+            intent.putExtra(KEY_TARGET_BUTTON, view.getId());
+            startService(intent);
+
+            view.setEnabled(false);
+        } catch (NumberFormatException e) {
+            Toast.makeText(getApplicationContext(), e.toString(), Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    public void startWakelockAnomaly(View view) {
+        try {
+            // Enable anomaly detection and change the threshold
+            final String config = new AnomalyPolicyBuilder()
+                    .addPolicy(AnomalyPolicyBuilder.KEY_ANOMALY_DETECTION_ENABLED, true)
+                    .addPolicy(AnomalyPolicyBuilder.KEY_WAKELOCK_DETECTION_ENABLED, true)
+                    .addPolicy(AnomalyPolicyBuilder.KEY_WAKELOCK_THRESHOLD,
+                            getValueFromEditText(R.id.wakelock_threshold))
+                    .build();
+            Settings.Global.putString(getContentResolver(),
+                    Settings.Global.ANOMALY_DETECTION_CONSTANTS,
+                    config);
+
+            // Start the anomaly service
+            Intent intent = new Intent(this, AnomalyService.class);
+            intent.putExtra(AnomalyActions.KEY_ACTION, AnomalyActions.ACTION_WAKE_LOCK);
+            intent.putExtra(AnomalyActions.KEY_DURATION_MS,
+                    getValueFromEditText(R.id.wakelock_run_time));
+            intent.putExtra(AnomalyActions.KEY_RESULT_RECEIVER, mResultReceiver);
+            intent.putExtra(KEY_TARGET_BUTTON, view.getId());
+            startService(intent);
+
+            view.setEnabled(false);
+        } catch (NumberFormatException e) {
+            Toast.makeText(getApplicationContext(), e.toString(), Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    private long getValueFromEditText(final int id) throws NumberFormatException {
+        final EditText editText = findViewById(id);
+        if (editText != null) {
+            final long value = Long.parseLong(editText.getText().toString());
+            if (value > 0) {
+                return value;
+            }
+        }
+
+        throw new NumberFormatException("Number should be positive");
+    }
+
+    private class AnomalyResultReceiver extends ResultReceiver {
+
+        public AnomalyResultReceiver(Handler handler) {
+            super(handler);
+        }
+
+        @Override
+        protected void onReceiveResult(int resultCode, Bundle resultData) {
+            super.onReceiveResult(resultCode, resultData);
+
+            final Button button = findViewById(resultData.getInt(KEY_TARGET_BUTTON));
+            if (button != null) {
+                button.setEnabled(true);
+            }
+
+        }
+    }
+}
diff --git a/tests/anomaly-tester/src/com/android/settings/anomaly/tester/service/AnomalyService.java b/tests/anomaly-tester/src/com/android/settings/anomaly/tester/service/AnomalyService.java
new file mode 100644
index 0000000..b569bce
--- /dev/null
+++ b/tests/anomaly-tester/src/com/android/settings/anomaly/tester/service/AnomalyService.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.anomaly.tester.service;
+
+import android.annotation.Nullable;
+import android.app.IntentService;
+import android.content.Intent;
+import android.os.ResultReceiver;
+
+import com.android.settings.anomaly.tester.utils.AnomalyActions;
+
+/**
+ * Service to run the anomaly action
+ */
+public class AnomalyService extends IntentService {
+    private static final String TAG = AnomalyService.class.getSimpleName();
+
+    public AnomalyService() {
+        super(AnomalyService.class.getSimpleName());
+    }
+
+    @Override
+    protected void onHandleIntent(@Nullable Intent intent) {
+        final String action = intent.getStringExtra(AnomalyActions.KEY_ACTION);
+        final long durationMs = intent.getLongExtra(AnomalyActions.KEY_DURATION_MS, 0);
+        final ResultReceiver resultReceiver = intent.getParcelableExtra(
+                AnomalyActions.KEY_RESULT_RECEIVER);
+
+        AnomalyActions.doAction(this, action, durationMs);
+
+        if (resultReceiver != null) {
+            resultReceiver.send(0 /* resultCode */, intent.getExtras());
+        }
+    }
+}
diff --git a/tests/anomaly-tester/src/com/android/settings/anomaly/tester/utils/AnomalyActions.java b/tests/anomaly-tester/src/com/android/settings/anomaly/tester/utils/AnomalyActions.java
new file mode 100644
index 0000000..58e5a99
--- /dev/null
+++ b/tests/anomaly-tester/src/com/android/settings/anomaly/tester/utils/AnomalyActions.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.anomaly.tester.utils;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.le.BluetoothLeScanner;
+import android.bluetooth.le.ScanCallback;
+import android.bluetooth.le.ScanResult;
+import android.bluetooth.le.ScanSettings;
+import android.content.Context;
+import android.os.PowerManager;
+import android.util.Log;
+
+import java.util.List;
+
+/**
+ * Actions to generate anomaly.
+ */
+public class AnomalyActions {
+    private static final String TAG = AnomalyActions.class.getSimpleName();
+
+    public static final String KEY_ACTION = "action";
+    public static final String KEY_DURATION_MS = "duration_ms";
+    public static final String KEY_RESULT_RECEIVER = "result_receiver";
+
+    public static final String ACTION_BLE_SCAN_UNOPTIMIZED = "action.ble_scan_unoptimized";
+    public static final String ACTION_WAKE_LOCK = "action.wake_lock";
+
+    public static void doAction(Context ctx, String actionCode, long durationMs) {
+        if (actionCode == null) {
+            Log.e(TAG, "Intent was missing action.");
+            return;
+        }
+        switch (actionCode) {
+            case ACTION_BLE_SCAN_UNOPTIMIZED:
+                doUnoptimizedBleScan(ctx, durationMs);
+                break;
+            case ACTION_WAKE_LOCK:
+                doHoldWakelock(ctx, durationMs);
+            default:
+                Log.e(TAG, "Intent had invalid action");
+        }
+    }
+
+    private static void doUnoptimizedBleScan(Context ctx, long durationMs) {
+        ScanSettings scanSettings = new ScanSettings.Builder()
+                .setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY).build();
+
+        // perform ble scanning
+        BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        if (bluetoothAdapter == null || !bluetoothAdapter.isEnabled() ) {
+            Log.e(TAG, "Device does not support Bluetooth or Bluetooth not enabled");
+            return;
+        }
+        BluetoothLeScanner bleScanner = bluetoothAdapter.getBluetoothLeScanner();
+        if (bleScanner == null) {
+            Log.e(TAG, "Cannot access BLE scanner");
+            return;
+        }
+
+        ScanCallback scanCallback = new ScanCallback() {
+            @Override
+            public void onScanResult(int callbackType, ScanResult result) {
+                Log.v(TAG, "called onScanResult");
+            }
+
+            @Override
+            public void onScanFailed(int errorCode) {
+                Log.v(TAG, "called onScanFailed");
+            }
+
+            @Override
+            public void onBatchScanResults(List<ScanResult> results) {
+                Log.v(TAG, "called onBatchScanResults");
+            }
+        };
+
+        bleScanner.startScan(null, scanSettings, scanCallback);
+        try {
+            Thread.sleep(durationMs);
+        } catch (InterruptedException e) {
+            Log.e(TAG, "Thread couldn't sleep for " + durationMs, e);
+        }
+        bleScanner.stopScan(scanCallback);
+    }
+
+    private static void doHoldWakelock(Context ctx, long durationMs) {
+        PowerManager powerManager = ctx.getSystemService(PowerManager.class);
+        PowerManager.WakeLock wl = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,
+                "AnomalyWakeLock");
+        wl.acquire();
+        try {
+            Thread.sleep(durationMs);
+        } catch (InterruptedException e) {
+            Log.e(TAG, "Thread couldn't sleep for " + durationMs, e);
+        }
+        wl.release();
+    }
+}
diff --git a/tests/anomaly-tester/src/com/android/settings/anomaly/tester/utils/AnomalyPolicyBuilder.java b/tests/anomaly-tester/src/com/android/settings/anomaly/tester/utils/AnomalyPolicyBuilder.java
new file mode 100644
index 0000000..bf8e075
--- /dev/null
+++ b/tests/anomaly-tester/src/com/android/settings/anomaly/tester/utils/AnomalyPolicyBuilder.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.anomaly.tester.utils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Builder to build the anomaly policy string, used in {@link android.provider.Settings.Global}
+ *
+ * @see android.provider.Settings.Global#ANOMALY_DETECTION_CONSTANTS
+ */
+public class AnomalyPolicyBuilder {
+    public static final String KEY_ANOMALY_DETECTION_ENABLED = "anomaly_detection_enabled";
+    public static final String KEY_WAKELOCK_DETECTION_ENABLED = "wakelock_enabled";
+    public static final String KEY_WAKEUP_ALARM_DETECTION_ENABLED = "wakeup_alarm_enabled";
+    public static final String KEY_BLUETOOTH_SCAN_DETECTION_ENABLED = "bluetooth_scan_enabled";
+    public static final String KEY_WAKELOCK_THRESHOLD = "wakelock_threshold";
+    public static final String KEY_WAKEUP_ALARM_THRESHOLD = "wakeup_alarm_threshold";
+    public static final String KEY_BLUETOOTH_SCAN_THRESHOLD = "bluetooth_scan_threshold";
+
+    public static final String DELIM = ",";
+
+    private Map<String, String> mValues;
+
+    public AnomalyPolicyBuilder() {
+        mValues = new HashMap<>();
+    }
+
+    public AnomalyPolicyBuilder addPolicy(String key, String value) {
+        mValues.put(key, value);
+        return this;
+    }
+
+    public AnomalyPolicyBuilder addPolicy(String key, long value) {
+        mValues.put(key, Long.toString(value));
+        return this;
+    }
+
+
+    public AnomalyPolicyBuilder addPolicy(String key, boolean value) {
+        mValues.put(key, value ? "true" : "false");
+        return this;
+    }
+
+    public String build() {
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<String, String> entry : mValues.entrySet()) {
+            sb.append(entry.getKey() + "=" + entry.getValue() + DELIM);
+        }
+
+        if (sb.length() != 0) {
+            return sb.substring(0, sb.length() - 1);
+        } else {
+            return "";
+        }
+    }
+}
diff --git a/tests/anomaly-tester/src/com/android/settings/anomaly/tests/BluetoothAnomalyTest.java b/tests/anomaly-tester/src/com/android/settings/anomaly/tests/BluetoothAnomalyTest.java
new file mode 100644
index 0000000..3630ce4
--- /dev/null
+++ b/tests/anomaly-tester/src/com/android/settings/anomaly/tests/BluetoothAnomalyTest.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings.anomaly.tests;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.Intent;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.Until;
+import android.text.format.DateUtils;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Functional test for bluetooth unoptimized scanning anomaly detector
+ *
+ * @see com.android.settings.fuelgauge.anomaly.checker.BluetoothScanAnomalyDetector
+ */
+@RunWith(AndroidJUnit4.class)
+public class BluetoothAnomalyTest {
+    private static final String BATTERY_INTENT = "android.intent.action.POWER_USAGE_SUMMARY";
+    private static final String RES_BT_EDITTEXT =
+            "com.android.settings.anomaly.tester:id/bluetooth_run_time";
+    private static final String RES_BT_BUTTON =
+            "com.android.settings.anomaly.tester:id/bluetooth_button";
+    private static final long TIME_OUT = 3000;
+    private UiDevice mDevice;
+
+    @Before
+    public void setUp() {
+        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        final Context context = instrumentation.getContext();
+        mDevice = UiDevice.getInstance(instrumentation);
+
+        // setup environment
+        TestUtils.setUp(instrumentation);
+        // start anomaly-tester app
+        TestUtils.startAnomalyApp(context, mDevice);
+    }
+
+    @After
+    public void tearDown() {
+        TestUtils.tearDown(InstrumentationRegistry.getInstrumentation());
+    }
+
+    @Test
+    public void testBluetoothAnomaly_longScanningTime_reportAnomaly() throws InterruptedException {
+        // Set running time
+        final long durationMs = DateUtils.SECOND_IN_MILLIS * 15;
+        TestUtils.setEditTextWithValue(mDevice, RES_BT_EDITTEXT, durationMs);
+
+        // Click start button
+        TestUtils.clickButton(mDevice, RES_BT_BUTTON);
+
+        // Wait for its running
+        mDevice.pressHome();
+        TestUtils.wait(mDevice, durationMs);
+
+        // Check it in battery main page
+        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        instrumentation.startActivitySync(new Intent(BATTERY_INTENT));
+        assertWithMessage("Doesn't have bluetooth anomaly").that(
+                mDevice.wait(Until.findObject(By.text("AnomalyTester draining battery")),
+                        TIME_OUT)).isNotNull();
+    }
+
+    @Test
+    public void testBluetoothAnomaly_shortScanningTime_notReport() throws InterruptedException {
+        // Set running time
+        final long durationMs = DateUtils.SECOND_IN_MILLIS;
+        TestUtils.setEditTextWithValue(mDevice, RES_BT_EDITTEXT, durationMs);
+
+        // Click start button
+        TestUtils.clickButton(mDevice, RES_BT_BUTTON);
+
+        // Wait for its running
+        mDevice.pressHome();
+        TestUtils.wait(mDevice, durationMs);
+
+        // Check it in battery main page
+        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        instrumentation.startActivitySync(new Intent(BATTERY_INTENT));
+        assertWithMessage("Shouldn't have bluetooth anomaly").that(
+                mDevice.wait(Until.findObject(By.text("AnomalyTester draining battery")),
+                        TIME_OUT)).isNull();
+    }
+
+}
diff --git a/tests/anomaly-tester/src/com/android/settings/anomaly/tests/TestUtils.java b/tests/anomaly-tester/src/com/android/settings/anomaly/tests/TestUtils.java
new file mode 100644
index 0000000..ac15d77
--- /dev/null
+++ b/tests/anomaly-tester/src/com/android/settings/anomaly/tests/TestUtils.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings.anomaly.tests;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.app.Instrumentation;
+import android.app.UiAutomation;
+import android.content.Context;
+import android.content.Intent;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+
+public class TestUtils {
+    private static final String PACKAGE_NAME = "com.android.settings.anomaly.tester";
+    private static final long TIME_OUT = 3000;
+
+    /**
+     * This method set up the environment for anomaly test
+     *
+     * @param instrumentation to execute command
+     */
+    public static void setUp(Instrumentation instrumentation) {
+        final UiAutomation uiAutomation = instrumentation.getUiAutomation();
+        // pretend unplug and screen off, also reset the battery stats
+        uiAutomation.executeShellCommand("dumpsys battery unplug");
+        uiAutomation.executeShellCommand("dumpsys batterystats enable pretend-screen-off");
+        uiAutomation.executeShellCommand("dumpsys batterystats --reset");
+    }
+
+    /**
+     * This method cleans up all the commands in {@link #setUp(Instrumentation)}
+     *
+     * @param instrumentation to execute command
+     */
+    public static void tearDown(Instrumentation instrumentation) {
+        final UiAutomation uiAutomation = instrumentation.getUiAutomation();
+        // reset unplug and screen-off
+        uiAutomation.executeShellCommand("dumpsys battery reset");
+        uiAutomation.executeShellCommand("dumpsys batterystats disable pretend-screen-off");
+    }
+
+    public static void startAnomalyApp(Context context, UiDevice uiDevice) {
+        final Intent intent = context.getPackageManager().getLaunchIntentForPackage(PACKAGE_NAME);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        context.startActivity(intent);
+        uiDevice.wait(Until.hasObject(By.pkg(PACKAGE_NAME).depth(0)), TIME_OUT);
+    }
+
+    /**
+     * Find {@link android.widget.EditText} with {@code res} and set its {@code value}
+     */
+    public static void setEditTextWithValue(UiDevice uiDevice, String res, long value) {
+        final UiObject2 editText = uiDevice.findObject(By.res(res));
+        assertWithMessage("Cannot find editText with res: " + res).that(editText).isNotNull();
+        editText.setText(String.valueOf(value));
+    }
+
+    /**
+     * Find {@link android.widget.Button} with {@code res} and click it
+     */
+    public static void clickButton(UiDevice uiDevice, String res) {
+        final UiObject2 button = uiDevice.findObject(By.res(res));
+        assertWithMessage("Cannot find button with res: " + res).that(button).isNotNull();
+        button.click();
+    }
+
+    /**
+     * Make {@link UiDevice} wait for {@code timeMs}
+     *
+     * @see Thread#sleep(long)
+     */
+    public static void wait(UiDevice uiDevice, long timeMs) throws InterruptedException {
+        uiDevice.waitForIdle();
+        Thread.sleep(timeMs);
+    }
+}
diff --git a/tests/anomaly-tester/src/com/android/settings/anomaly/tests/WakelockAnomalyTest.java b/tests/anomaly-tester/src/com/android/settings/anomaly/tests/WakelockAnomalyTest.java
new file mode 100644
index 0000000..a2f3804
--- /dev/null
+++ b/tests/anomaly-tester/src/com/android/settings/anomaly/tests/WakelockAnomalyTest.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings.anomaly.tests;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.Intent;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.Until;
+import android.text.format.DateUtils;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Functional test for bluetooth unoptimized scanning anomaly detector
+ *
+ * @see com.android.settings.fuelgauge.anomaly.checker.BluetoothScanAnomalyDetector
+ */
+@RunWith(AndroidJUnit4.class)
+public class WakelockAnomalyTest {
+    private static final String BATTERY_INTENT = "android.intent.action.POWER_USAGE_SUMMARY";
+    private static final String RES_WAKELOCK_EDITTEXT =
+            "com.android.settings.anomaly.tester:id/wakelock_run_time";
+    private static final String RES_WAKELOCK_BUTTON =
+            "com.android.settings.anomaly.tester:id/wakelock_button";
+    private static final long TIME_OUT = 3000;
+    private UiDevice mDevice;
+
+    @Before
+    public void setUp() {
+        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        final Context context = instrumentation.getContext();
+        mDevice = UiDevice.getInstance(instrumentation);
+
+        // setup environment
+        TestUtils.setUp(instrumentation);
+        // start anomaly-tester app
+        TestUtils.startAnomalyApp(context, mDevice);
+    }
+
+    @After
+    public void tearDown() {
+        TestUtils.tearDown(InstrumentationRegistry.getInstrumentation());
+    }
+
+    @Test
+    public void testWakelockAnomaly_longTimeWhileRunning_report() throws InterruptedException {
+        // Set running time
+        final long durationMs = DateUtils.SECOND_IN_MILLIS * 15;
+        TestUtils.setEditTextWithValue(mDevice, RES_WAKELOCK_EDITTEXT, durationMs);
+
+        // Click start button
+        TestUtils.clickButton(mDevice, RES_WAKELOCK_BUTTON);
+
+        // Wait for its running
+        mDevice.pressHome();
+        // Sleeping time less than running time, so the app still holding wakelock when we check
+        TestUtils.wait(mDevice, durationMs - TIME_OUT);
+
+        // Check it in battery main page
+        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        instrumentation.startActivitySync(new Intent(BATTERY_INTENT));
+        assertWithMessage("Doesn't have wakelock anomaly").that(
+                mDevice.wait(Until.findObject(By.text("AnomalyTester draining battery")),
+                        TIME_OUT)).isNotNull();
+    }
+
+    @Test
+    public void testWakelockAnomaly_shortTime_notReport() throws InterruptedException {
+        // Set running time
+        final long durationMs = DateUtils.SECOND_IN_MILLIS;
+        TestUtils.setEditTextWithValue(mDevice, RES_WAKELOCK_EDITTEXT, durationMs);
+
+        // Click start button
+        TestUtils.clickButton(mDevice, RES_WAKELOCK_BUTTON);
+
+        // Wait for its running
+        mDevice.pressHome();
+        TestUtils.wait(mDevice, durationMs);
+
+        // Check it in battery main page
+        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        instrumentation.startActivitySync(new Intent(BATTERY_INTENT));
+        assertWithMessage("Shouldn't have wakelock anomaly").that(
+                mDevice.wait(Until.findObject(By.text("AnomalyTester draining battery")),
+                        TIME_OUT)).isNull();
+    }
+
+    @Test
+    public void testWakelockAnomaly_longTimeWhileNotRunning_notReport()
+            throws InterruptedException {
+        // Set running time
+        final long durationMs = DateUtils.SECOND_IN_MILLIS * 10;
+        TestUtils.setEditTextWithValue(mDevice, RES_WAKELOCK_EDITTEXT, durationMs);
+
+        // Click start button
+        TestUtils.clickButton(mDevice, RES_WAKELOCK_BUTTON);
+
+        // Wait for its running
+        mDevice.pressHome();
+        // Wait more time for releasing the wakelock
+        TestUtils.wait(mDevice, durationMs + TIME_OUT);
+
+        // Check it in battery main page
+        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        instrumentation.startActivitySync(new Intent(BATTERY_INTENT));
+        assertWithMessage("Shouldn't have wakelock anomaly").that(
+                mDevice.wait(Until.findObject(By.text("AnomalyTester draining battery")),
+                        TIME_OUT)).isNull();
+    }
+
+}
diff --git a/tests/app/src/com/android/settings/ManagedAccessSettingsLowRamTest.java b/tests/app/src/com/android/settings/ManagedAccessSettingsLowRamTest.java
new file mode 100644
index 0000000..95c1dcf
--- /dev/null
+++ b/tests/app/src/com/android/settings/ManagedAccessSettingsLowRamTest.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+
+import android.app.ActivityManager;
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.Intent;
+import android.provider.Settings;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class ManagedAccessSettingsLowRamTest {
+
+    private Instrumentation mInstrumentation;
+    private Context mTargetContext;
+
+    @Before
+    public void setUp() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mTargetContext = mInstrumentation.getTargetContext();
+    }
+
+    @Test
+    public void testManagedAccessOptionsVisibility() throws Exception {
+        mInstrumentation.startActivitySync(new Intent(mTargetContext,
+                com.android.settings.Settings.SpecialAccessSettingsActivity.class));
+
+        String[] managedServiceLabels = new String[] {"Do Not Disturb access",
+                "VR helper services", "Notification access", "Picture-in-picture"};
+        for (String label : managedServiceLabels) {
+            if (ActivityManager.isLowRamDeviceStatic()) {
+                onView(withText(label)).check(doesNotExist());
+            } else {
+                onView(withText(label)).check(matches(isDisplayed()));
+            }
+        }
+    }
+
+    @Test
+    public void launchNotificationSetting_onlyWorksIfNotLowRam() {
+        final Intent intent = new Intent(Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS);
+
+        mInstrumentation.startActivitySync(intent);
+
+        final String label = "This feature is not available on this device";
+        if (ActivityManager.isLowRamDeviceStatic()) {
+            onView(withText(label)).check(matches(isDisplayed()));
+        } else {
+            onView(withText(label)).check(doesNotExist());
+        }
+    }
+
+    @Test
+    public void launchDndSetting_onlyWorksIfNotLowRam() {
+        final Intent intent = new Intent(Settings.ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS);
+
+        mInstrumentation.startActivitySync(intent);
+
+        final String label = "This feature is not available on this device";
+        if (ActivityManager.isLowRamDeviceStatic()) {
+            onView(withText(label)).check(matches(isDisplayed()));
+        } else {
+            onView(withText(label)).check(doesNotExist());
+        }
+    }
+
+    @Test
+    public void launchVrSetting_onlyWorksIfNotLowRam() {
+        final Intent intent = new Intent(Settings.ACTION_VR_LISTENER_SETTINGS);
+
+        mInstrumentation.startActivitySync(intent);
+
+        final String label = "This feature is not available on this device";
+        if (ActivityManager.isLowRamDeviceStatic()) {
+            onView(withText(label)).check(matches(isDisplayed()));
+        } else {
+            onView(withText(label)).check(doesNotExist());
+        }
+    }
+
+    @Test
+    public void launchPictureInPictureSetting_onlyWorksIfNotLowRam() {
+        final Intent intent = new Intent(Settings.ACTION_PICTURE_IN_PICTURE_SETTINGS);
+
+        mInstrumentation.startActivitySync(intent);
+
+        final String label = "This feature is not available on this device";
+        if (ActivityManager.isLowRamDeviceStatic()) {
+            onView(withText(label)).check(matches(isDisplayed()));
+        } else {
+            onView(withText(label)).check(doesNotExist());
+        }
+    }
+}
diff --git a/tests/app/src/com/android/settings/applications/AdvancedAppSettingsTest.java b/tests/app/src/com/android/settings/applications/DefaultAppSettingsTest.java
similarity index 97%
rename from tests/app/src/com/android/settings/applications/AdvancedAppSettingsTest.java
rename to tests/app/src/com/android/settings/applications/DefaultAppSettingsTest.java
index 1831b59..bd03bc9 100644
--- a/tests/app/src/com/android/settings/applications/AdvancedAppSettingsTest.java
+++ b/tests/app/src/com/android/settings/applications/DefaultAppSettingsTest.java
@@ -32,7 +32,7 @@
  * Test for Advanced App preferences.
  */
 @SmallTest
-public class AdvancedAppSettingsTest extends InstrumentationTestCase {
+public class DefaultAppSettingsTest extends InstrumentationTestCase {
 
     private UiDevice mDevice;
     private Context mTargetContext;
diff --git a/tests/app/src/com/android/settings/password/ChooseLockGenericTest.java b/tests/app/src/com/android/settings/password/ChooseLockGenericTest.java
index e2bd6ee..40b69a4 100644
--- a/tests/app/src/com/android/settings/password/ChooseLockGenericTest.java
+++ b/tests/app/src/com/android/settings/password/ChooseLockGenericTest.java
@@ -18,9 +18,7 @@
 
 import static android.support.test.InstrumentationRegistry.getInstrumentation;
 import static android.support.test.InstrumentationRegistry.getTargetContext;
-
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.junit.Assert.assertTrue;
 
 import android.app.Activity;
@@ -39,6 +37,7 @@
 import android.support.test.uiautomator.UiObject;
 import android.support.test.uiautomator.UiSelector;
 import android.text.format.DateUtils;
+import android.view.WindowManager;
 
 import com.android.internal.widget.LockPatternUtils;
 
@@ -93,7 +92,9 @@
             // WHEN ChooseLockGeneric is launched with no extras.
             mChooseLockGenericActivityRule.launchActivity(null /* No extras */);
             // THEN ConfirmLockPassword.InternalActivity is shown.
-            assertThat(getCurrentActivity())
+            final Activity activity = getCurrentActivity();
+            assertThat(isSecureWindow(activity)).isTrue();
+            assertThat(activity)
                     .isInstanceOf(ConfirmLockPassword.InternalActivity.class);
         } finally {
             finishAllAppTasks();
@@ -110,7 +111,9 @@
             // WHEN ChooseLockGeneric is launched with extras to by-pass lock password confirmation.
             mChooseLockGenericActivityRule.launchActivity(PHISHING_ATTACK_INTENT);
             // THEN ConfirmLockPassword.InternalActivity is still shown.
-            assertThat(getCurrentActivity())
+            final Activity activity = getCurrentActivity();
+            assertThat(isSecureWindow(activity)).isTrue();
+            assertThat(activity)
                     .isInstanceOf(ConfirmLockPassword.InternalActivity.class);
         } finally {
             finishAllAppTasks();
@@ -217,4 +220,9 @@
         mDevice.pressEnter();
         mDevice.waitForIdle();
     }
+
+    private boolean isSecureWindow(Activity activity) {
+        return (activity.getWindow().getAttributes().flags & WindowManager.LayoutParams.FLAG_SECURE)
+                != 0;
+    }
 }
diff --git a/tests/app/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/app/src/com/android/settings/password/ChooseLockPasswordTest.java
new file mode 100644
index 0000000..36611cf
--- /dev/null
+++ b/tests/app/src/com/android/settings/password/ChooseLockPasswordTest.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.password;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.action.ViewActions.pressKey;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static android.support.test.espresso.matcher.ViewMatchers.isEnabled;
+import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
+import static android.support.test.espresso.matcher.ViewMatchers.withId;
+
+import static org.hamcrest.CoreMatchers.not;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.Intent;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.espresso.action.ViewActions;
+import android.support.test.espresso.matcher.ViewMatchers;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.KeyEvent;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class ChooseLockPasswordTest {
+    private Instrumentation mInstrumentation;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mContext = mInstrumentation.getTargetContext();
+    }
+
+    @Test
+    public void clearNotVisible_when_activityLaunchedInitially() {
+        mInstrumentation.startActivitySync(new Intent(mContext, ChooseLockPassword.class));
+        onView(withId(R.id.clear_button)).check(matches(
+                withEffectiveVisibility(ViewMatchers.Visibility.GONE)));
+    }
+
+    @Test
+    public void clearNotEnabled_when_nothingEntered() {
+        mInstrumentation.startActivitySync(new Intent(mContext, ChooseLockPassword.class));
+        onView(withId(R.id.password_entry)).perform(ViewActions.typeText("1234"))
+                .perform(pressKey(KeyEvent.KEYCODE_ENTER));
+        onView(withId(R.id.clear_button)).check(matches(isDisplayed()))
+            .check(matches(not(isEnabled())));
+    }
+
+    @Test
+    public void clearEnabled_when_somethingEnteredToConfirm() {
+        mInstrumentation.startActivitySync(new Intent(mContext, ChooseLockPassword.class));
+        onView(withId(R.id.password_entry)).perform(ViewActions.typeText("1234"))
+                .perform(pressKey(KeyEvent.KEYCODE_ENTER))
+                .perform(ViewActions.typeText("1"));
+        // clear should be present if text field contains content
+        onView(withId(R.id.clear_button)).check(matches(isDisplayed()));
+    }
+}
diff --git a/tests/app/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java b/tests/app/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java
index 78acc3e..3a6c39c 100644
--- a/tests/app/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java
+++ b/tests/app/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java
@@ -18,16 +18,24 @@
 
 import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.action.ViewActions.click;
+import static android.support.test.espresso.action.ViewActions.pressKey;
 import static android.support.test.espresso.assertion.ViewAssertions.matches;
 import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static android.support.test.espresso.matcher.ViewMatchers.isEnabled;
+import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.hamcrest.CoreMatchers.not;
+
+import android.support.test.espresso.action.ViewActions;
+import android.support.test.espresso.matcher.ViewMatchers;
 import android.support.test.filters.MediumTest;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
+import android.view.KeyEvent;
 
 import com.android.settings.R;
 
@@ -58,4 +66,30 @@
 
         assertThat(activity.isFinishing()).named("Is finishing").isTrue();
     }
+
+    @Test
+    public void clearNotVisible_when_activityLaunchedInitially() {
+        mActivityTestRule.launchActivity(null);
+        onView(withId(R.id.clear_button)).check(matches(
+                withEffectiveVisibility(ViewMatchers.Visibility.GONE)));
+    }
+
+    @Test
+    public void clearNotEnabled_when_nothingEntered() throws Throwable {
+        mActivityTestRule.launchActivity(null);
+        onView(withId(R.id.password_entry)).perform(ViewActions.typeText("1234"))
+                .perform(pressKey(KeyEvent.KEYCODE_ENTER));
+        onView(withId(R.id.clear_button)).check(matches(isDisplayed()))
+                .check(matches(not(isEnabled())));
+    }
+
+    @Test
+    public void clearEnabled_when_somethingEnteredToConfirm() {
+        mActivityTestRule.launchActivity(null);
+        onView(withId(R.id.password_entry)).perform(ViewActions.typeText("1234"))
+                .perform(pressKey(KeyEvent.KEYCODE_ENTER))
+                .perform(ViewActions.typeText("1"));
+        // clear should be present if text field contains content
+        onView(withId(R.id.clear_button)).check(matches(isDisplayed()));
+    }
 }
diff --git a/tests/app/src/com/android/settings/users/UserSettingsTest.java b/tests/app/src/com/android/settings/users/UserSettingsTest.java
index 1a33917..06e2bdd 100644
--- a/tests/app/src/com/android/settings/users/UserSettingsTest.java
+++ b/tests/app/src/com/android/settings/users/UserSettingsTest.java
@@ -31,7 +31,7 @@
 @SmallTest
 public class UserSettingsTest extends InstrumentationTestCase {
 
-    private static final String USER_AND_ACCOUNTS = "User & accounts";
+    private static final String USER_AND_ACCOUNTS = "Users & accounts";
     private static final String USERS = "Users";
     private static final String EMERGNENCY_INFO = "Emergency information";
     private static final String ADD_USERS_WHEN_LOCKED = "Add users";
diff --git a/tests/robotests/assets/grandfather_not_implementing_index_provider b/tests/robotests/assets/grandfather_not_implementing_index_provider
index b9e328c..4623889 100644
--- a/tests/robotests/assets/grandfather_not_implementing_index_provider
+++ b/tests/robotests/assets/grandfather_not_implementing_index_provider
@@ -1,7 +1,6 @@
 com.android.settings.bluetooth.DevicePickerFragment
 com.android.settings.bluetooth.BluetoothDeviceDetailsFragment
 com.android.settings.bluetooth.BluetoothPairingDetail
-com.android.settings.notification.ZenModePrioritySettings
 com.android.settings.accounts.AccountDetailDashboardFragment
 com.android.settings.fuelgauge.PowerUsageAnomalyDetails
 com.android.settings.fuelgauge.AdvancedPowerUsageDetail
@@ -13,3 +12,4 @@
 com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionMicrophone
 com.android.settings.enterprise.ApplicationListFragment$EnterpriseInstalledPackages
 com.android.settings.enterprise.EnterpriseSetDefaultAppsListFragment
+com.android.settings.wifi.tether.WifiTetherSettings
diff --git a/tests/robotests/assets/grandfather_not_implementing_indexable b/tests/robotests/assets/grandfather_not_implementing_indexable
index 47711b0..e8a32ec 100644
--- a/tests/robotests/assets/grandfather_not_implementing_indexable
+++ b/tests/robotests/assets/grandfather_not_implementing_indexable
@@ -1,4 +1,5 @@
 com.android.settings.location.LocationMode
+com.android.settings.notification.ZenModePrioritySettings
 com.android.settings.notification.ZenModeVisualInterruptionSettings
 com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment
 com.android.settings.deviceinfo.SimStatus
@@ -19,7 +20,6 @@
 com.android.settings.wifi.WifiInfo
 com.android.settings.applications.VrListenerSettings
 com.android.settings.inputmethod.UserDictionaryList
-com.android.settings.deviceinfo.Status
 com.android.settings.datausage.DataSaverSummary
 com.android.settings.notification.ChannelNotificationSettings
 com.android.settings.datausage.AppDataUsage
@@ -63,7 +63,6 @@
 com.android.settings.deviceinfo.PrivateVolumeSettings
 com.android.settings.users.AppRestrictionsFragment
 com.android.settings.deviceinfo.PrivateVolumeUnmount
-com.android.settings.deletionhelper.AutomaticStorageManagerSettings
 com.android.settings.notification.ZenAccessSettings
 com.android.settings.accessibility.ToggleFontSizePreferenceFragment
 com.android.settings.applications.PremiumSmsAccess
diff --git a/tests/robotests/res/layout/preference.xml b/tests/robotests/res/layout/preference.xml
new file mode 100644
index 0000000..3f73161
--- /dev/null
+++ b/tests/robotests/res/layout/preference.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- A test preference layout containing all required widgets -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:id="@android:id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:singleLine="true"
+        android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+        android:textColor="?android:attr/textColorPrimary"
+        android:ellipsize="marquee"
+        android:fadingEdge="horizontal" />
+
+    <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:visibility="gone"
+        android:textAlignment="viewStart"
+        android:textAppearance="@android:style/TextAppearance.Material.Body1"
+        android:textColor="?android:attr/textColorSecondary"
+        android:maxLines="10" />
+
+    <LinearLayout
+        android:id="@android:id/widget_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:minWidth="58dip"
+        android:gravity="end|center_vertical"
+        android:orientation="vertical" />
+
+</LinearLayout>
diff --git a/tests/robotests/src/android/service/oemlock/OemLockManager.java b/tests/robotests/src/android/service/oemlock/OemLockManager.java
index 7c015cf..c168089 100644
--- a/tests/robotests/src/android/service/oemlock/OemLockManager.java
+++ b/tests/robotests/src/android/service/oemlock/OemLockManager.java
@@ -32,9 +32,6 @@
         return false;
     }
 
-    public boolean canUserAllowOemUnlock() {
-        return true;
-    }
     public boolean isOemUnlockAllowed() {
         return false;
     }
diff --git a/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java b/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java
index 51034dd..c5a1833 100644
--- a/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java
@@ -45,7 +45,11 @@
 import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(
+    manifest = TestConfig.MANIFEST_PATH,
+    sdk = TestConfig.SDK_VERSION,
+    shadows = ShadowUtils.class
+)
 public class DeviceInfoSettingsTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -83,7 +87,6 @@
     }
 
     @Test
-    @Config(shadows = ShadowUtils.class)
     public void testNonIndexableKeys_existInXmlLayout() {
         final Context context = RuntimeEnvironment.application;
         final List<String> niks = DeviceInfoSettings.SEARCH_INDEX_DATA_PROVIDER
diff --git a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
index 6b895d7..4b345c0 100644
--- a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
@@ -1,11 +1,14 @@
 package com.android.settings;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.content.Context;
 
-import com.android.settings.core.PreferenceController;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settings.testutils.shadow.ShadowPowerManagerWrapper;
+import com.android.settingslib.core.AbstractPreferenceController;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -14,10 +17,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DisplaySettingsTest {
@@ -33,7 +32,7 @@
                 fragment.getPreferenceScreenResId());
         final List<String> preferenceKeys = new ArrayList<>();
 
-        for (PreferenceController controller : fragment.getPreferenceControllers(context)) {
+        for (AbstractPreferenceController controller : fragment.getPreferenceControllers(context)) {
             preferenceKeys.add(controller.getPreferenceKey());
         }
         // Nightmode is currently hidden
diff --git a/tests/robotests/src/com/android/settings/HelpTrampolineTest.java b/tests/robotests/src/com/android/settings/HelpTrampolineTest.java
new file mode 100644
index 0000000..e10b878
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/HelpTrampolineTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+
+import android.content.Intent;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowHelpUtils;
+
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowActivity;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.robolectric.Shadows.shadowOf;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                ShadowHelpUtils.class
+        })
+public class HelpTrampolineTest {
+
+    @After
+    public void tearDown() {
+        ShadowHelpUtils.reset();
+    }
+
+    @Test
+    public void launchHelp_noExtra_shouldDoNothing() {
+        final Intent intent = new Intent().setClassName(
+                RuntimeEnvironment.application.getPackageName(), HelpTrampoline.class.getName());
+
+        Robolectric.buildActivity(HelpTrampoline.class).withIntent(intent).create().get();
+
+        assertThat(ShadowHelpUtils.isGetHelpIntentCalled()).isFalse();
+    }
+
+    @Test
+    public void launchHelp_hasExtra_shouldLaunchHelp() {
+        final Intent intent = new Intent().setClassName(
+                RuntimeEnvironment.application.getPackageName(), HelpTrampoline.class.getName())
+                .putExtra(Intent.EXTRA_TEXT, "help_url_upgrading");
+        final ShadowActivity shadow = shadowOf(Robolectric.buildActivity(HelpTrampoline.class)
+                .withIntent(intent).create().get());
+        final Intent launchedIntent = shadow.getNextStartedActivity();
+
+        assertThat(ShadowHelpUtils.isGetHelpIntentCalled()).isTrue();
+        assertThat(launchedIntent).isNotNull();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/MasterClearTest.java b/tests/robotests/src/com/android/settings/MasterClearTest.java
index 21b8e47..838b1e8 100644
--- a/tests/robotests/src/com/android/settings/MasterClearTest.java
+++ b/tests/robotests/src/com/android/settings/MasterClearTest.java
@@ -33,7 +33,6 @@
 import android.provider.Settings;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.CheckBox;
 import android.widget.LinearLayout;
 import android.widget.ScrollView;
 
@@ -46,12 +45,15 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowActivity;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(
+    manifest = TestConfig.MANIFEST_PATH,
+    sdk = TestConfig.SDK_VERSION,
+    shadows = {ShadowUtils.class}
+)
 public class MasterClearTest {
 
     @Mock
@@ -144,7 +146,6 @@
     }
 
     @Test
-    @Config(shadows = { ShadowUtils.class })
     public void testInitiateMasterClear_inDemoMode_sendsIntent() {
         ShadowUtils.setIsDemoUser(true);
 
diff --git a/tests/robotests/src/com/android/settings/SecuritySettingsTest.java b/tests/robotests/src/com/android/settings/SecuritySettingsTest.java
index 5838642..3d0d5a1 100644
--- a/tests/robotests/src/com/android/settings/SecuritySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/SecuritySettingsTest.java
@@ -60,7 +60,11 @@
 import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(
+    manifest = TestConfig.MANIFEST_PATH,
+    sdk = TestConfig.SDK_VERSION,
+    shadows = {ShadowLockPatternUtils.class}
+)
 public class SecuritySettingsTest {
 
     private static final String MOCK_SUMMARY = "summary";
@@ -181,9 +185,6 @@
     }
 
     @Test
-    @Config (shadows = {
-            ShadowLockPatternUtils.class,
-    })
     public void testNonIndexableKeys_existInXmlLayout() {
         final Context context = spy(RuntimeEnvironment.application);
         UserManager manager = mock(UserManager.class);
diff --git a/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java
index 78bc7d1..69a1351 100644
--- a/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java
+++ b/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java
@@ -30,7 +30,6 @@
 import com.android.settings.password.SetupChooseLockPattern;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;
 import com.android.settings.testutils.shadow.ShadowEventLogWriter;
 import com.android.settings.testutils.shadow.ShadowUtils;
 
@@ -49,7 +48,6 @@
         shadows = {
                 SettingsShadowResources.class,
                 SettingsShadowResources.SettingsShadowTheme.class,
-                ShadowDynamicIndexableContentMonitor.class,
                 ShadowEventLogWriter.class,
                 ShadowUtils.class
         })
diff --git a/tests/robotests/src/com/android/settings/UtilsTest.java b/tests/robotests/src/com/android/settings/UtilsTest.java
index 93ab406..33ead1f 100644
--- a/tests/robotests/src/com/android/settings/UtilsTest.java
+++ b/tests/robotests/src/com/android/settings/UtilsTest.java
@@ -8,14 +8,17 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
+import android.content.pm.UserInfo;
 import android.net.ConnectivityManager;
 import android.net.LinkAddress;
 import android.net.LinkProperties;
 import android.net.Network;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
+import android.os.UserManager;
 import android.os.storage.DiskInfo;
 import android.os.storage.StorageManager;
 import android.os.storage.VolumeInfo;
@@ -23,6 +26,7 @@
 import android.text.format.DateUtils;
 import android.text.style.TtsSpan;
 
+import com.android.settings.enterprise.DevicePolicyManagerWrapper;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
@@ -34,12 +38,15 @@
 import org.robolectric.annotation.Config;
 
 import java.net.InetAddress;
+import java.util.ArrayList;
+import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class UtilsTest {
 
     private static final String TIME_DESCRIPTION = "1 day 20 hours 30 minutes";
+    private static final String PACKAGE_NAME = "com.android.app";
     private Context mContext;
     @Mock
     private WifiManager wifiManager;
@@ -47,6 +54,10 @@
     private Network network;
     @Mock
     private ConnectivityManager connectivityManager;
+    @Mock
+    private DevicePolicyManagerWrapper mDevicePolicyManager;
+    @Mock
+    private UserManager mUserManager;
 
     @Before
     public void setUp() {
@@ -94,8 +105,8 @@
 
     @Test
     public void testFormatElapsedTime_WithSeconds_ShowSeconds() {
-        final double testMillis = 5 * DateUtils.MINUTE_IN_MILLIS;
-        final String expectedTime = "5m 0s";
+        final double testMillis = 5 * DateUtils.MINUTE_IN_MILLIS + 30 * DateUtils.SECOND_IN_MILLIS;
+        final String expectedTime = "5m 30s";
 
         assertThat(Utils.formatElapsedTime(mContext, testMillis, true).toString()).isEqualTo(
                 expectedTime);
@@ -103,8 +114,8 @@
 
     @Test
     public void testFormatElapsedTime_NoSeconds_DoNotShowSeconds() {
-        final double testMillis = 5 * DateUtils.MINUTE_IN_MILLIS;
-        final String expectedTime = "5m";
+        final double testMillis = 5 * DateUtils.MINUTE_IN_MILLIS + 30 * DateUtils.SECOND_IN_MILLIS;
+        final String expectedTime = "6m";
 
         assertThat(Utils.formatElapsedTime(mContext, testMillis, false).toString()).isEqualTo(
                 expectedTime);
@@ -121,6 +132,33 @@
     }
 
     @Test
+    public void testFormatElapsedTime_ZeroFieldsInTheMiddleDontShow() {
+        final double testMillis = 2 * DateUtils.DAY_IN_MILLIS + 15 * DateUtils.MINUTE_IN_MILLIS;
+        final String expectedTime = "2d 15m";
+
+        assertThat(Utils.formatElapsedTime(mContext, testMillis, false).toString()).isEqualTo(
+                expectedTime);
+    }
+
+    @Test
+    public void testFormatElapsedTime_FormatZero_WithSeconds() {
+        final double testMillis = 0;
+        final String expectedTime = "0s";
+
+        assertThat(Utils.formatElapsedTime(mContext, testMillis, true).toString()).isEqualTo(
+                expectedTime);
+    }
+
+    @Test
+    public void testFormatElapsedTime_FormatZero_NoSeconds() {
+        final double testMillis = 0;
+        final String expectedTime = "0m";
+
+        assertThat(Utils.formatElapsedTime(mContext, testMillis, false).toString()).isEqualTo(
+                expectedTime);
+    }
+
+    @Test
     public void testFormatElapsedTime_onlyContainsMinute_hasTtsSpan() {
         final double testMillis = 15 * DateUtils.MINUTE_IN_MILLIS;
 
@@ -167,4 +205,25 @@
 
         assertThat(Utils.getInstallationStatus(info)).isEqualTo(R.string.disabled);
     }
+
+    @Test
+    public void testIsProfileOrDeviceOwner_deviceOwnerApp_returnTrue() {
+        when(mDevicePolicyManager.isDeviceOwnerAppOnAnyUser(PACKAGE_NAME)).thenReturn(true);
+
+        assertThat(Utils.isProfileOrDeviceOwner(mUserManager, mDevicePolicyManager,
+                PACKAGE_NAME)).isTrue();
+    }
+
+    @Test
+    public void testIsProfileOrDeviceOwner_profileOwnerApp_returnTrue() {
+        final List<UserInfo> userInfos = new ArrayList<>();
+        userInfos.add(new UserInfo());
+
+        when(mUserManager.getUsers()).thenReturn(userInfos);
+        when(mDevicePolicyManager.getProfileOwnerAsUser(userInfos.get(0).id)).thenReturn(
+                new ComponentName(PACKAGE_NAME, ""));
+
+        assertThat(Utils.isProfileOrDeviceOwner(mUserManager, mDevicePolicyManager,
+                PACKAGE_NAME)).isTrue();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
index 01afdf8..fb32da1 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.android.settings.accessibility;
 
 import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java
index 81b563f..15a3746 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java
@@ -17,14 +17,21 @@
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
+import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.TestConfig;
+import com.android.settings.dashboard.DashboardFeatureProviderImpl;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.drawer.CategoryKey;
 import com.android.settingslib.drawer.Tile;
 
@@ -33,12 +40,20 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.util.ReflectionHelpers;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -49,6 +64,8 @@
     private static final String METADATA_USER_HANDLE = "user_handle";
 
     @Mock(answer = RETURNS_DEEP_STUBS)
+    private Activity mActivity;
+    @Mock(answer = RETURNS_DEEP_STUBS)
     private AccountManager mAccountManager;
     @Mock
     private Preference mPreference;
@@ -74,16 +91,16 @@
     }
 
     @Test
-    public void testCategory_isAccount() {
+    public void testCategory_isAccountDetail() {
         assertThat(new AccountDetailDashboardFragment().getCategoryKey())
-                .isEqualTo(CategoryKey.CATEGORY_ACCOUNT);
+                .isEqualTo(CategoryKey.CATEGORY_ACCOUNT_DETAIL);
     }
 
     @Test
     public void refreshDashboardTiles_HasAccountType_shouldDisplay() {
         final Tile tile = new Tile();
         final Bundle metaData = new Bundle();
-        metaData.putString(METADATA_CATEGORY, CategoryKey.CATEGORY_ACCOUNT);
+        metaData.putString(METADATA_CATEGORY, CategoryKey.CATEGORY_ACCOUNT_DETAIL);
         metaData.putString(METADATA_ACCOUNT_TYPE, "com.abc");
         tile.metaData = metaData;
 
@@ -94,7 +111,7 @@
     public void refreshDashboardTiles_NoAccountType_shouldNotDisplay() {
         final Tile tile = new Tile();
         final Bundle metaData = new Bundle();
-        metaData.putString(METADATA_CATEGORY, CategoryKey.CATEGORY_ACCOUNT);
+        metaData.putString(METADATA_CATEGORY, CategoryKey.CATEGORY_ACCOUNT_DETAIL);
         tile.metaData = metaData;
 
         assertThat(mFragment.displayTile(tile)).isFalse();
@@ -104,10 +121,46 @@
     public void refreshDashboardTiles_OtherAccountType_shouldNotDisplay() {
         final Tile tile = new Tile();
         final Bundle metaData = new Bundle();
-        metaData.putString(METADATA_CATEGORY, CategoryKey.CATEGORY_ACCOUNT);
+        metaData.putString(METADATA_CATEGORY, CategoryKey.CATEGORY_ACCOUNT_DETAIL);
         metaData.putString(METADATA_ACCOUNT_TYPE, "com.other");
         tile.metaData = metaData;
 
         assertThat(mFragment.displayTile(tile)).isFalse();
     }
+
+    @Test
+    public void refreshDashboardTiles_HasAccountType_shouldAddAccountNameToIntent() {
+        FakeFeatureFactory.setupForTest(mActivity);
+        final FakeFeatureFactory featureFactory =
+                (FakeFeatureFactory) FakeFeatureFactory.getFactory(mActivity);
+        final DashboardFeatureProviderImpl dashboardFeatureProvider =
+                new DashboardFeatureProviderImpl(mActivity);
+        final PackageManager packageManager = mock(PackageManager.class);
+        ReflectionHelpers.setField(dashboardFeatureProvider, "mPackageManager", packageManager);
+        when(packageManager.resolveActivity(any(Intent.class), anyInt()))
+            .thenReturn(mock(ResolveInfo.class));
+
+        final Tile tile = new Tile();
+        tile.key = "key";
+        tile.metaData = new Bundle();
+        tile.metaData.putString(METADATA_CATEGORY, CategoryKey.CATEGORY_ACCOUNT);
+        tile.metaData.putString(METADATA_ACCOUNT_TYPE, "com.abc");
+        tile.metaData.putString("com.android.settings.intent.action", Intent.ACTION_ASSIST);
+        tile.intent = new Intent();
+        tile.userHandle = null;
+        mFragment.displayTile(tile);
+
+        final Activity activity = Robolectric.buildActivity(Activity.class).get();
+        final Preference preference = new Preference(mContext);
+        dashboardFeatureProvider.bindPreferenceToTile(activity,
+                MetricsProto.MetricsEvent.DASHBOARD_SUMMARY, preference, tile, "key",
+                Preference.DEFAULT_ORDER);
+
+        preference.performClick();
+
+        final Intent intent = shadowOf(activity).getNextStartedActivityForResult().intent;
+
+        assertThat(intent.getStringExtra("extra.accountName"))
+                .isEqualTo("name1@abc.com");
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java
index 4dce0c6..34ac183 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java
@@ -50,7 +50,11 @@
 
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(
+    manifest = TestConfig.MANIFEST_PATH,
+    sdk = TestConfig.SDK_VERSION,
+    shadows = AccountHeaderPreferenceControllerTest.ShadowAuthenticatorHelper.class
+)
 public class AccountHeaderPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -83,7 +87,6 @@
     }
 
     @Test
-    @Config(shadows = ShadowAuthenticatorHelper.class)
     public void onResume_shouldDisplayAccountInEntityHeader() {
         final Lifecycle lifecycle = new Lifecycle();
         final Account account = new Account("name1@abc.com", "com.abc");
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
index f4f093a..139bee7 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
@@ -111,7 +111,6 @@
     }
 
     @Test
-    @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
     public void onResume_linkedUser_shouldAddOneAccountCategory() {
         final UserInfo info = new UserInfo(1, "user 1", 0);
         when(mUserManager.isManagedProfile()).thenReturn(false);
@@ -124,7 +123,6 @@
     }
 
     @Test
-    @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
     public void onResume_oneProfile_shouldAddOneAccountCategory() {
         final List<UserInfo> infos = new ArrayList<>();
         infos.add(new UserInfo(1, "user 1", 0));
@@ -138,7 +136,6 @@
     }
 
     @Test
-    @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
     public void onResume_twoProfiles_shouldAddTwoAccountCategory() {
         final List<UserInfo> infos = new ArrayList<>();
         infos.add(new UserInfo(1, "user 1", 0));
@@ -153,7 +150,6 @@
     }
 
     @Test
-    @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
     public void onResume_noProfileChange_shouldNotAddOrRemoveAccountCategory() {
         final List<UserInfo> infos = new ArrayList<>();
         infos.add(new UserInfo(1, "user 1", 0));
@@ -171,7 +167,6 @@
     }
 
     @Test
-    @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
     public void onResume_oneNewProfile_shouldAddOneAccountCategory() {
         final List<UserInfo> infos = new ArrayList<>();
         infos.add(new UserInfo(1, "user 1", 0));
@@ -189,7 +184,6 @@
     }
 
     @Test
-    @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
     public void onResume_oneProfileRemoved_shouldRemoveOneAccountCategory() {
         final List<UserInfo> infos = new ArrayList<>();
         infos.add(new UserInfo(1, "user 1", 0));
@@ -207,7 +201,6 @@
     }
 
     @Test
-    @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
     public void onResume_oneProfile_shouldSetAccountTitleWithUserName() {
         final List<UserInfo> infos = new ArrayList<>();
         infos.add(new UserInfo(1, "user 1", UserInfo.FLAG_MANAGED_PROFILE));
@@ -226,7 +219,6 @@
     }
 
     @Test
-    @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
     public void onResume_noPreferenceScreen_shouldNotCrash() {
         final List<UserInfo> infos = new ArrayList<>();
         infos.add(new UserInfo(1, "user 1", 0));
@@ -244,7 +236,6 @@
     }
 
     @Test
-    @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
     public void onResume_noPreferenceManager_shouldNotCrash() {
         when(mFragment.getPreferenceManager()).thenReturn(null);
         final List<UserInfo> infos = new ArrayList<>();
@@ -337,7 +328,6 @@
     }
 
     @Test
-    @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
     public void onResume_twoAccountsOfSameType_shouldAddThreePreferences() {
         final List<UserInfo> infos = new ArrayList<>();
         infos.add(new UserInfo(1, "user 1", 0));
@@ -417,7 +407,6 @@
     }
 
     @Test
-    @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
     public void onResume_noAccountChange_shouldNotAddAccountPreference() {
         final List<UserInfo> infos = new ArrayList<>();
         infos.add(new UserInfo(1, "user 1", 0));
@@ -498,7 +487,6 @@
     }
 
     @Test
-    @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
     public void onResume_oneNewAccountType_shouldAddOneAccountPreference() {
         final List<UserInfo> infos = new ArrayList<>();
         infos.add(new UserInfo(1, "user 1", 0));
@@ -534,7 +522,6 @@
     }
 
     @Test
-    @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
     public void onResume_oneAccountRemoved_shouldRemoveOneAccountPreference() {
         final List<UserInfo> infos = new ArrayList<>();
         infos.add(new UserInfo(1, "user 1", 0));
diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
index 93b5253..a1eb2d8 100644
--- a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
@@ -21,6 +21,7 @@
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -33,17 +34,20 @@
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
 import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.UserHandle;
+import android.os.UserManager;
 import android.support.v14.preference.PreferenceFragment;
 import android.support.v7.preference.PreferenceScreen;
 import android.widget.Button;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.LayoutPreference;
+import com.android.settings.enterprise.DevicePolicyManagerWrapper;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowAccountManager;
 import com.android.settings.testutils.shadow.ShadowContentResolver;
 
@@ -64,6 +68,8 @@
 
     @Mock(answer = RETURNS_DEEP_STUBS)
     private AccountManager mAccountManager;
+    @Mock
+    private DevicePolicyManagerWrapper mDevicePolicyManager;
     @Mock(answer = RETURNS_DEEP_STUBS)
     private PreferenceFragment mFragment;
     @Mock
@@ -92,7 +98,8 @@
         when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(
             new AuthenticatorDescription[0]);
         when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(new Account[0]);
-        mController = new RemoveAccountPreferenceController(mContext, mFragment);
+        mController = new RemoveAccountPreferenceController(mContext, mFragment,
+            mDevicePolicyManager);
     }
 
     @Test
@@ -117,6 +124,18 @@
     }
 
     @Test
+    public void onClick_shouldNotStartConfirmDialogWhenModifyAccountsIsDisallowed() {
+        when(mFragment.isAdded()).thenReturn(true);
+        when(mDevicePolicyManager.createAdminSupportIntent(UserManager.DISALLOW_MODIFY_ACCOUNTS))
+            .thenReturn(new Intent());
+        mController.onClick(null);
+
+        verify(mFragmentTransaction, never()).add(
+            any(RemoveAccountPreferenceController.ConfirmRemoveAccountDialog.class),
+            eq(TAG_REMOVE_ACCOUNT_DIALOG));
+    }
+
+    @Test
     @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
     public void confirmRemove_shouldRemoveAccount() {
         when(mFragment.isAdded()).thenReturn(true);
@@ -134,4 +153,4 @@
         verify(mAccountManager).removeAccountAsUser(eq(account), nullable(Activity.class),
             nullable(AccountManagerCallback.class), nullable(Handler.class), eq(userHandle));
     }
-}
\ No newline at end of file
+}
diff --git a/tests/robotests/src/com/android/settings/accounts/UserAndAccountDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/UserAndAccountDashboardFragmentTest.java
index d4a7a9d..8c13aab 100644
--- a/tests/robotests/src/com/android/settings/accounts/UserAndAccountDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/UserAndAccountDashboardFragmentTest.java
@@ -67,27 +67,6 @@
     }
 
     @Test
-    public void refreshDashboardTiles_HasAccountType_shouldNotDisplay() {
-        final Tile tile = new Tile();
-        final Bundle metaData = new Bundle();
-        metaData.putString(METADATA_CATEGORY, CategoryKey.CATEGORY_ACCOUNT);
-        metaData.putString(METADATA_ACCOUNT_TYPE, "com.abc");
-        tile.metaData = metaData;
-
-        assertThat(mFragment.displayTile(tile)).isFalse();
-    }
-
-    @Test
-    public void refreshDashboardTiles_NoAccountType_shouldDisplay() {
-        final Tile tile = new Tile();
-        final Bundle metaData = new Bundle();
-        metaData.putString(METADATA_CATEGORY, CategoryKey.CATEGORY_ACCOUNT);
-        tile.metaData = metaData;
-
-        assertThat(mFragment.displayTile(tile)).isTrue();
-    }
-
-    @Test
     public void updateSummary_shouldDisplaySignedInUser() {
         final Activity activity = mock(Activity.class);
         final SummaryLoader loader = mock(SummaryLoader.class);
diff --git a/tests/robotests/src/com/android/settings/applications/AdvancedAppSettingsTest.java b/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java
similarity index 93%
rename from tests/robotests/src/com/android/settings/applications/AdvancedAppSettingsTest.java
rename to tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java
index 968421b..9054a8e 100644
--- a/tests/robotests/src/com/android/settings/applications/AdvancedAppSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java
@@ -16,18 +16,29 @@
 
 package com.android.settings.applications;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.UserManager;
 import android.telephony.TelephonyManager;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.defaultapps.DefaultBrowserPreferenceController;
 import com.android.settings.applications.defaultapps.DefaultPhonePreferenceController;
 import com.android.settings.applications.defaultapps.DefaultSmsPreferenceController;
 import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.XmlTestUtils;
 
 import org.junit.Before;
@@ -40,31 +51,19 @@
 
 import java.util.List;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AdvancedAppSettingsTest {
+public class DefaultAppSettingsTest {
 
     private Context mContext;
 
-    private AdvancedAppSettings mFragment;
+    private DefaultAppSettings mFragment;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-
         mContext = RuntimeEnvironment.application;
-        mFragment = new AdvancedAppSettings();
+        mFragment = new DefaultAppSettings();
         mFragment.onAttach(mContext);
     }
 
@@ -77,8 +76,8 @@
     @Test
     public void setListening_shouldUpdateSummary() {
         final SummaryLoader summaryLoader = mock(SummaryLoader.class);
-        final AdvancedAppSettings.SummaryProvider summaryProvider =
-                new AdvancedAppSettings.SummaryProvider(mContext, summaryLoader);
+        final DefaultAppSettings.SummaryProvider summaryProvider =
+                new DefaultAppSettings.SummaryProvider(mContext, summaryLoader);
         final DefaultSmsPreferenceController defaultSms =
                 mock(DefaultSmsPreferenceController.class);
         final DefaultBrowserPreferenceController defaultBrowser =
@@ -149,6 +148,7 @@
     public void testNonIndexableKeys_existInXmlLayout() {
         final Context context = spy(RuntimeEnvironment.application);
         final Context mockContext = mock(Context.class);
+        when(mockContext.getApplicationContext()).thenReturn(mockContext);
         final UserManager userManager = mock(UserManager.class, RETURNS_DEEP_STUBS);
 
         when(mockContext.getSystemService(Context.USER_SERVICE))
@@ -159,10 +159,10 @@
                 .thenReturn(mock(TelephonyManager.class));
         when(mockContext.getPackageManager())
                 .thenReturn(mock(PackageManager.class));
-        final List<String> niks = AdvancedAppSettings.SEARCH_INDEX_DATA_PROVIDER
+        final List<String> niks = DefaultAppSettings.SEARCH_INDEX_DATA_PROVIDER
                 .getNonIndexableKeys(mockContext);
 
-        final int xmlId = (new AdvancedAppSettings()).getPreferenceScreenResId();
+        final int xmlId = (new DefaultAppSettings()).getPreferenceScreenResId();
 
         final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
 
diff --git a/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java b/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java
index 6122576..5d20a4c 100644
--- a/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java
@@ -19,52 +19,59 @@
 import static org.mockito.Matchers.eq;
 import static org.mockito.Matchers.nullable;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
+import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+
+import android.app.Activity;
 import android.content.Context;
 
+import android.view.Window;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.TouchOverlayManager;
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.shadow.ShadowPreferenceFragment;
 
+import com.android.settings.testutils.shadow.ShadowAppInfoBase;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
+import org.mockito.InOrder;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DrawOverlayDetailsTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-
-    private FakeFeatureFactory mFeatureFactory;
-    private DrawOverlayDetails mFragment;
+    private Activity mActivity;
 
     @Mock
-    private TouchOverlayManager mTouchOverlayManager;
+    private Window mWindow;
+
+    private FakeFeatureFactory mFeatureFactory;
+
+    @Spy
+    private DrawOverlayDetails mFragment;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-
-        mFragment = new DrawOverlayDetails();
-        ReflectionHelpers.setField(mFragment, "mTouchOverlayManager", mTouchOverlayManager);
+        FakeFeatureFactory.setupForTest(mActivity);
+        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mActivity);
     }
 
     @Test
     public void logSpecialPermissionChange() {
-        mFragment.onAttach(ShadowApplication.getInstance().getApplicationContext());
+        when(mFragment.getContext()).thenReturn(
+                ShadowApplication.getInstance().getApplicationContext());
+
         mFragment.logSpecialPermissionChange(true, "app");
         verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_APPDRAW_ALLOW), eq("app"));
@@ -75,16 +82,17 @@
     }
 
     @Test
-    @Config(shadows = ShadowPreferenceFragment.class)
-    public void onStart_disableOverlay() {
-        mFragment.onStart();
-        verify(mTouchOverlayManager).setOverlayAllowed(false);
-    }
+    @Config(shadows = {ShadowAppInfoBase.class})
+    public void hideNonSystemOverlaysWhenResumed() {
+        when(mFragment.getActivity()).thenReturn(mActivity);
+        when(mActivity.getWindow()).thenReturn(mWindow);
 
-    @Test
-    @Config(shadows = ShadowPreferenceFragment.class)
-    public void onStop_enableOverlay() {
-        mFragment.onStop();
-        verify(mTouchOverlayManager).setOverlayAllowed(true);
+        mFragment.onResume();
+        mFragment.onPause();
+
+        InOrder inOrder = Mockito.inOrder(mWindow);
+        inOrder.verify(mWindow).addFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
+        inOrder.verify(mWindow).clearFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
+        inOrder.verifyNoMoreInteractions();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
index e20a435..deef5e0 100644
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
@@ -45,6 +45,7 @@
 import com.android.settings.TestConfig;
 import com.android.settings.applications.instantapps.InstantAppButtonsController;
 import com.android.settings.applications.instantapps.InstantAppButtonsController.ShowDialogDelegate;
+import com.android.settings.enterprise.DevicePolicyManagerWrapper;
 import com.android.settings.fuelgauge.BatteryUtils;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settingslib.Utils;
@@ -83,7 +84,11 @@
 
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(
+    manifest = TestConfig.MANIFEST_PATH,
+    sdk = TestConfig.SDK_VERSION,
+    shadows = InstalledAppDetailsTest.ShadowUtils.class
+)
 public final class InstalledAppDetailsTest {
 
     private static final String PACKAGE_NAME = "test_package_name";
@@ -99,7 +104,7 @@
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private SettingsActivity mActivity;
     @Mock
-    private DevicePolicyManager mDevicePolicyManager;
+    private DevicePolicyManagerWrapper mDevicePolicyManager;
     @Mock
     private BatterySipper mBatterySipper;
     @Mock
@@ -491,7 +496,6 @@
     }
 
     @Test
-    @Config(shadows = ShadowUtils.class)
     public void handleDisableable_appIsEnabled_buttonShouldWork() {
         final ApplicationInfo info = new ApplicationInfo();
         info.packageName = "pkg";
@@ -513,7 +517,6 @@
     }
 
     @Test
-    @Config(shadows = ShadowUtils.class)
     public void handleDisableable_appIsEnabledAndInKeepEnabledWhitelist_buttonShouldNotWork() {
         final ApplicationInfo info = new ApplicationInfo();
         info.packageName = "pkg";
diff --git a/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java b/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java
index 52c1069..8ed7284 100644
--- a/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java
@@ -16,6 +16,17 @@
 
 package com.android.settings.applications;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
@@ -35,14 +46,11 @@
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.testutils.shadow.SettingsShadowResources.SettingsShadowTheme;
-import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;
 import com.android.settings.testutils.shadow.ShadowEventLogWriter;
+import com.android.settings.widget.LoadingViewController;
 import com.android.settingslib.applications.ApplicationsState;
-import com.android.settingslib.applications.ApplicationsState.Callbacks;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
-import java.util.ArrayList;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -53,17 +61,7 @@
 import org.robolectric.fakes.RoboMenuItem;
 import org.robolectric.util.ReflectionHelpers;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import java.util.ArrayList;
 
 /**
  * Tests for {@link ManageApplications}.
@@ -75,7 +73,6 @@
         shadows = {
                 SettingsShadowResources.class,
                 SettingsShadowTheme.class,
-                ShadowDynamicIndexableContentMonitor.class,
                 ShadowEventLogWriter.class
         })
 public class ManageApplicationsTest {
@@ -170,12 +167,12 @@
         ReflectionHelpers.setField(fragment, "mLoadingContainer", mock(View.class));
         ReflectionHelpers.setField(fragment, "mListContainer", mock(View.class));
         when(fragment.getActivity()).thenReturn(mock(Activity.class));
-        final Runnable showLoadingContainerRunnable = mock(Runnable.class);
         final Handler handler = mock(Handler.class);
         final ManageApplications.ApplicationsAdapter adapter =
             spy(new ManageApplications.ApplicationsAdapter(mState, fragment, 0));
-        ReflectionHelpers.setField(adapter, "mShowLoadingContainerRunnable",
-            showLoadingContainerRunnable);
+        final LoadingViewController loadingViewController =
+                mock(LoadingViewController.class);
+        ReflectionHelpers.setField(adapter, "mLoadingViewController", loadingViewController);
         ReflectionHelpers.setField(adapter, "mFgHandler", handler);
 
         // app loading completed
@@ -186,7 +183,7 @@
 
         adapter.updateLoading();
 
-        verify(handler, never()).postDelayed(eq(showLoadingContainerRunnable), anyLong());
+        verify(loadingViewController, never()).showLoadingViewDelayed();
     }
 
     @Test
@@ -195,12 +192,13 @@
         ReflectionHelpers.setField(fragment, "mLoadingContainer", mock(View.class));
         ReflectionHelpers.setField(fragment, "mListContainer", mock(View.class));
         when(fragment.getActivity()).thenReturn(mock(Activity.class));
-        final Runnable showLoadingContainerRunnable = mock(Runnable.class);
+
         final Handler handler = mock(Handler.class);
         final ManageApplications.ApplicationsAdapter adapter =
             spy(new ManageApplications.ApplicationsAdapter(mState, fragment, 0));
-        ReflectionHelpers.setField(adapter, "mShowLoadingContainerRunnable",
-            showLoadingContainerRunnable);
+        final LoadingViewController loadingViewController =
+                mock(LoadingViewController.class);
+        ReflectionHelpers.setField(adapter, "mLoadingViewController", loadingViewController);
         ReflectionHelpers.setField(adapter, "mFgHandler", handler);
 
         // app loading not yet completed
@@ -208,11 +206,11 @@
 
         adapter.updateLoading();
 
-        verify(handler).postDelayed(eq(showLoadingContainerRunnable), anyLong());
+        verify(loadingViewController).showLoadingViewDelayed();
     }
 
     @Test
-    public void onRebuildComplete_shouldCancelDelayedRunnable() {
+    public void onRebuildComplete_shouldHideLoadingView() {
         final Context context = RuntimeEnvironment.application;
         final ManageApplications fragment = mock(ManageApplications.class);
         final View loadingContainer = mock(View.class);
@@ -223,12 +221,12 @@
         ReflectionHelpers.setField(fragment, "mLoadingContainer", loadingContainer);
         ReflectionHelpers.setField(fragment, "mListContainer", listContainer);
         when(fragment.getActivity()).thenReturn(mock(Activity.class));
-        final Runnable showLoadingContainerRunnable = mock(Runnable.class);
         final Handler handler = mock(Handler.class);
         final ManageApplications.ApplicationsAdapter adapter =
             spy(new ManageApplications.ApplicationsAdapter(mState, fragment, 0));
-        ReflectionHelpers.setField(adapter, "mShowLoadingContainerRunnable",
-            showLoadingContainerRunnable);
+        final LoadingViewController loadingViewController =
+                mock(LoadingViewController.class);
+        ReflectionHelpers.setField(adapter, "mLoadingViewController", loadingViewController);
         ReflectionHelpers.setField(adapter, "mFgHandler", handler);
         ReflectionHelpers.setField(adapter, "mFilterMode", -1);
 
@@ -244,7 +242,7 @@
 
         adapter.onRebuildComplete(null);
 
-        verify(handler).removeCallbacks(showLoadingContainerRunnable);
+        verify(loadingViewController).showContent(true /* animate */);
     }
 
     private void setUpOptionMenus() {
diff --git a/tests/robotests/src/com/android/settings/applications/PhotosViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/PhotosViewHolderControllerTest.java
new file mode 100644
index 0000000..7eacba2
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/PhotosViewHolderControllerTest.java
@@ -0,0 +1,88 @@
+package com.android.settings.applications;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.nullable;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.content.Intent;
+import android.os.UserHandle;
+import android.os.storage.VolumeInfo;
+import android.view.LayoutInflater;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.applications.StorageStatsSource;
+import com.android.settingslib.deviceinfo.StorageVolumeProvider;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class PhotosViewHolderControllerTest {
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Fragment mFragment;
+
+    @Mock private StorageVolumeProvider mSvp;
+    @Mock private StorageStatsSource mSource;
+
+    private Context mContext;
+    private PhotosViewHolderController mController;
+    private VolumeInfo mVolume;
+    private AppViewHolder mHolder;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mVolume = new VolumeInfo("id", 0, null, "id");
+        mController =
+                new PhotosViewHolderController(
+                        mContext, mSource, mVolume.fsUuid, new UserHandle(0));
+
+        LayoutInflater inflater = LayoutInflater.from(mContext);
+        mHolder = AppViewHolder.createOrRecycle(inflater, null);
+    }
+
+    @Test
+    public void storageShouldBeZeroBytesIfQueriedBeforeStorageQueryFinishes() {
+        mController.setupView(mHolder);
+
+        assertThat(mHolder.summary.getText().toString()).isEqualTo("0.00B");
+    }
+
+    @Test
+    public void storageShouldRepresentStorageStatsQuery() throws Exception {
+        when(mSource.getExternalStorageStats(nullable(String.class), nullable(UserHandle.class)))
+                .thenReturn(new StorageStatsSource.ExternalStorageStats(1, 0, 1, 10, 0));
+
+        mController.queryStats();
+        mController.setupView(mHolder);
+
+        assertThat(mHolder.summary.getText().toString()).isEqualTo("11.00B");
+    }
+
+    @Test
+    public void clickingShouldIntentIntoFilesApp() {
+        mController.onClick(mFragment);
+
+        final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
+        verify(mFragment).startActivity(argumentCaptor.capture());
+        Intent intent = argumentCaptor.getValue();
+
+        assertThat(intent.getType()).isEqualTo("image/*");
+        assertThat(intent.getAction()).isEqualTo(android.content.Intent.ACTION_VIEW);
+        assertThat(intent.getBooleanExtra(Intent.EXTRA_FROM_STORAGE, false)).isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/PictureInPictureSettingsTest.java b/tests/robotests/src/com/android/settings/applications/PictureInPictureSettingsTest.java
new file mode 100644
index 0000000..77acb46
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/PictureInPictureSettingsTest.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.applications;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.UserInfo;
+import android.util.Pair;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+import java.util.ArrayList;
+import java.util.Collections;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class PictureInPictureSettingsTest {
+
+    private static final int PRIMARY_USER_ID = 0;
+    private static final int PROFILE_USER_ID = 10;
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+
+    private FakeFeatureFactory mFeatureFactory;
+    private PictureInPictureSettings mFragment;
+    @Mock
+    private PackageManagerWrapper mPackageManager;
+    @Mock
+    private UserManagerWrapper mUserManager;
+    private ArrayList<PackageInfo> mPrimaryUserPackages;
+    private ArrayList<PackageInfo> mProfileUserPackages;
+    private ArrayList<UserInfo> mUsers;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest(mContext);
+        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
+        mFragment = new PictureInPictureSettings(mPackageManager, mUserManager);
+        mPrimaryUserPackages = new ArrayList<>();
+        mProfileUserPackages = new ArrayList<>();
+        mUsers = new ArrayList<>();
+        when(mPackageManager.getInstalledPackagesAsUser(anyInt(), eq(PRIMARY_USER_ID)))
+                .thenReturn(mPrimaryUserPackages);
+        when(mPackageManager.getInstalledPackagesAsUser(anyInt(), eq(PROFILE_USER_ID)))
+                .thenReturn(mProfileUserPackages);
+        when(mUserManager.getProfiles(anyInt())).thenReturn(mUsers);
+    }
+
+    @Test
+    public void testCollectPipApps() {
+        PackageInfo primaryP1 = createPackage("Calculator", true);
+        PackageInfo primaryP2 = createPackage("Clock", false);
+        PackageInfo profileP1 = createPackage("Calculator", false);
+        PackageInfo profileP2 = createPackage("Clock", true);
+
+        mPrimaryUserPackages.add(primaryP1);
+        mPrimaryUserPackages.add(primaryP2);
+        mProfileUserPackages.add(profileP1);
+        mProfileUserPackages.add(profileP2);
+
+        ArrayList<Pair<ApplicationInfo, Integer>> apps = mFragment.collectPipApps(PRIMARY_USER_ID);
+        assertThat(containsPackages(apps, primaryP1, profileP2));
+        assertThat(!containsPackages(apps, primaryP2, profileP1));
+    }
+
+    @Test
+    public void testAppSort() {
+        PackageInfo primaryP1 = createPackage("Android", true);
+        PackageInfo primaryP2 = createPackage("Boop", true);
+        PackageInfo primaryP3 = createPackage("Deck", true);
+        PackageInfo profileP1 = createPackage("Android", true);
+        PackageInfo profileP2 = createPackage("Cool", true);
+        PackageInfo profileP3 = createPackage("Fast", false);
+
+        mPrimaryUserPackages.add(primaryP1);
+        mPrimaryUserPackages.add(primaryP2);
+        mPrimaryUserPackages.add(primaryP3);
+        mProfileUserPackages.add(profileP1);
+        mProfileUserPackages.add(profileP2);
+        mProfileUserPackages.add(profileP3);
+
+        ArrayList<Pair<ApplicationInfo, Integer>> apps = mFragment.collectPipApps(PRIMARY_USER_ID);
+        Collections.sort(apps, new PictureInPictureSettings.AppComparator(null));
+        assertThat(isOrdered(apps, primaryP1, profileP1, primaryP2, profileP2));
+    }
+
+    private boolean containsPackages(ArrayList<Pair<ApplicationInfo, Integer>> apps,
+            PackageInfo... packages) {
+        for (int i = 0; i < packages.length; i++) {
+            boolean found = false;
+            for (int j = 0; j < apps.size(); j++) {
+                if (apps.get(j).first == packages[i].applicationInfo) {
+                    found = true;
+                    break;
+                }
+            }
+            if (!found) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private boolean isOrdered(ArrayList<Pair<ApplicationInfo, Integer>> apps,
+            PackageInfo... packages) {
+        if (apps.size() != packages.length) {
+            return false;
+        }
+
+        for (int i = 0; i < packages.length; i++) {
+            if (packages[i].applicationInfo != apps.get(i).first) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private PackageInfo createPackage(String appTitle, boolean supportsPip) {
+        PackageInfo pi = new PackageInfo();
+        ActivityInfo ai = new ActivityInfo();
+        if (supportsPip) {
+            ai.flags |= ActivityInfo.FLAG_SUPPORTS_PICTURE_IN_PICTURE;
+        }
+        pi.activities = new ActivityInfo[1];
+        pi.activities[0] = ai;
+        pi.applicationInfo = new ApplicationInfo();
+        pi.applicationInfo.name = appTitle;
+        return pi;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java
index 4403991..2510f20 100644
--- a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java
@@ -22,6 +22,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
+import android.content.res.Configuration;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
@@ -46,6 +47,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.any;
@@ -179,8 +181,9 @@
                 .thenReturn(new ResolveInfo());
         when(mUsageStatsManager.queryUsageStats(anyInt(), anyLong(), anyLong()))
                 .thenReturn(stats);
-        when(mMockContext.getString(eq(R.string.battery_history_minutes_no_seconds), anyInt()))
-            .thenReturn(mContext.getString(R.string.battery_history_minutes_no_seconds, 45));
+        final Configuration configuration = new Configuration();
+        configuration.locale = Locale.US;
+        when(mMockContext.getResources().getConfiguration()).thenReturn(configuration);
 
         mController = new RecentAppsPreferenceController(mMockContext, mAppState, null);
         mController.displayPreference(mScreen);
@@ -245,15 +248,17 @@
             .thenReturn(new ResolveInfo());
         when(mUsageStatsManager.queryUsageStats(anyInt(), anyLong(), anyLong()))
             .thenReturn(stats);
-        when(mMockContext.getString(eq(R.string.battery_history_minutes_no_seconds), anyInt()))
-            .thenReturn(mContext.getString(R.string.battery_history_minutes_no_seconds, 35));
+
         when(mMockContext.getResources().getText(eq(R.string.recent_app_summary)))
             .thenReturn(mContext.getResources().getText(R.string.recent_app_summary));
+        final Configuration configuration = new Configuration();
+        configuration.locale = Locale.US;
+        when(mMockContext.getResources().getConfiguration()).thenReturn(configuration);
 
         mController = new RecentAppsPreferenceController(mMockContext, mAppState, null);
         mController.displayPreference(mScreen);
 
-        verify(mCategory).addPreference(argThat(summaryMatches("35m ago")));
+        verify(mCategory).addPreference(argThat(summaryMatches("0m ago")));
     }
 
     private static ArgumentMatcher<Preference> summaryMatches(String expected) {
diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
index 7fa11cf..d68229f 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
@@ -78,8 +78,8 @@
     @Config(shadows = {ShadowSecureSettings.class})
     public void isAvailable_hasAssistantAndAllowDisclosure_shouldReturnTrue() {
         ReflectionHelpers.setField(mController, "mContext", mMockContext);
-        ShadowSecureSettings.putString(null, Settings.Secure.ASSISTANT,
-                "com.android.settings/assist");
+        final ContentResolver cr = mContext.getContentResolver();
+        Settings.Secure.putString(cr, Settings.Secure.ASSISTANT, "com.android.settings/assist");
         doReturn(true).when(mController).allowDisablingAssistDisclosure();
 
         assertThat(mController.isAvailable()).isTrue();
@@ -89,8 +89,8 @@
     @Config(shadows = {ShadowSecureSettings.class})
     public void isAvailable_hasAssistantAndDisallowDisclosure_shouldReturnTrue() {
         ReflectionHelpers.setField(mController, "mContext", mMockContext);
-        ShadowSecureSettings.putString(null, Settings.Secure.ASSISTANT,
-                "com.android.settings/assist");
+        final ContentResolver cr = mContext.getContentResolver();
+        Settings.Secure.putString(cr, Settings.Secure.ASSISTANT, "com.android.settings/assist");
         doReturn(false).when(mController).allowDisablingAssistDisclosure();
 
         assertThat(mController.isAvailable()).isFalse();
@@ -98,8 +98,7 @@
 
     @Test
     public void isAvailable_hasNoAssistant_shouldReturnFalse() {
-        Settings.Secure.putString(mContext.getContentResolver(),
-                Settings.Secure.ASSISTANT, "");
+        Settings.Secure.putString(mContext.getContentResolver(), Settings.Secure.ASSISTANT, "");
 
         assertThat(mController.isAvailable()).isFalse();
     }
diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
index 037bd10..180abbb 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
@@ -16,6 +16,16 @@
 
 package com.android.settings.applications.assist;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
+
 import android.Manifest;
 import android.app.SearchManager;
 import android.content.ComponentName;
@@ -28,33 +38,29 @@
 import android.content.pm.ServiceInfo;
 import android.provider.Settings;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.internal.app.AssistUtils;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.defaultapps.DefaultAppInfo;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowSecureSettings;
 
-import java.util.ArrayList;
-import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
+import java.util.ArrayList;
+import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DefaultAssistPreferenceControllerTest {
 
+    private static final String TEST_KEY = "test_pref_key";
+
     @Mock
     private Context mContext;
     @Mock
@@ -66,7 +72,8 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mController = new DefaultAssistPreferenceController(mContext);
+        mController = new DefaultAssistPreferenceController(mContext, TEST_KEY,
+                true /* showSetting */);
     }
 
     @Test
@@ -75,10 +82,16 @@
     }
 
     @Test
+    public void getPrefKey_shouldReturnKey() {
+        assertThat(mController.getPreferenceKey())
+                .isEqualTo(TEST_KEY);
+    }
+
+    @Test
     @Config(shadows = {ShadowSecureSettings.class})
     public void getDefaultAppInfo_hasDefaultAssist_shouldReturnKey() {
         final String flattenKey = "com.android.settings/assist";
-        ShadowSecureSettings.putString(null, Settings.Secure.ASSISTANT, flattenKey);
+        Settings.Secure.putString(null, Settings.Secure.ASSISTANT, flattenKey);
         DefaultAppInfo appInfo = mController.getDefaultAppInfo();
 
         assertThat(appInfo.getKey()).isEqualTo(flattenKey);
@@ -87,17 +100,17 @@
     @Test
     public void getSettingIntent_noSettingsActivity_shouldNotCrash() {
         final String flattenKey = "com.android.settings/assist";
-        ShadowSecureSettings.putString(null, Settings.Secure.ASSISTANT, flattenKey);
+        Settings.Secure.putString(null, Settings.Secure.ASSISTANT, flattenKey);
         when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        DefaultAssistPreferenceController controller =
-            spy(new DefaultAssistPreferenceController(mContext));
+        DefaultAssistPreferenceController controller = spy(
+                new DefaultAssistPreferenceController(mContext, TEST_KEY, true /* showSetting */));
         final ResolveInfo resolveInfo = new ResolveInfo();
         resolveInfo.activityInfo = new ActivityInfo();
         resolveInfo.activityInfo.name = "assist";
         resolveInfo.activityInfo.applicationInfo = new ApplicationInfo();
         resolveInfo.activityInfo.applicationInfo.packageName = "com.android.settings";
         when(mPackageManager.resolveActivityAsUser(any(Intent.class), anyInt(), anyInt()))
-            .thenReturn(resolveInfo);
+                .thenReturn(resolveInfo);
         when(mContext.getSystemService(Context.SEARCH_SERVICE)).thenReturn(mSearchManager);
         when(mSearchManager.getAssistIntent(anyBoolean())).thenReturn(mock(Intent.class));
         final ServiceInfo serviceInfo = new ServiceInfo();
@@ -107,9 +120,21 @@
         services.add(resolveInfo);
         when(mPackageManager.queryIntentServices(any(Intent.class), anyInt())).thenReturn(services);
         doReturn(null).when(controller).getAssistSettingsActivity(
-            ComponentName.unflattenFromString(flattenKey), resolveInfo, mPackageManager);
+                ComponentName.unflattenFromString(flattenKey), resolveInfo, mPackageManager);
 
         controller.getSettingIntent(null);
         // should not crash
     }
+
+    @Test
+    public void getSettingIntent_doNotShowSetting_shouldNotTryToGetSettingIntent() {
+        final AssistUtils assistUtils = mock(AssistUtils.class);
+        final DefaultAssistPreferenceController controller = new DefaultAssistPreferenceController(
+                mContext, TEST_KEY, false /* showSetting */);
+        ReflectionHelpers.setField(controller, "mAssistUtils", assistUtils);
+
+        controller.getSettingIntent(null);
+
+        verifyZeroInteractions(assistUtils);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java
index b500637..4724620 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java
@@ -73,6 +73,7 @@
     @Mock
     private PackageManager mPackageManager;
 
+    private Context mContext;
     private DefaultHomePicker mPicker;
 
     @Before
@@ -85,7 +86,8 @@
         mPicker.onAttach((Context) mActivity);
 
         ReflectionHelpers.setField(mPicker, "mPm", mPackageManagerWrapper);
-        doReturn(RuntimeEnvironment.application).when(mPicker).getContext();
+        mContext = spy(RuntimeEnvironment.application);
+        doReturn(mContext).when(mPicker).getContext();
     }
 
     @Test
@@ -94,6 +96,7 @@
 
         verify(mPackageManagerWrapper).replacePreferredActivity(any(IntentFilter.class),
                 anyInt(), any(ComponentName[].class), any(ComponentName.class));
+        verify(mContext).startActivity(any());
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java
index d7e5192..22b30bd 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java
@@ -17,14 +17,22 @@
 package com.android.settings.applications.defaultapps;
 
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyList;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.content.ComponentName;
 import android.content.Context;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -35,14 +43,6 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyList;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DefaultHomePreferenceControllerTest {
@@ -79,11 +79,10 @@
 
     @Test
     public void updateState_noDefaultApp_shouldAskPackageManagerForOnlyApp() {
-        doReturn(null).when(mController).getDefaultAppInfo();
-
+        when(mPackageManager.getHomeActivities(anyList())).thenReturn(null);
         mController.updateState(mock(Preference.class));
 
-        verify(mPackageManager).getHomeActivities(anyList());
+        verify(mPackageManager, atLeastOnce()).getHomeActivities(anyList());
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultNotificationAssistantPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultNotificationAssistantPickerTest.java
deleted file mode 100644
index a60b43c..0000000
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultNotificationAssistantPickerTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications.defaultapps;
-
-
-import android.app.Activity;
-import android.content.Context;
-import android.os.UserManager;
-import android.provider.Settings;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.applications.PackageManagerWrapper;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DefaultNotificationAssistantPickerTest {
-
-    private static final String TEST_APP_KEY = "com.android.settings/PickerTest";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private PackageManagerWrapper mPackageManager;
-
-    private DefaultNotificationAssistantPicker mPicker;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-
-        mPicker = spy(new DefaultNotificationAssistantPicker());
-        mPicker.onAttach((Context) mActivity);
-
-        ReflectionHelpers.setField(mPicker, "mPm", mPackageManager);
-        doReturn(RuntimeEnvironment.application).when(mPicker).getContext();
-    }
-
-    @Test
-    public void setDefaultAppKey_shouldUpdateDefault() {
-        mPicker.setDefaultKey(TEST_APP_KEY);
-
-        assertThat(mPicker.getDefaultKey()).isEqualTo(TEST_APP_KEY);
-    }
-
-    @Test
-    public void getDefaultAppKey_shouldReturnDefault() {
-        Settings.Secure.putString(RuntimeEnvironment.application.getContentResolver(),
-                Settings.Secure.ENABLED_NOTIFICATION_ASSISTANT,
-                TEST_APP_KEY);
-
-        assertThat(mPicker.getDefaultKey()).isEqualTo(TEST_APP_KEY);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java
new file mode 100644
index 0000000..6a73269
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.defaultapps;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.nfc.NfcAdapter;
+import android.os.UserManager;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.TestConfig;
+import com.android.settings.nfc.PaymentBackend;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class DefaultPaymentSettingsPreferenceControllerTest {
+
+    @Mock
+    private NfcAdapter mNfcAdapter;
+    @Mock
+    private Context mContext;
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private PaymentBackend mPaymentBackend;
+
+    private DefaultPaymentSettingsPreferenceController mController;
+    private Preference mPreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        when(mContext.getApplicationContext()).thenReturn(mContext);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+        mController = new DefaultPaymentSettingsPreferenceController(mContext);
+        ReflectionHelpers.setField(mController, "mNfcAdapter", mNfcAdapter);
+
+        mPreference = new Preference(RuntimeEnvironment.application);
+    }
+
+    @Test
+    public void isAvailable_hasNfc_shouldReturnTrue() {
+        when(mPackageManager.hasSystemFeature(anyString())).thenReturn(true);
+        when(mUserManager.isAdminUser()).thenReturn(true);
+        when(mNfcAdapter.isEnabled()).thenReturn(true);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_noNfcAdapter_shouldReturnFalse() {
+        when(mPackageManager.hasSystemFeature(anyString())).thenReturn(true);
+        when(mUserManager.isAdminUser()).thenReturn(true);
+        ReflectionHelpers.setField(mController, "mNfcAdapter", null);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void updateState_shouldSetSummaryToDefaultPaymentApp() {
+        final PaymentBackend.PaymentAppInfo defaultApp = mock(PaymentBackend.PaymentAppInfo.class);
+        defaultApp.label = "test_payment_app";
+        when(mPaymentBackend.getDefaultApp()).thenReturn(defaultApp);
+        ReflectionHelpers.setField(mController, "mPaymentBackend", mPaymentBackend);
+
+        mController.updateState(mPreference);
+
+        verify(mPaymentBackend).refresh();
+        assertThat(mPreference.getSummary()).isEqualTo(defaultApp.label);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java
index 27c1a83..98a3580 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java
@@ -32,6 +32,7 @@
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
 import com.android.settings.widget.EntityHeaderController;
 
@@ -45,7 +46,8 @@
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows={SettingsShadowBluetoothDevice.class, ShadowEntityHeaderController.class})
+        shadows={SettingsShadowBluetoothDevice.class, ShadowEntityHeaderController.class,
+                SettingsShadowResources.class})
 public class BluetoothDetailsHeaderControllerTest extends BluetoothDetailsControllerTestBase {
     private BluetoothDetailsHeaderController mController;
     private LayoutPreference mPreference;
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java
index 0aeff2d..2e094e2 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java
@@ -72,8 +72,9 @@
         mController.updateDeviceName(mPreference, DEVICE_NAME);
 
         final CharSequence summary = mPreference.getSummary();
+
         assertThat(summary.toString())
-                .isEqualTo("Visible as 'Nightshade' to other devices");
+                .isEqualTo("Visible as \u201CNightshade\u201D to other devices");
         assertThat(mPreference.isSelectable()).isFalse();
     }
 
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
index d60571c..ac0720a 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
@@ -26,6 +26,7 @@
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 
 import org.junit.Before;
@@ -38,18 +39,24 @@
 import org.robolectric.util.ReflectionHelpers;
 
 import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = SettingsShadowResources.class)
 public class BluetoothDevicePreferenceTest {
 
     private Context mContext;
     @Mock
     private CachedBluetoothDevice mCachedBluetoothDevice;
+    @Mock
+    private DeviceListPreferenceFragment mDeviceListPreferenceFragment;
 
     private FakeFeatureFactory mFakeFeatureFactory;
     private MetricsFeatureProvider mMetricsFeatureProvider;
@@ -62,7 +69,8 @@
         FakeFeatureFactory.setupForTest(mContext);
         mFakeFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
         mMetricsFeatureProvider = mFakeFeatureFactory.getMetricsFeatureProvider();
-        mPreference = new BluetoothDevicePreference(mContext, mCachedBluetoothDevice);
+        mPreference = new BluetoothDevicePreference(mContext, mCachedBluetoothDevice,
+                mDeviceListPreferenceFragment);
     }
 
     @Test
@@ -91,11 +99,29 @@
         when(mCachedBluetoothDevice.isConnected()).thenReturn(false);
         when(mCachedBluetoothDevice.getBondState()).thenReturn(BluetoothDevice.BOND_NONE);
         when(mCachedBluetoothDevice.startPairing()).thenReturn(true);
+        when(mCachedBluetoothDevice.hasHumanReadableName()).thenReturn(true);
 
         mPreference.onClicked();
 
         verify(mMetricsFeatureProvider).action(
                 mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR);
+        verify(mMetricsFeatureProvider, never()).action(mContext,
+                MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR_DEVICES_WITHOUT_NAMES);
+    }
+
+    @Test
+    public void onClicked_deviceNotBonded_shouldLogBluetoothPairEventAndPairWithoutNameEvent() {
+        when(mCachedBluetoothDevice.isConnected()).thenReturn(false);
+        when(mCachedBluetoothDevice.getBondState()).thenReturn(BluetoothDevice.BOND_NONE);
+        when(mCachedBluetoothDevice.startPairing()).thenReturn(true);
+        when(mCachedBluetoothDevice.hasHumanReadableName()).thenReturn(false);
+
+        mPreference.onClicked();
+
+        verify(mMetricsFeatureProvider).action(
+                mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR);
+        verify(mMetricsFeatureProvider).action(mContext,
+                MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR_DEVICES_WITHOUT_NAMES);
     }
 
     @Test
@@ -140,10 +166,58 @@
 
     @Test
     public void imagingDeviceIcon_isICSettingsPrint() {
+        when(mCachedBluetoothDevice.getBatteryLevel()).thenReturn(
+                BluetoothDevice.BATTERY_LEVEL_UNKNOWN);
         when(mCachedBluetoothDevice.getBtClass()).thenReturn(
                 new BluetoothClass(BluetoothClass.Device.Major.IMAGING));
+
         mPreference.onDeviceAttributesChanged();
         assertThat(mPreference.getIcon()).isEqualTo(
                 mContext.getDrawable(R.drawable.ic_settings_print));
     }
+
+    @Test
+    public void testVisible_notVisibleThenVisible() {
+        when(mDeviceListPreferenceFragment.shouldShowDevicesWithoutNames()).thenReturn(false);
+        final boolean[] humanReadableName = {false};
+        doAnswer(invocation -> humanReadableName[0]).when(mCachedBluetoothDevice)
+                .hasHumanReadableName();
+        BluetoothDevicePreference preference =
+                new BluetoothDevicePreference(mContext, mCachedBluetoothDevice,
+                        mDeviceListPreferenceFragment);
+        assertThat(preference.isVisible()).isFalse();
+        humanReadableName[0] = true;
+        preference.onDeviceAttributesChanged();
+        assertThat(preference.isVisible()).isTrue();
+    }
+
+    @Test
+    public void testVisible_visibleThenNotVisible() {
+        when(mDeviceListPreferenceFragment.shouldShowDevicesWithoutNames()).thenReturn(false);
+        final boolean[] humanReadableName = {true};
+        doAnswer(invocation -> humanReadableName[0]).when(mCachedBluetoothDevice)
+                .hasHumanReadableName();
+        BluetoothDevicePreference preference =
+                new BluetoothDevicePreference(mContext, mCachedBluetoothDevice,
+                        mDeviceListPreferenceFragment);
+        assertThat(preference.isVisible()).isTrue();
+        humanReadableName[0] = false;
+        preference.onDeviceAttributesChanged();
+        assertThat(preference.isVisible()).isFalse();
+    }
+
+    @Test
+    public void testVisible_alwaysVisibleWhenEnabled() {
+        when(mDeviceListPreferenceFragment.shouldShowDevicesWithoutNames()).thenReturn(true);
+        final boolean[] humanReadableName = {true};
+        doAnswer(invocation -> humanReadableName[0]).when(mCachedBluetoothDevice)
+                .hasHumanReadableName();
+        BluetoothDevicePreference preference =
+                new BluetoothDevicePreference(mContext, mCachedBluetoothDevice,
+                        mDeviceListPreferenceFragment);
+        assertThat(preference.isVisible()).isTrue();
+        humanReadableName[0] = false;
+        preference.onDeviceAttributesChanged();
+        assertThat(preference.isVisible()).isTrue();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java
index 2d64396..8fa8f06 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java
@@ -15,36 +15,51 @@
  */
 package com.android.settings.bluetooth;
 
+import android.bluetooth.BluetoothAdapter;
+import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.os.UserManager;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.view.View;
+import android.widget.Switch;
 
+import com.android.settings.R;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.widget.MasterSwitchController;
+import com.android.settings.widget.MasterSwitchPreference;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 import static com.google.common.truth.Truth.assertThat;
-import static junit.framework.TestCase.assertNotNull;
-import static junit.framework.TestCase.assertEquals;
+
 import static org.mockito.Mockito.mock;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
+        SettingsShadowResources.class, SettingsShadowResources.SettingsShadowTheme.class
+})
 public class BluetoothEnablerTest {
 
     private static final EnforcedAdmin FAKE_ENFORCED_ADMIN =
@@ -53,24 +68,37 @@
     @Mock
     private MetricsFeatureProvider mMetricsFeatureProvider;
     @Mock
-    private Context mContext;
-    @Mock
-    private MasterSwitchController mMasterSwitchController;
-    @Mock
     private RestrictionUtils mRestrictionUtils;
+    @Mock
+    private LocalBluetoothManager mBluetoothManager;
+    @Mock
+    private LocalBluetoothAdapter mBluetoothAdapter;
 
+    private Context mContext;
+    Switch mSwitch;
+    private MasterSwitchPreference mMasterSwitchPreference;
+    private MasterSwitchController mMasterSwitchController;
     private BluetoothEnabler mBluetoothEnabler;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        when(mBluetoothManager.getBluetoothAdapter()).thenReturn(mBluetoothAdapter);
+
+        mSwitch = new Switch(mContext);
+        mMasterSwitchPreference = new MasterSwitchPreference(mContext);
+        mMasterSwitchController = spy(new MasterSwitchController(mMasterSwitchPreference));
         mBluetoothEnabler = new BluetoothEnabler(
                 mContext,
                 mMasterSwitchController,
                 mMetricsFeatureProvider,
-                mock(LocalBluetoothManager.class),
+                mBluetoothManager,
                 123,
                 mRestrictionUtils);
+        PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(mock(View.class));
+        when(holder.findViewById(R.id.switchWidget)).thenReturn(mSwitch);
+        mMasterSwitchPreference.onBindViewHolder(holder);
     }
 
     @Test
@@ -136,4 +164,84 @@
         verify(mMasterSwitchController).setChecked(false);
     }
 
+    @Test
+    public void maybeEnforceRestrictions_disallowBluetoothNotOverriden() {
+        // GIVEN Bluetooth has been disallowed...
+        when(mRestrictionUtils.checkIfRestrictionEnforced(
+                mContext, UserManager.DISALLOW_BLUETOOTH)).thenReturn(FAKE_ENFORCED_ADMIN);
+        when(mRestrictionUtils.checkIfRestrictionEnforced(
+                mContext, UserManager.DISALLOW_CONFIG_BLUETOOTH)).thenReturn(null);
+
+        mBluetoothEnabler.resume(mContext);
+
+        verify(mMasterSwitchController, never()).setEnabled(true);
+    }
+
+    @Test
+    public void startWithBluetoothOff_switchIsOff() {
+        when(mBluetoothAdapter.getBluetoothState()).thenReturn(BluetoothAdapter.STATE_OFF);
+        verify(mMasterSwitchController, never()).setChecked(anyBoolean());
+        mBluetoothEnabler.resume(mContext);
+        verify(mMasterSwitchController, never()).setChecked(true);
+    }
+
+    @Test
+    public void startWithBluetoothOn_switchIsOn() {
+        when(mBluetoothAdapter.getBluetoothState()).thenReturn(BluetoothAdapter.STATE_ON);
+        verify(mMasterSwitchController, never()).setChecked(anyBoolean());
+        mBluetoothEnabler.resume(mContext);
+        verify(mMasterSwitchController, never()).setChecked(false);
+        verify(mMasterSwitchController).setChecked(true);
+    }
+
+    @Test
+    public void bluetoothTurnsOff_switchTurnsOff() {
+        // Start up with bluetooth turned on. The switch should get turned on.
+        assertThat(mSwitch.isChecked()).isFalse();
+        ArgumentCaptor<BroadcastReceiver> captor = ArgumentCaptor.forClass(BroadcastReceiver.class);
+        when(mContext.registerReceiver(captor.capture(), any(IntentFilter.class))).thenReturn(null);
+        when(mBluetoothAdapter.getBluetoothState()).thenReturn(BluetoothAdapter.STATE_ON);
+        verify(mMasterSwitchController, never()).setChecked(anyBoolean());
+        mBluetoothEnabler.resume(mContext);
+        verify(mMasterSwitchController, never()).setChecked(false);
+        verify(mMasterSwitchController).setChecked(true);
+
+        // Now simulate bluetooth being turned off via an event.
+        BroadcastReceiver receiver = captor.getValue();
+        Intent turningOff = new Intent(BluetoothAdapter.ACTION_STATE_CHANGED);
+        turningOff.putExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.STATE_TURNING_OFF);
+        receiver.onReceive(mContext, turningOff);
+        Intent off = new Intent(BluetoothAdapter.ACTION_STATE_CHANGED);
+        off.putExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.STATE_OFF);
+        receiver.onReceive(mContext, off);
+
+        // Make sure the switch was turned off.
+        verify(mMasterSwitchController).setChecked(false);
+        assertThat(mSwitch.isChecked()).isFalse();
+    }
+
+    @Test
+    public void bluetoothTurnsOn_switchTurnsOn() {
+        // Start up with bluetooth turned on. The switch should be left off.
+        assertThat(mSwitch.isChecked()).isFalse();
+        ArgumentCaptor<BroadcastReceiver> captor = ArgumentCaptor.forClass(BroadcastReceiver.class);
+        when(mContext.registerReceiver(captor.capture(), any(IntentFilter.class))).thenReturn(null);
+        when(mBluetoothAdapter.getBluetoothState()).thenReturn(BluetoothAdapter.STATE_OFF);
+        verify(mMasterSwitchController, never()).setChecked(anyBoolean());
+        mBluetoothEnabler.resume(mContext);
+        verify(mMasterSwitchController, never()).setChecked(anyBoolean());
+
+        // Now simulate bluetooth being turned on via an event.
+        BroadcastReceiver receiver = captor.getValue();
+        Intent turningOn = new Intent(BluetoothAdapter.ACTION_STATE_CHANGED);
+        turningOn.putExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.STATE_TURNING_ON);
+        receiver.onReceive(mContext, turningOn);
+        Intent on = new Intent(BluetoothAdapter.ACTION_STATE_CHANGED);
+        on.putExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.STATE_ON);
+        receiver.onReceive(mContext, on);
+
+        // Make sure the switch was turned on.
+        verify(mMasterSwitchController).setChecked(true);
+        assertThat(mSwitch.isChecked()).isTrue();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
index 7a6ae79..fba11de 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
@@ -28,6 +28,7 @@
 import static org.mockito.Mockito.when;
 
 import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.Context;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
@@ -47,6 +48,7 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowAlertDialog;
 import org.robolectric.shadows.ShadowApplication;
 import org.robolectric.util.FragmentTestUtil;
 
@@ -412,6 +414,39 @@
         verify(dialogActivity, times(1)).dismiss();
     }
 
+    @Test
+    public void rotateDialog_nullPinText_okButtonEnabled() {
+        userEntryDialogExistingTextTest(null);
+    }
+
+    @Test
+    public void rotateDialog_emptyPinText_okButtonEnabled() {
+        userEntryDialogExistingTextTest("");
+    }
+
+    @Test
+    public void rotateDialog_nonEmptyPinText_okButtonEnabled() {
+        userEntryDialogExistingTextTest("test");
+    }
+
+    // Runs a test simulating the user entry dialog type in a situation like device rotation, where
+    // the dialog fragment gets created and we already have some existing text entered into the
+    // pin field.
+    private void userEntryDialogExistingTextTest(CharSequence existingText) {
+        when(controller.getDialogType()).thenReturn(BluetoothPairingController.USER_ENTRY_DIALOG);
+        when(controller.getDeviceVariantMessageHintId())
+                .thenReturn(BluetoothPairingController.INVALID_DIALOG_TYPE);
+        when(controller.getDeviceVariantMessageId())
+                .thenReturn(BluetoothPairingController.INVALID_DIALOG_TYPE);
+
+        BluetoothPairingDialogFragment fragment = spy(new BluetoothPairingDialogFragment());
+        when(fragment.getPairingViewText()).thenReturn(existingText);
+        setupFragment(fragment);
+        AlertDialog dialog = ShadowAlertDialog.getLatestAlertDialog();
+        boolean expected = !TextUtils.isEmpty(existingText);
+        assertThat(dialog.getButton(Dialog.BUTTON_POSITIVE).isEnabled()).isEqualTo(expected);
+    }
+
     private void setupFragment(BluetoothPairingDialogFragment frag) {
         assertThat(frag.isPairingControllerSet()).isFalse();
         frag.setPairingController(controller);
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java
index e3f00d8..0c27412 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java
@@ -18,17 +18,25 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doCallRealMethod;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
+import android.util.Log;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;
-import com.android.settingslib.bluetooth.CachedBluetoothDevice;
-import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -39,19 +47,9 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class BluetoothSummaryUpdaterTest {
@@ -70,16 +68,33 @@
     @Mock
     private SummaryListener mListener;
 
+    // Disabled by default
+    private final boolean[] mAdapterEnabled = {false};
+    // Not connected by default
+    private final int[] mAdapterConnectionState = {BluetoothAdapter.STATE_DISCONNECTED};
+    // Not connected by default
+    private final boolean[] mDeviceConnected = {false, false};
+    private final Set<BluetoothDevice> mBondedDevices = new HashSet<>();
     private BluetoothSummaryUpdater mSummaryUpdater;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        when(mBluetoothManager.getBluetoothAdapter()).thenReturn(mBtAdapter);
-        when(mBtAdapter.isEnabled()).thenReturn(true);
-        when(mBtAdapter.getConnectionState()).thenReturn(BluetoothAdapter.STATE_CONNECTED);
         mContext = RuntimeEnvironment.application.getApplicationContext();
+        doCallRealMethod().when(mListener).onSummaryChanged(anyString());
+        // Setup mock adapter
+        when(mBluetoothManager.getBluetoothAdapter()).thenReturn(mBtAdapter);
+        doAnswer(invocation -> mAdapterEnabled[0]).when(mBtAdapter).isEnabled();
+        doAnswer(invocation -> mAdapterConnectionState[0]).when(mBtAdapter).getConnectionState();
         mSummaryUpdater = new BluetoothSummaryUpdater(mContext, mListener, mBluetoothManager);
+        // Setup first device
+        doReturn(DEVICE_NAME).when(mConnectedDevice).getName();
+        doAnswer(invocation -> mDeviceConnected[0]).when(mConnectedDevice).isConnected();
+        // Setup second device
+        doReturn(DEVICE_KEYBOARD_NAME).when(mConnectedKeyBoardDevice).getName();
+        doAnswer(invocation -> mDeviceConnected[1]).when(mConnectedKeyBoardDevice)
+                .isConnected();
+        doReturn(mBondedDevices).when(mBtAdapter).getBondedDevices();
     }
 
     @Test
@@ -98,7 +113,10 @@
 
     @Test
     public void register_true_shouldSendSummaryChange() {
-        prepareConnectedDevice(false);
+        mAdapterEnabled[0] = true;
+        mAdapterConnectionState[0] = BluetoothAdapter.STATE_CONNECTED;
+        mBondedDevices.add(mConnectedDevice);
+        mDeviceConnected[0] = true;
 
         mSummaryUpdater.register(true);
 
@@ -108,7 +126,11 @@
 
     @Test
     public void onBluetoothStateChanged_btDisabled_shouldSendDisabledSummary() {
-        mSummaryUpdater.register(true);
+        // These states should be ignored
+        mAdapterConnectionState[0] = BluetoothAdapter.STATE_CONNECTED;
+        mBondedDevices.add(mConnectedDevice);
+        mDeviceConnected[0] = true;
+
         mSummaryUpdater.onBluetoothStateChanged(BluetoothAdapter.STATE_OFF);
 
         verify(mListener).onSummaryChanged(mContext.getString(R.string.bluetooth_disabled));
@@ -116,9 +138,11 @@
 
     @Test
     public void onBluetoothStateChanged_btEnabled_connected_shouldSendConnectedSummary() {
-        prepareConnectedDevice(false);
+        mAdapterEnabled[0] = true;
+        mAdapterConnectionState[0] = BluetoothAdapter.STATE_CONNECTED;
+        mBondedDevices.add(mConnectedDevice);
+        mDeviceConnected[0] = true;
 
-        mSummaryUpdater.register(true);
         mSummaryUpdater.onBluetoothStateChanged(BluetoothAdapter.STATE_ON);
 
         verify(mListener).onSummaryChanged(
@@ -126,58 +150,71 @@
     }
 
     @Test
+    public void onBluetoothStateChanged_btEnabled_connectedMisMatch_shouldSendNotConnected() {
+        mAdapterEnabled[0] = true;
+        mAdapterConnectionState[0] = BluetoothAdapter.STATE_CONNECTED;
+        mBondedDevices.add(mConnectedDevice);
+        // State mismatch
+        mDeviceConnected[0] = false;
+
+        mSummaryUpdater.onBluetoothStateChanged(BluetoothAdapter.STATE_ON);
+
+        verify(mListener).onSummaryChanged(mContext.getString(R.string.disconnected));
+    }
+
+    @Test
     public void onBluetoothStateChanged_btEnabled_notConnected_shouldSendDisconnectedMessage() {
-        when(mBtAdapter.getConnectionState()).thenReturn(BluetoothAdapter.STATE_DISCONNECTED);
-        mSummaryUpdater.register(true);
+        mAdapterEnabled[0] = true;
+        mAdapterConnectionState[0] = BluetoothAdapter.STATE_DISCONNECTED;
+        mBondedDevices.add(mConnectedDevice);
+        // This should be ignored
+        mDeviceConnected[0] = true;
+
         mSummaryUpdater.onBluetoothStateChanged(BluetoothAdapter.STATE_TURNING_ON);
 
-        verify(mListener).onSummaryChanged(
-                mContext.getString(R.string.disconnected));
+        verify(mListener).onSummaryChanged(mContext.getString(R.string.disconnected));
     }
 
     @Test
     public void onBluetoothStateChanged_ConnectedDisabledEnabled_shouldSendDisconnectedSummary() {
-        final boolean[] connected = {false};
-        final List<CachedBluetoothDevice> devices = new ArrayList<>();
-        devices.add(mock(CachedBluetoothDevice.class));
-        doAnswer(invocation -> connected[0]).when(devices.get(0)).isConnected();
-        when(mBluetoothManager.getCachedDeviceManager().getCachedDevicesCopy())
-                .thenReturn(devices);
-        when(mBtAdapter.getConnectionState()).thenReturn(BluetoothAdapter.STATE_DISCONNECTED);
-        prepareConnectedDevice(false);
+        mAdapterEnabled[0] = true;
+        mAdapterConnectionState[0] = BluetoothAdapter.STATE_DISCONNECTED;
+        mBondedDevices.add(mConnectedDevice);
+        mDeviceConnected[0] = false;
 
         mSummaryUpdater.register(true);
         verify(mListener).onSummaryChanged(mContext.getString(R.string.disconnected));
 
-        connected[0] = true;
-        when(mBtAdapter.getConnectionState()).thenReturn(BluetoothAdapter.STATE_CONNECTED);
+        mAdapterConnectionState[0] = BluetoothAdapter.STATE_CONNECTED;
+        mDeviceConnected[0] = true;
         mSummaryUpdater.onConnectionStateChanged(null /* device */,
                 BluetoothAdapter.STATE_CONNECTED);
         verify(mListener).onSummaryChanged(
                 mContext.getString(R.string.bluetooth_connected_summary, DEVICE_NAME));
 
+        mAdapterEnabled[0] = false;
         mSummaryUpdater.onBluetoothStateChanged(BluetoothAdapter.STATE_OFF);
         verify(mListener).onSummaryChanged(mContext.getString(R.string.bluetooth_disabled));
 
-        connected[0] = false;
+        // Turning ON means not enabled
         mSummaryUpdater.onBluetoothStateChanged(BluetoothAdapter.STATE_TURNING_ON);
+        // There should still be only one invocation of disabled message
+        verify(mListener).onSummaryChanged(mContext.getString(R.string.bluetooth_disabled));
+
+        mAdapterEnabled[0] = true;
+        mDeviceConnected[0] = false;
+        mSummaryUpdater.onBluetoothStateChanged(BluetoothAdapter.STATE_ON);
         verify(mListener, times(2)).onSummaryChanged(mContext.getString(R.string.disconnected));
         verify(mListener, times(4)).onSummaryChanged(anyString());
     }
 
     @Test
     public void onConnectionStateChanged_connected_shouldSendConnectedMessage() {
-        final List<CachedBluetoothDevice> devices = new ArrayList<>();
-        devices.add(mock(CachedBluetoothDevice.class));
-        when(devices.get(0).isConnected()).thenReturn(true);
-        when(mBluetoothManager.getCachedDeviceManager().getCachedDevicesCopy())
-                .thenReturn(devices);
-        when(mBtAdapter.getConnectionState()).thenReturn(BluetoothAdapter.STATE_DISCONNECTED);
-        prepareConnectedDevice(false);
+        mAdapterEnabled[0] = true;
+        mAdapterConnectionState[0] = BluetoothAdapter.STATE_CONNECTED;
+        mBondedDevices.add(mConnectedDevice);
+        mDeviceConnected[0] = true;
 
-        mSummaryUpdater.register(true);
-
-        when(mBtAdapter.getConnectionState()).thenReturn(BluetoothAdapter.STATE_CONNECTED);
         mSummaryUpdater.onConnectionStateChanged(null /* device */,
                 BluetoothAdapter.STATE_CONNECTED);
 
@@ -187,7 +224,22 @@
 
     @Test
     public void onConnectionStateChanged_inconsistentState_shouldSendDisconnectedMessage() {
-        mSummaryUpdater.register(true);
+        mAdapterEnabled[0] = true;
+        mAdapterConnectionState[0] = BluetoothAdapter.STATE_DISCONNECTED;
+        mBondedDevices.add(mConnectedDevice);
+        mDeviceConnected[0] = false;
+
+        mSummaryUpdater.onConnectionStateChanged(null /* device */,
+                BluetoothAdapter.STATE_CONNECTED);
+
+        verify(mListener).onSummaryChanged(mContext.getString(R.string.disconnected));
+    }
+
+    @Test
+    public void onConnectionStateChanged_noBondedDevice_shouldSendDisconnectedMessage() {
+        mAdapterEnabled[0] = true;
+        mAdapterConnectionState[0] = BluetoothAdapter.STATE_CONNECTED;
+
         mSummaryUpdater.onConnectionStateChanged(null /* device */,
                 BluetoothAdapter.STATE_CONNECTED);
 
@@ -197,8 +249,10 @@
 
     @Test
     public void onConnectionStateChanged_connecting_shouldSendConnectingMessage() {
-        mSummaryUpdater.register(true);
-        when(mBtAdapter.getConnectionState()).thenReturn(BluetoothAdapter.STATE_CONNECTING);
+        // No need for bonded devices
+        mAdapterEnabled[0] = true;
+        mAdapterConnectionState[0] = BluetoothAdapter.STATE_CONNECTING;
+
         mSummaryUpdater.onConnectionStateChanged(null /* device */,
                 BluetoothAdapter.STATE_CONNECTING);
 
@@ -207,8 +261,10 @@
 
     @Test
     public void onConnectionStateChanged_disconnecting_shouldSendDisconnectingMessage() {
-        mSummaryUpdater.register(true);
-        when(mBtAdapter.getConnectionState()).thenReturn(BluetoothAdapter.STATE_DISCONNECTING);
+        // No need for bonded devices
+        mAdapterEnabled[0] = true;
+        mAdapterConnectionState[0] = BluetoothAdapter.STATE_DISCONNECTING;
+
         mSummaryUpdater.onConnectionStateChanged(null /* device */,
                 BluetoothAdapter.STATE_DISCONNECTING);
 
@@ -217,7 +273,8 @@
 
     @Test
     public void getConnectedDeviceSummary_hasConnectedDevice_returnOneDeviceSummary() {
-        prepareConnectedDevice(false);
+        mBondedDevices.add(mConnectedDevice);
+        mDeviceConnected[0] = true;
         final String expectedSummary = mContext.getString(R.string.bluetooth_connected_summary,
                 DEVICE_NAME);
 
@@ -226,28 +283,16 @@
 
     @Test
     public void getConnectedDeviceSummary_multipleDevices_returnMultipleDevicesSummary() {
-        prepareConnectedDevice(true);
+        mBondedDevices.add(mConnectedDevice);
+        mBondedDevices.add(mConnectedKeyBoardDevice);
+        mDeviceConnected[0] = true;
+        mDeviceConnected[1] = true;
         final String expectedSummary = mContext.getString(
                 R.string.bluetooth_connected_multiple_devices_summary);
 
         assertThat(mSummaryUpdater.getConnectedDeviceSummary()).isEqualTo(expectedSummary);
     }
 
-    private void prepareConnectedDevice(boolean multipleDevices) {
-        final Set<BluetoothDevice> devices = new HashSet<>();
-        doReturn(DEVICE_NAME).when(mConnectedDevice).getName();
-        doReturn(true).when(mConnectedDevice).isConnected();
-        devices.add(mConnectedDevice);
-        if (multipleDevices) {
-            // Add one more device if we need to test multiple devices
-            doReturn(DEVICE_KEYBOARD_NAME).when(mConnectedKeyBoardDevice).getName();
-            doReturn(true).when(mConnectedKeyBoardDevice).isConnected();
-            devices.add(mConnectedKeyBoardDevice);
-        }
-
-        doReturn(devices).when(mBtAdapter).getBondedDevices();
-    }
-
     private class SummaryListener implements OnSummaryChangeListener {
         String summary;
 
diff --git a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java
index c205c50..49efecb 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java
@@ -34,9 +34,9 @@
 import com.android.settings.R;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.PreferenceController;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -208,7 +208,7 @@
         }
 
         @Override
-        protected List<PreferenceController> getPreferenceControllers(Context context) {
+        protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
             return null;
         }
     }
diff --git a/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java b/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java
index 4667dac..220d829 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java
@@ -15,14 +15,21 @@
  */
 package com.android.settings.bluetooth;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import android.bluetooth.BluetoothDevice;
 import android.content.Context;
+import android.graphics.drawable.Drawable;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.graph.BluetoothDeviceLayerDrawable;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -30,6 +37,7 @@
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 import static org.mockito.Matchers.anyInt;
@@ -40,7 +48,8 @@
 import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = SettingsShadowResources.class)
 public class UtilsTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -60,11 +69,27 @@
     }
 
     @Test
-    public void showConnectingError_shouldLogBluetoothConnectError() {
+    public void testShowConnectingError_shouldLogBluetoothConnectError() {
         when(mContext.getString(anyInt(), anyString())).thenReturn("testMessage");
         Utils.showConnectingError(mContext, "testName", mock(LocalBluetoothManager.class));
 
         verify(mMetricsFeatureProvider).visible(eq(mContext), anyInt(),
-            eq(MetricsEvent.ACTION_SETTINGS_BLUETOOTH_CONNECT_ERROR));
+                eq(MetricsEvent.ACTION_SETTINGS_BLUETOOTH_CONNECT_ERROR));
+    }
+
+    @Test
+    public void testGetBluetoothDrawable_noBatteryLevel_returnSimpleDrawable() {
+        final Drawable drawable = Utils.getBluetoothDrawable(RuntimeEnvironment.application,
+                R.drawable.ic_bt_laptop, BluetoothDevice.BATTERY_LEVEL_UNKNOWN, 1 /* iconScale */);
+
+        assertThat(drawable).isNotInstanceOf(BluetoothDeviceLayerDrawable.class);
+    }
+
+    @Test
+    public void testGetBluetoothDrawable_hasBatteryLevel_returnLayerDrawable() {
+        final Drawable drawable = Utils.getBluetoothDrawable(RuntimeEnvironment.application,
+                R.drawable.ic_bt_laptop, 10 /* batteryLevel */, 1 /* iconScale */);
+
+        assertThat(drawable).isInstanceOf(BluetoothDeviceLayerDrawable.class);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
index dbeecaa..4cb853e 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
@@ -22,16 +22,19 @@
 import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.nfc.NfcPreferenceController;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settingslib.drawer.CategoryKey;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
@@ -50,19 +53,45 @@
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class ConnectedDeviceDashboardFragmentTest {
 
-    @Mock
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     Context mContext;
 
     @Mock
     private PackageManager mManager;
 
+    private FakeFeatureFactory mFeatureFactory;
+    private SmsMirroringFeatureProvider mFeatureProvider;
     private ConnectedDeviceDashboardFragment mFragment;
+    private TestSmsMirroringPreferenceController mSmsMirroringPreferenceController;
+
+    private static final class TestSmsMirroringPreferenceController
+            extends SmsMirroringPreferenceController implements PreferenceControllerMixin {
+
+        private boolean mIsAvailable;
+
+        public TestSmsMirroringPreferenceController(Context context) {
+            super(context);
+        }
+
+        @Override
+        public boolean isAvailable() {
+            return mIsAvailable;
+        }
+    }
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest(mContext);
+        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
+        mFeatureProvider = mFeatureFactory.smsMirroringFeatureProvider;
+
         mFragment = new ConnectedDeviceDashboardFragment();
         when(mContext.getPackageManager()).thenReturn(mManager);
+
+        mSmsMirroringPreferenceController = new TestSmsMirroringPreferenceController(mContext);
+        when(mFeatureProvider.getController(mContext)).thenReturn(
+                mSmsMirroringPreferenceController);
     }
 
     @Test
@@ -103,11 +132,35 @@
     }
 
     @Test
+    public void testSearchIndexProvider_NoSmsMirroring_KeyAdded() {
+        when(mFeatureProvider.shouldShowSmsMirroring(mContext)).thenReturn(false);
+        mSmsMirroringPreferenceController.mIsAvailable = false;
+
+        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
+                mContext);
+
+        assertThat(keys).isNotNull();
+        assertThat(keys).contains(mSmsMirroringPreferenceController.getPreferenceKey());
+    }
+
+    @Test
+    public void testSearchIndexProvider_SmsMirroring_KeyNotAdded() {
+        when(mFeatureProvider.shouldShowSmsMirroring(mContext)).thenReturn(true);
+        mSmsMirroringPreferenceController.mIsAvailable = true;
+
+        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
+                mContext);
+
+        assertThat(keys).isNotNull();
+        assertThat(keys).doesNotContain(mSmsMirroringPreferenceController.getPreferenceKey());
+    }
+
+    @Test
     public void testNonIndexableKeys_existInXmlLayout() {
         final Context context = RuntimeEnvironment.application;
         when(mManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(false);
         final List<String> niks = ConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(context);
+                .getNonIndexableKeys(mContext);
         final int xmlId = (new ConnectedDeviceDashboardFragment()).getPreferenceScreenResId();
 
         final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
@@ -141,6 +194,7 @@
         final SummaryLoader summaryLoader = mock(SummaryLoader.class);
 
         when(mContext.getApplicationContext()).thenReturn(mContext);
+        when(mContext.getSystemService(NFC_SERVICE)).thenReturn(null);
 
         SummaryLoader.SummaryProvider provider =
                 new ConnectedDeviceDashboardFragment.SummaryProvider(mContext, summaryLoader);
diff --git a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java
index 23e1e2e..d05bee6 100644
--- a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java
+++ b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java
@@ -16,10 +16,10 @@
 
 package com.android.settings.core.codeinspection;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.InstrumentableFragmentCodeInspector;
 import com.android.settings.search.SearchIndexProviderCodeInspector;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java
index 4455549..be1a599 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.core.instrumentation;
 
+import static com.google.common.truth.Truth.assertWithMessage;
+
 import android.app.Fragment;
 import android.util.ArraySet;
 
@@ -25,8 +27,6 @@
 import java.util.List;
 import java.util.Set;
 
-import static com.google.common.truth.Truth.assertWithMessage;
-
 /**
  * {@link CodeInspector} that verifies all fragments implements Instrumentable.
  */
@@ -67,7 +67,5 @@
         assertWithMessage(sb.toString())
                 .that(broken.isEmpty())
                 .isTrue();
-        assertNoObsoleteInGrandfatherList("grandfather_not_implementing_instrumentable",
-                grandfather_notImplementingInstrumentable);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java
index ec644a6..bb41cf0 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java
@@ -39,7 +39,7 @@
 import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
         .FIELD_SETTINGS_PREFERENCE_CHANGE_FLOAT_VALUE;
 import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
-        .FIELD_SETTINGS_PREFERENCE_CHANGE_LONG_VALUE;
+        .FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE;
 import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
         .FIELD_SETTINGS_PREFERENCE_CHANGE_NAME;
 import static org.mockito.Matchers.any;
@@ -88,7 +88,7 @@
 
         verify(mMetricsFeature, times(6)).action(any(Context.class), anyInt(),
                 argThat(mNamePairMatcher),
-                argThat(pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_LONG_VALUE, Long.class)));
+                argThat(pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE, Integer.class)));
     }
 
     @Test
@@ -103,10 +103,10 @@
 
         verify(mMetricsFeature).action(any(Context.class), anyInt(),
                 argThat(mNamePairMatcher),
-                argThat(pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_LONG_VALUE, true)));
+                argThat(pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE, true)));
         verify(mMetricsFeature, times(3)).action(any(Context.class), anyInt(),
                 argThat(mNamePairMatcher),
-                argThat(pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_LONG_VALUE, false)));
+                argThat(pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE, false)));
     }
 
     @Test
@@ -120,7 +120,33 @@
 
         verify(mMetricsFeature, times(4)).action(any(Context.class), anyInt(),
                 argThat(mNamePairMatcher),
-                argThat(pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_LONG_VALUE, Long.class)));
+                argThat(pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE, Integer.class)));
+    }
+
+    @Test
+    public void putLong_biggerThanIntMax_shouldLogIntMax() {
+        final SharedPreferences.Editor editor = mSharedPrefLogger.edit();
+        final long veryBigNumber = 500L + Integer.MAX_VALUE;
+        editor.putLong(TEST_KEY, 1);
+        editor.putLong(TEST_KEY, veryBigNumber);
+
+        verify(mMetricsFeature).action(any(Context.class), anyInt(),
+                argThat(mNamePairMatcher),
+                argThat(pairMatches(
+                        FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE, Integer.MAX_VALUE)));
+    }
+
+    @Test
+    public void putLong_smallerThanIntMin_shouldLogIntMin() {
+        final SharedPreferences.Editor editor = mSharedPrefLogger.edit();
+        final long veryNegativeNumber = -500L + Integer.MIN_VALUE;
+        editor.putLong(TEST_KEY, 1);
+        editor.putLong(TEST_KEY, veryNegativeNumber);
+
+        verify(mMetricsFeature).action(any(Context.class), anyInt(),
+                argThat(mNamePairMatcher),
+                argThat(pairMatches(
+                        FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE, Integer.MIN_VALUE)));
     }
 
     @Test
@@ -152,7 +178,13 @@
 
     private ArgumentMatcher<Pair<Integer, Object>> pairMatches(int tag, boolean bool) {
         return pair -> pair.first == tag
-                && Platform.isInstanceOfType(pair.second, Long.class)
-                && pair.second.equals((bool ? 1L : 0L));
+                && Platform.isInstanceOfType(pair.second, Integer.class)
+                && pair.second.equals((bool ? 1 : 0));
+    }
+
+    private ArgumentMatcher<Pair<Integer, Object>> pairMatches(int tag, int val) {
+        return pair -> pair.first == tag
+                && Platform.isInstanceOfType(pair.second, Integer.class)
+                && pair.second.equals(val);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
index 4d81320..4b345d0 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
@@ -16,7 +16,6 @@
 package com.android.settings.dashboard;
 
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.any;
@@ -38,6 +37,7 @@
 import android.os.Bundle;
 import android.support.v7.widget.RecyclerView;
 import android.util.DisplayMetrics;
+import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.RelativeLayout;
@@ -52,7 +52,6 @@
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;
 import com.android.settingslib.drawer.DashboardCategory;
 import com.android.settingslib.drawer.Tile;
 
@@ -68,7 +67,6 @@
 import org.robolectric.annotation.Config;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
@@ -77,7 +75,6 @@
         shadows = {
                 SettingsShadowResources.class,
                 SettingsShadowResources.SettingsShadowTheme.class,
-                ShadowDynamicIndexableContentMonitor.class
         })
 public class DashboardAdapterTest {
 
@@ -93,6 +90,8 @@
     private ArgumentCaptor<Integer> mActionCategoryCaptor = ArgumentCaptor.forClass(Integer.class);
     @Captor
     private ArgumentCaptor<String> mActionPackageCaptor = ArgumentCaptor.forClass(String.class);
+    @Captor
+    private ArgumentCaptor<Pair> mTaggedDataCaptor = ArgumentCaptor.forClass(Pair.class);
     private FakeFeatureFactory mFactory;
     private DashboardAdapter mDashboardAdapter;
     private DashboardAdapter.SuggestionAndConditionHeaderHolder mSuggestionHolder;
@@ -127,112 +126,143 @@
     @Test
     public void testSuggestionsLogs_NotExpanded() {
         setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
+
         verify(mFactory.metricsFeatureProvider, times(2)).action(
                 any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture());
-        String[] expectedPackages = new String[]{"pkg1", "pkg2"};
-        Integer[] expectedActions = new Integer[]{
+                mActionPackageCaptor.capture(),
+                mTaggedDataCaptor.capture());
+        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
                 MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION
-        };
-        assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
-        assertThat(mActionPackageCaptor.getAllValues().toArray()).isEqualTo(expectedPackages);
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION);
+        assertThat(mActionPackageCaptor.getAllValues()).containsExactly("pkg1", "pkg2");
+        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
     }
 
     @Test
     public void testSuggestionsLogs_NotExpandedAndPaused() {
         setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
+
         mDashboardAdapter.onPause();
+
         verify(mFactory.metricsFeatureProvider, times(4)).action(
                 any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture());
-        String[] expectedPackages = new String[]{"pkg1", "pkg2", "pkg1", "pkg2"};
-        Integer[] expectedActions = new Integer[]{
+                mActionPackageCaptor.capture(),
+                mTaggedDataCaptor.capture());
+        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
                 MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
                 MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
                 MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION};
-        assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
-        assertThat(mActionPackageCaptor.getAllValues().toArray()).isEqualTo(expectedPackages);
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION);
+        assertThat(mActionPackageCaptor.getAllValues()).containsExactly(
+                "pkg1", "pkg2", "pkg1", "pkg2");
+        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
     }
 
     @Test
     public void testSuggestionsLogs_Expanded() {
         setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
+
         mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
         mSuggestionHolder.itemView.callOnClick();
+
         verify(mFactory.metricsFeatureProvider, times(3)).action(
                 any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture());
-        String[] expectedPackages = new String[]{"pkg1", "pkg2", "pkg3"};
-        Integer[] expectedActions = new Integer[]{
+                mActionPackageCaptor.capture(),
+                mTaggedDataCaptor.capture());
+        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
                 MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
                 MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION
-        };
-        assertThat(mActionPackageCaptor.getAllValues().toArray()).isEqualTo(expectedPackages);
-        assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION);
+        assertThat(mActionPackageCaptor.getAllValues()).containsExactly(
+                "pkg1", "pkg2", "pkg3");
+        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
     }
 
     @Test
     public void testSuggestionsLogs_ExpandedAndPaused() {
         setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
+
         mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
         mSuggestionHolder.itemView.callOnClick();
         mDashboardAdapter.onPause();
+
         verify(mFactory.metricsFeatureProvider, times(6)).action(
                 any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture());
-        String[] expectedPackages = new String[]{"pkg1", "pkg2", "pkg3", "pkg1", "pkg2", "pkg3"};
-        Integer[] expectedActions = new Integer[]{
+                mActionPackageCaptor.capture(),
+                mTaggedDataCaptor.capture());
+        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
                 MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
                 MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
                 MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
                 MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
                 MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION
-        };
-        assertThat(mActionPackageCaptor.getAllValues().toArray()).isEqualTo(expectedPackages);
-        assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION);
+        assertThat(mActionPackageCaptor.getAllValues()).containsExactly(
+                "pkg1", "pkg2", "pkg3", "pkg1", "pkg2", "pkg3");
+        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
     }
 
     @Test
     public void testSuggestionsLogs_ExpandedAfterPause() {
         setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
+
         mDashboardAdapter.onPause();
         mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
         mSuggestionHolder.itemView.callOnClick();
+
         verify(mFactory.metricsFeatureProvider, times(7)).action(
                 any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture());
-        String[] expectedPackages = new String[]{
-                "pkg1", "pkg2", "pkg1", "pkg2", "pkg1", "pkg2", "pkg3"};
-        Integer[] expectedActions = new Integer[]{
+                mActionPackageCaptor.capture(),
+                mTaggedDataCaptor.capture());
+        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
                 MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
                 MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
                 MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
                 MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
                 MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
                 MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION
-        };
-        assertThat(mActionPackageCaptor.getAllValues().toArray()).isEqualTo(expectedPackages);
-        assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION);
+        assertThat(mActionPackageCaptor.getAllValues()).containsExactly(
+                "pkg1", "pkg2", "pkg1", "pkg2", "pkg1", "pkg2", "pkg3");
+        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
     }
 
     @Test
     public void testSuggestionsLogs_ExpandedAfterPauseAndPausedAgain() {
         setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
+
         mDashboardAdapter.onPause();
         mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
         mSuggestionHolder.itemView.callOnClick();
         mDashboardAdapter.onPause();
+
         verify(mFactory.metricsFeatureProvider, times(10)).action(
                 any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture());
-        String[] expectedPackages = new String[]{
-                "pkg1", "pkg2", "pkg1", "pkg2", "pkg1", "pkg2", "pkg3", "pkg1", "pkg2", "pkg3"};
-        Integer[] expectedActions = new Integer[]{
+                mActionPackageCaptor.capture(),
+                mTaggedDataCaptor.capture());
+        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
                 MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
                 MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
                 MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
@@ -242,63 +272,82 @@
                 MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
                 MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
                 MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION
-        };
-        assertThat(mActionPackageCaptor.getAllValues().toArray()).isEqualTo(expectedPackages);
-        assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION);
+        assertThat(mActionPackageCaptor.getAllValues()).containsExactly(
+                "pkg1", "pkg2", "pkg1", "pkg2", "pkg1", "pkg2", "pkg3", "pkg1", "pkg2", "pkg3");
+        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
     }
 
     @Test
     public void testSuggestionsLogs_ExpandedWithLessThanDefaultShown() {
         setupSuggestions(makeSuggestions("pkg1"));
+
         mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
         mSuggestionHolder.itemView.callOnClick();
+
         verify(mFactory.metricsFeatureProvider, times(1)).action(
                 any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture());
-        String[] expectedPackages = new String[]{"pkg1"};
-        Integer[] expectedActions = new Integer[]{
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-        };
-        assertThat(mActionPackageCaptor.getAllValues().toArray()).isEqualTo(expectedPackages);
-        assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
+                mActionPackageCaptor.capture(),
+                mTaggedDataCaptor.capture());
+        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION);
+        assertThat(mActionPackageCaptor.getAllValues()).containsExactly("pkg1");
+        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
     }
 
     @Test
     public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAndPaused() {
         setupSuggestions(makeSuggestions("pkg1"));
+
         mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
         mSuggestionHolder.itemView.callOnClick();
         mDashboardAdapter.onPause();
+
         verify(mFactory.metricsFeatureProvider, times(2)).action(
                 any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture());
-        String[] expectedPackages = new String[]{"pkg1", "pkg1"};
-        Integer[] expectedActions = new Integer[]{
+                mActionPackageCaptor.capture(),
+                mTaggedDataCaptor.capture());
+        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
                 MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION
-        };
-        assertThat(mActionPackageCaptor.getAllValues().toArray()).isEqualTo(expectedPackages);
-        assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION);
+        assertThat(mActionPackageCaptor.getAllValues()).containsExactly("pkg1", "pkg1");
+        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
     }
 
     @Test
     public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAfterPause() {
         setupSuggestions(makeSuggestions("pkg1"));
+
         mDashboardAdapter.onPause();
         mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
         mSuggestionHolder.itemView.callOnClick();
+
         verify(mFactory.metricsFeatureProvider, times(3)).action(
                 any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture());
-        String[] expectedPackages = new String[]{"pkg1", "pkg1", "pkg1"};
-        Integer[] expectedActions = new Integer[]{
+                mActionPackageCaptor.capture(),
+                mTaggedDataCaptor.capture());
+        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
                 MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
                 MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION
-        };
-        assertThat(mActionPackageCaptor.getAllValues().toArray()).isEqualTo(expectedPackages);
-        assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION);
+        assertThat(mActionPackageCaptor.getAllValues()).containsExactly("pkg1", "pkg1", "pkg1");
+        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
     }
 
     @Test
@@ -308,26 +357,69 @@
         mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
         mSuggestionHolder.itemView.callOnClick();
         mDashboardAdapter.onPause();
+
         verify(mFactory.metricsFeatureProvider, times(4)).action(
                 any(Context.class), mActionCategoryCaptor.capture(),
-                mActionPackageCaptor.capture());
-        String[] expectedPackages = new String[]{"pkg1", "pkg1", "pkg1", "pkg1"};
-        Integer[] expectedActions = new Integer[]{
+                mActionPackageCaptor.capture(),
+                mTaggedDataCaptor.capture());
+        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
                 MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
                 MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
                 MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION
-        };
-        assertThat(mActionPackageCaptor.getAllValues().toArray()).isEqualTo(expectedPackages);
-        assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION);
+        assertThat(mActionPackageCaptor.getAllValues()).containsExactly(
+                "pkg1", "pkg1", "pkg1", "pkg1");
+        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
     }
 
     @Test
-    public void testSuggestioDismissed_notOnlySuggestion_updateSuggestionOnly() {
+    public void testSuggestionsLogs_SmartSuggestionEnabled() {
+        when(mFactory.suggestionsFeatureProvider
+                .isSmartSuggestionEnabled(any(Context.class))).thenReturn(true);
+        setupSuggestions(makeSuggestions("pkg1"));
+
+        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
+        mSuggestionHolder.itemView.callOnClick();
+        mDashboardAdapter.onPause();
+
+        verify(mFactory.metricsFeatureProvider, times(2)).action(
+                any(Context.class), mActionCategoryCaptor.capture(),
+                mActionPackageCaptor.capture(),
+                mTaggedDataCaptor.capture());
+        assertThat(mActionCategoryCaptor.getAllValues()).containsExactly(
+                MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION);
+        assertThat(mActionPackageCaptor.getAllValues()).containsExactly("pkg1", "pkg1");
+        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 1),
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 1));
+    }
+
+    @Test
+    public void testSuggestionsLogs_nullSuggestionsList_shouldNotCrash() {
+        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3", "pkg4", "pkg5"));
+        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
+
+        // set suggestions to null
+        final DashboardData prevData = mDashboardAdapter.mDashboardData;
+        mDashboardAdapter.mDashboardData = new DashboardData.Builder(prevData)
+                .setSuggestions(null)
+                .build();
+
+        mSuggestionHolder.itemView.callOnClick();
+        // no crash
+    }
+
+    @Test
+    public void testSuggestionDismissed_notOnlySuggestion_updateSuggestionOnly() {
         final DashboardAdapter adapter =
                 spy(new DashboardAdapter(mContext, null, null, null, null));
         final List<Tile> suggestions = makeSuggestions("pkg1", "pkg2", "pkg3");
-        adapter.setCategoriesAndSuggestions(new ArrayList<>(), suggestions);
+        adapter.setCategoriesAndSuggestions(null /* category */, suggestions);
 
         final RecyclerView data = mock(RecyclerView.class);
         when(data.getResources()).thenReturn(mResources);
@@ -364,7 +456,7 @@
                 makeSuggestions("pkg1", "pkg2", "pkg3", "pkg4");
         final DashboardAdapter adapter = spy(new DashboardAdapter(mContext, null /*savedInstance */,
                 null /* conditions */, null /* suggestionParser */, null /* callback */));
-        adapter.setCategoriesAndSuggestions(new ArrayList<>(), suggestions);
+        adapter.setCategoriesAndSuggestions(null /* category */, suggestions);
         adapter.onBindConditionAndSuggestion(
                 holder, DashboardAdapter.SUGGESTION_CONDITION_HEADER_POSITION);
         // default mode, only displaying 2 suggestions
@@ -373,16 +465,16 @@
 
         // verify operations that access the lists will not cause ConcurrentModificationException
         assertThat(holder.data.getAdapter().getItemCount()).isEqualTo(1);
-        adapter.setCategoriesAndSuggestions(new ArrayList<>(), suggestions);
+        adapter.setCategoriesAndSuggestions(null /* category */, suggestions);
         // should not crash
     }
 
     @Test
-    public void testSuggestioDismissed_onlySuggestion_updateDashboardData() {
+    public void testSuggestionDismissed_onlySuggestion_updateDashboardData() {
         DashboardAdapter adapter =
                 spy(new DashboardAdapter(mContext, null, null, null, null));
         final List<Tile> suggestions = makeSuggestions("pkg1");
-        adapter.setCategoriesAndSuggestions(new ArrayList<>(), suggestions);
+        adapter.setCategoriesAndSuggestions(null /* category */, suggestions);
         final DashboardData dashboardData = adapter.mDashboardData;
         reset(adapter); // clear interactions tracking
 
@@ -403,7 +495,27 @@
         packages.get(0).isIconTintable = true;
         packages.get(0).icon = mockIcon;
 
-        mDashboardAdapter.setCategoriesAndSuggestions(Collections.emptyList(), packages);
+        mDashboardAdapter.setCategoriesAndSuggestions(null /* category */, packages);
+
+        verify(mockIcon).setTint(eq(0x89000000));
+    }
+
+    @Test
+    public void testSetCategories_iconTinted() {
+        TypedArray mockTypedArray = mock(TypedArray.class);
+        doReturn(mockTypedArray).when(mContext).obtainStyledAttributes(any(int[].class));
+        doReturn(0x89000000).when(mockTypedArray).getColor(anyInt(), anyInt());
+
+        final DashboardCategory category = mock(DashboardCategory.class);
+        final List<Tile> tiles = new ArrayList<>();
+        final Icon mockIcon = mock(Icon.class);
+        final Tile tile = new Tile();
+        tile.isIconTintable = true;
+        tile.icon = mockIcon;
+        tiles.add(tile);
+        category.tiles = tiles;
+
+        mDashboardAdapter.setCategory(category);
 
         verify(mockIcon).setTint(eq(0x89000000));
     }
@@ -412,7 +524,7 @@
     public void testSetCategoriesAndSuggestions_limitSuggestionSize() {
         List<Tile> packages =
                 makeSuggestions("pkg1", "pkg2", "pkg3", "pkg4", "pkg5", "pkg6", "pkg7");
-        mDashboardAdapter.setCategoriesAndSuggestions(Collections.emptyList(), packages);
+        mDashboardAdapter.setCategoriesAndSuggestions(null /* category */, packages);
 
         assertThat(mDashboardAdapter.mDashboardData.getSuggestions().size())
                 .isEqualTo(DashboardAdapter.MAX_SUGGESTION_TO_SHOW);
@@ -422,12 +534,12 @@
     public void testBindConditionAndSuggestion_shouldSetSuggestionAdapterAndNoCrash() {
         mDashboardAdapter = new DashboardAdapter(mContext, null, null, null, null);
         final List<Tile> suggestions = makeSuggestions("pkg1");
-        final List<DashboardCategory> categories = new ArrayList<>();
         final DashboardCategory category = mock(DashboardCategory.class);
         final List<Tile> tiles = new ArrayList<>();
         tiles.add(mock(Tile.class));
         category.tiles = tiles;
-        mDashboardAdapter.setCategoriesAndSuggestions(categories, suggestions);
+
+        mDashboardAdapter.setCategoriesAndSuggestions(category, suggestions);
 
         final RecyclerView data = mock(RecyclerView.class);
         when(data.getResources()).thenReturn(mResources);
@@ -446,7 +558,7 @@
     }
 
     @Test
-    public void testBindConditionAndSuggestion_emptySuggestion_shouldSetConditionAdapter() {
+    public void testBindConditionAndSuggestion_emptySuggestion_shouldSetConditionAdpater() {
         final Bundle savedInstance = new Bundle();
         savedInstance.putInt(DashboardAdapter.STATE_SUGGESTION_CONDITION_MODE,
                 DashboardData.HEADER_MODE_FULLY_EXPANDED);
@@ -454,13 +566,11 @@
                 null /* SuggestionParser */, null /* SuggestionDismissController.Callback */);
 
         final List<Tile> suggestions = new ArrayList<>();
-        final List<DashboardCategory> categories = new ArrayList<>();
         final DashboardCategory category = mock(DashboardCategory.class);
-        categories.add(category);
         final List<Tile> tiles = new ArrayList<>();
         tiles.add(mock(Tile.class));
         category.tiles = tiles;
-        mDashboardAdapter.setCategoriesAndSuggestions(categories, suggestions);
+        mDashboardAdapter.setCategoriesAndSuggestions(category, suggestions);
 
         final RecyclerView data = mock(RecyclerView.class);
         when(data.getResources()).thenReturn(mResources);
@@ -489,7 +599,7 @@
     }
 
     private void setupSuggestions(List<Tile> suggestions) {
-        mDashboardAdapter.setCategoriesAndSuggestions(new ArrayList<>(), suggestions);
+        mDashboardAdapter.setCategoriesAndSuggestions(null /* category */, suggestions);
         final Context context = RuntimeEnvironment.application;
         mSuggestionHolder = new DashboardAdapter.SuggestionAndConditionHeaderHolder(
                 LayoutInflater.from(context).inflate(
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
index fdbbefb..cc4f741 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
@@ -16,14 +16,24 @@
 
 package com.android.settings.dashboard;
 
+import static com.android.settings.dashboard.DashboardData.STABLE_ID_CONDITION_CONTAINER;
+import static com.android.settings.dashboard.DashboardData.STABLE_ID_SUGGESTION_CONDITION_FOOTER;
+import static com.android.settings.dashboard.DashboardData.STABLE_ID_SUGGESTION_CONTAINER;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import android.support.annotation.NonNull;
 import android.support.v7.util.DiffUtil;
 import android.support.v7.util.ListUpdateCallback;
+import android.widget.RemoteViews;
+
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.conditional.AirplaneModeCondition;
 import com.android.settings.dashboard.conditional.Condition;
 import com.android.settingslib.drawer.DashboardCategory;
 import com.android.settingslib.drawer.Tile;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -33,12 +43,10 @@
 import org.robolectric.annotation.Config;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.Objects;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -80,55 +88,66 @@
         twoItemsConditions.add(mTestCondition);
         twoItemsConditions.add(mSecondCondition);
 
-        // Build categories
-        final List<DashboardCategory> categories = new ArrayList<>();
+        // Build category
         mTestCategoryTile.title = TEST_CATEGORY_TILE_TITLE;
         mDashboardCategory.title = "test";
         mDashboardCategory.tiles = new ArrayList<>();
         mDashboardCategory.tiles.add(mTestCategoryTile);
-        categories.add(mDashboardCategory);
 
         // Build DashboardData
         mDashboardDataWithOneConditions = new DashboardData.Builder()
                 .setConditions(oneItemConditions)
-                .setCategories(categories)
+                .setCategory(mDashboardCategory)
                 .setSuggestions(suggestions)
                 .setSuggestionConditionMode(DashboardData.HEADER_MODE_FULLY_EXPANDED)
                 .build();
 
         mDashboardDataWithTwoConditions = new DashboardData.Builder()
                 .setConditions(twoItemsConditions)
-                .setCategories(categories)
+                .setCategory(mDashboardCategory)
                 .setSuggestions(suggestions)
                 .setSuggestionConditionMode(DashboardData.HEADER_MODE_FULLY_EXPANDED)
                 .build();
 
         mDashboardDataWithNoItems = new DashboardData.Builder()
                 .setConditions(null)
-                .setCategories(null)
+                .setCategory(null)
                 .setSuggestions(null)
                 .build();
     }
 
     @Test
+    public void testBuildItemsData_shouldSetstableId() {
+        final List<DashboardData.Item> items = mDashboardDataWithOneConditions.getItemList();
+
+        // Header, suggestion, condition, footer, 1 tile
+        assertThat(items).hasSize(4);
+
+        assertThat(items.get(0).id).isEqualTo(STABLE_ID_SUGGESTION_CONTAINER);
+        assertThat(items.get(1).id).isEqualTo(STABLE_ID_CONDITION_CONTAINER);
+        assertThat(items.get(2).id).isEqualTo(STABLE_ID_SUGGESTION_CONDITION_FOOTER);
+        assertThat(items.get(3).id).isEqualTo(Objects.hash(mTestCategoryTile.title));
+    }
+
+    @Test
     public void testBuildItemsData_containsAllData() {
         final Object[] expectedObjects = {
-            mDashboardDataWithOneConditions.getSuggestions(),
-            mDashboardDataWithOneConditions.getConditions(),
-            null, mDashboardCategory, mTestCategoryTile};
+                mDashboardDataWithOneConditions.getSuggestions(),
+                mDashboardDataWithOneConditions.getConditions(),
+                null, mTestCategoryTile};
         final int expectedSize = expectedObjects.length;
 
-        assertThat(mDashboardDataWithOneConditions.getItemList().size())
-                .isEqualTo(expectedSize);
+        assertThat(mDashboardDataWithOneConditions.getItemList()).hasSize(expectedSize);
+
         for (int i = 0; i < expectedSize; i++) {
             final Object item = mDashboardDataWithOneConditions.getItemEntityByPosition(i);
             if (item instanceof List) {
                 assertThat(item).isEqualTo(expectedObjects[i]);
             } else if (item instanceof DashboardData.SuggestionConditionHeaderData) {
                 DashboardData.SuggestionConditionHeaderData i1 =
-                    (DashboardData.SuggestionConditionHeaderData)item;
+                        (DashboardData.SuggestionConditionHeaderData) item;
                 DashboardData.SuggestionConditionHeaderData i2 =
-                    (DashboardData.SuggestionConditionHeaderData)expectedObjects[i];
+                        (DashboardData.SuggestionConditionHeaderData) expectedObjects[i];
                 assertThat(i1.title).isEqualTo(i2.title);
                 assertThat(i1.conditionCount).isEqualTo(i2.conditionCount);
                 assertThat(i1.hiddenSuggestionCount).isEqualTo(i2.hiddenSuggestionCount);
@@ -189,22 +208,76 @@
         // Item in position 2 is the condition container containing the list of conditions, which
         // gets 1 more item
         testResultData.add(new ListUpdateResult.ResultData(
-            ListUpdateResult.ResultData.TYPE_OPERATION_CHANGE, 1, 1));
+                ListUpdateResult.ResultData.TYPE_OPERATION_CHANGE, 1, 1));
 
         testDiffUtil(mDashboardDataWithOneConditions,
                 mDashboardDataWithTwoConditions, testResultData);
     }
 
     @Test
+    public void testDiffUtil_RemoveOneSuggestion_causeItemRemoveAndChange() {
+        //Build testResultData
+        final List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
+        testResultData.add(new ListUpdateResult.ResultData(
+                ListUpdateResult.ResultData.TYPE_OPERATION_REMOVE, 0, 1));
+        testResultData.add(new ListUpdateResult.ResultData(
+                ListUpdateResult.ResultData.TYPE_OPERATION_CHANGE, 1, 1));
+        // Build DashboardData
+        final List<Condition> oneItemConditions = new ArrayList<>();
+        when(mTestCondition.shouldShow()).thenReturn(true);
+        oneItemConditions.add(mTestCondition);
+        final List<Tile> suggestions = new ArrayList<>();
+        mTestSuggestion.title = TEST_SUGGESTION_TITLE;
+        suggestions.add(mTestSuggestion);
+
+        final DashboardData oldData = new DashboardData.Builder()
+                .setConditions(oneItemConditions)
+                .setCategory(mDashboardCategory)
+                .setSuggestions(suggestions)
+                .setSuggestionConditionMode(DashboardData.HEADER_MODE_DEFAULT)
+                .build();
+        final DashboardData newData = new DashboardData.Builder()
+                .setConditions(oneItemConditions)
+                .setSuggestions(null)
+                .setCategory(mDashboardCategory)
+                .setSuggestionConditionMode(DashboardData.HEADER_MODE_DEFAULT)
+                .build();
+
+        testDiffUtil(oldData, newData, testResultData);
+    }
+
+    @Test
     public void testDiffUtil_DeleteAllData_ResultDataOneDeleted() {
         //Build testResultData
         final List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
         testResultData.add(new ListUpdateResult.ResultData(
-                ListUpdateResult.ResultData.TYPE_OPERATION_REMOVE, 0, 5));
+                ListUpdateResult.ResultData.TYPE_OPERATION_REMOVE, 0, 4));
 
         testDiffUtil(mDashboardDataWithOneConditions, mDashboardDataWithNoItems, testResultData);
     }
 
+    @Test
+    public void testDiffUtil_typeSuggestedContainer_ResultDataNothingChanged() {
+        //Build testResultData
+        final List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
+        testResultData.add(new ListUpdateResult.ResultData(
+                ListUpdateResult.ResultData.TYPE_OPERATION_CHANGE, 0, 1));
+        Tile tile = new Tile();
+        tile.remoteViews = mock(RemoteViews.class);
+
+        DashboardData prevData = new DashboardData.Builder()
+                .setConditions(null)
+                .setCategory(null)
+                .setSuggestions(Arrays.asList(tile))
+                .build();
+        DashboardData currentData = new DashboardData.Builder()
+                .setConditions(null)
+                .setCategory(null)
+                .setSuggestions(Arrays.asList(tile))
+                .build();
+        testDiffUtil(prevData, currentData, testResultData);
+    }
+
     /**
      * Test when using the
      * {@link com.android.settings.dashboard.DashboardData.ItemsDataDiffCallback}
@@ -223,10 +296,6 @@
      * <p>
      * Because baseResultData and {@paramref testResultData} don't have sequence. When do the
      * comparison, we will sort them first and then compare the inside data from them one by one.
-     *
-     * @param baseDashboardData
-     * @param diffDashboardData
-     * @param testResultData
      */
     private void testDiffUtil(DashboardData baseDashboardData, DashboardData diffDashboardData,
             List<ListUpdateResult.ResultData> testResultData) {
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java
index d102ab4..3d9783d 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java
@@ -19,9 +19,9 @@
 import android.app.Fragment;
 import android.content.Context;
 
-import com.android.settings.core.PreferenceController;
-import com.android.settings.search.Indexable;
 import com.android.settings.search.DatabaseIndexingUtils;
+import com.android.settings.search.Indexable;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import org.robolectric.RuntimeEnvironment;
 
@@ -47,8 +47,8 @@
         if (provider == null) {
             return true;
         }
-        final List<PreferenceController> controllersFromSearchIndexProvider;
-        final List<PreferenceController> controllersFromFragment;
+        final List<AbstractPreferenceController> controllersFromSearchIndexProvider;
+        final List<AbstractPreferenceController> controllersFromFragment;
         try {
             controllersFromSearchIndexProvider = provider.getPreferenceControllers(context);
         } catch (Throwable e) {
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
index 2d32949..ea160dd 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
@@ -24,7 +24,10 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
+import android.graphics.drawable.Icon;
 import android.os.Bundle;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceManager;
@@ -32,12 +35,14 @@
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.drawer.DashboardCategory;
 import com.android.settingslib.drawer.Tile;
+import com.android.settingslib.drawer.TileUtils;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -126,7 +131,7 @@
 
     @Test
     public void onAttach_shouldCreatePlaceholderPreferenceController() {
-        final PreferenceController controller = mTestFragment.getPreferenceController(
+        final AbstractPreferenceController controller = mTestFragment.getPreferenceController(
                 DashboardTilePlaceholderPreferenceController.class);
 
         assertThat(controller).isNotNull();
@@ -134,9 +139,11 @@
 
     @Test
     public void updateState_skipUnavailablePrefs() {
-        final List<PreferenceController> preferenceControllers = mTestFragment.mControllers;
-        final PreferenceController mockController1 = mock(PreferenceController.class);
-        final PreferenceController mockController2 = mock(PreferenceController.class);
+        final List<AbstractPreferenceController> preferenceControllers = mTestFragment.mControllers;
+        final AbstractPreferenceController mockController1 =
+                mock(AbstractPreferenceController.class);
+        final AbstractPreferenceController mockController2 =
+                mock(AbstractPreferenceController.class);
         preferenceControllers.add(mockController1);
         preferenceControllers.add(mockController2);
         when(mockController1.isAvailable()).thenReturn(false);
@@ -149,7 +156,47 @@
         verify(mockController2).getPreferenceKey();
     }
 
-    public static class TestPreferenceController extends PreferenceController {
+    @Test
+    public void tintTileIcon_hasMetadata_shouldReturnIconTintableMetadata() {
+        final Tile tile = new Tile();
+        tile.icon = mock(Icon.class);
+        final Bundle metaData = new Bundle();
+        tile.metaData = metaData;
+
+        metaData.putBoolean(TileUtils.META_DATA_PREFERENCE_ICON_TINTABLE, false);
+        assertThat(mTestFragment.tintTileIcon(tile)).isFalse();
+
+        metaData.putBoolean(TileUtils.META_DATA_PREFERENCE_ICON_TINTABLE, true);
+        assertThat(mTestFragment.tintTileIcon(tile)).isTrue();
+    }
+
+    @Test
+    public void tintTileIcon_noIcon_shouldReturnFalse() {
+        final Tile tile = new Tile();
+        final Bundle metaData = new Bundle();
+        tile.metaData = metaData;
+
+        assertThat(mTestFragment.tintTileIcon(tile)).isFalse();
+    }
+
+    @Test
+    public void tintTileIcon_noMetadata_shouldReturnPackageNameCheck() {
+        final Tile tile = new Tile();
+        tile.icon = mock(Icon.class);
+        final Intent intent = new Intent();
+        tile.intent = intent;
+
+        intent.setComponent(new ComponentName(
+                ShadowApplication.getInstance().getApplicationContext().getPackageName(),
+                "TestClass"));
+        assertThat(mTestFragment.tintTileIcon(tile)).isFalse();
+
+        intent.setComponent(new ComponentName("OtherPackage", "TestClass"));
+        assertThat(mTestFragment.tintTileIcon(tile)).isTrue();
+    }
+
+    public static class TestPreferenceController extends AbstractPreferenceController
+            implements PreferenceControllerMixin {
 
         public TestPreferenceController(Context context) {
             super(context);
@@ -180,7 +227,7 @@
 
         private final PreferenceManager mPreferenceManager;
         private final Context mContext;
-        private final List<PreferenceController> mControllers;
+        private final List<AbstractPreferenceController> mControllers;
 
         public final PreferenceScreen mScreen;
 
@@ -221,7 +268,7 @@
         }
 
         @Override
-        protected List<PreferenceController> getPreferenceControllers(Context context) {
+        protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
             return mControllers;
         }
 
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
index 32657b8..f3ed57c 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
@@ -19,11 +19,12 @@
 import android.app.Activity;
 import android.support.v7.widget.LinearLayoutManager;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.conditional.ConditionManager;
 import com.android.settings.dashboard.conditional.FocusRecyclerView;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.drawer.CategoryKey;
+import com.android.settingslib.drawer.DashboardCategory;
 import com.android.settingslib.drawer.Tile;
 
 import org.junit.Before;
@@ -34,6 +35,8 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -57,6 +60,8 @@
     private LinearLayoutManager mLayoutManager;
     @Mock
     private ConditionManager mConditionManager;
+    @Mock
+    private SummaryLoader mSummaryLoader;
 
     private DashboardSummary mSummary;
 
@@ -70,12 +75,15 @@
         ReflectionHelpers.setField(mSummary, "mDashboard", mDashboard);
         ReflectionHelpers.setField(mSummary, "mLayoutManager", mLayoutManager);
         ReflectionHelpers.setField(mSummary, "mConditionManager", mConditionManager);
+        ReflectionHelpers.setField(mSummary, "mSummaryLoader", mSummaryLoader);
     }
 
     @Test
     public void updateCategoryAndSuggestion_shouldGetCategoryFromFeatureProvider() {
         doReturn(mock(Activity.class)).when(mSummary).getActivity();
         mSummary.updateCategoryAndSuggestion(null);
+
+        verify(mSummaryLoader).updateSummaryToCache(nullable(DashboardCategory.class));
         verify(mDashboardFeatureProvider).getTilesForCategory(CategoryKey.CATEGORY_HOMEPAGE);
     }
 
@@ -83,6 +91,7 @@
     public void onConditionChanged_PositionAtTop_ScrollToTop() {
         when(mLayoutManager.findFirstCompletelyVisibleItemPosition()).thenReturn(1);
         mSummary.onConditionsChanged();
+        mSummary.onConditionsChanged();
         verify(mDashboard).scrollToPosition(0);
     }
 
@@ -90,10 +99,24 @@
     public void onConditionChanged_PositionNotTop_RemainPosition() {
         when(mLayoutManager.findFirstCompletelyVisibleItemPosition()).thenReturn(2);
         mSummary.onConditionsChanged();
+        mSummary.onConditionsChanged();
         verify(mDashboard, never()).scrollToPosition(0);
     }
 
     @Test
+    public void onConditionChanged_firstCall_shouldIgnore() {
+        mSummary.onConditionsChanged();
+        verify(mAdapter, never()).setConditions(any());
+    }
+
+    @Test
+    public void onConditionChanged_secondCall_shouldSetConditionsOnAdapter() {
+        mSummary.onConditionsChanged();
+        mSummary.onConditionsChanged();
+        verify(mAdapter).setConditions(any());
+    }
+
+    @Test
     public void onCategoryChanged_noRebuildOnFirstCall() {
         doReturn(mock(Activity.class)).when(mSummary).getActivity();
         doNothing().when(mSummary).rebuildUI();
diff --git a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java b/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java
index b08d62e..146be9c 100644
--- a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java
@@ -17,13 +17,21 @@
 package com.android.settings.dashboard;
 
 import android.app.Activity;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import android.content.Context;
+import android.content.Intent;
+
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.drawer.DashboardCategory;
 import com.android.settingslib.drawer.Tile;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;
 
@@ -31,18 +39,27 @@
 import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SummaryLoaderTest {
+
     private static final String SUMMARY_1 = "summary1";
     private static final String SUMMARY_2 = "summary2";
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
     private SummaryLoader mSummaryLoader;
     private boolean mCallbackInvoked;
     private Tile mTile;
+    private FakeFeatureFactory mFeatureFactory;
 
     @Before
     public void SetUp() {
+        MockitoAnnotations.initMocks(this);
+        mFeatureFactory = FakeFeatureFactory.setupForTest(mContext);
+
         mTile = new Tile();
         mTile.summary = SUMMARY_1;
         mCallbackInvoked = false;
@@ -71,4 +88,23 @@
 
         assertThat(mCallbackInvoked).isTrue();
     }
+
+    @Test
+    public void testUpdateSummaryToCache_hasCache_shouldUpdate() {
+
+        final String testSummary = "test_summary";
+        final DashboardCategory category = new DashboardCategory();
+        final Tile tile = new Tile();
+        tile.key = "123";
+        tile.intent = new Intent();
+        category.addTile(tile);
+        when(mFeatureFactory.dashboardFeatureProvider.getDashboardKeyForTile(tile))
+                .thenReturn(tile.key);
+
+        mSummaryLoader.updateSummaryIfNeeded(tile, testSummary);
+        tile.summary = null;
+        mSummaryLoader.updateSummaryToCache(category);
+
+        assertThat(tile.summary).isEqualTo(testSummary);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
index df25a50..82bef2d 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
@@ -16,9 +16,9 @@
 
 package com.android.settings.dashboard.suggestions;
 
+
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
@@ -27,19 +27,24 @@
 import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
+import android.app.ActivityManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.hardware.fingerprint.FingerprintManager;
+import android.provider.Settings.Secure;
+import android.util.Pair;
 
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.Settings.AmbientDisplaySuggestionActivity;
 import com.android.settings.Settings.AmbientDisplayPickupSuggestionActivity;
+import com.android.settings.Settings.AmbientDisplaySuggestionActivity;
 import com.android.settings.Settings.DoubleTapPowerSuggestionActivity;
 import com.android.settings.Settings.DoubleTwistSuggestionActivity;
+import com.android.settings.Settings.NightDisplaySuggestionActivity;
 import com.android.settings.Settings.SwipeToNotificationSuggestionActivity;
 import com.android.settings.TestConfig;
 import com.android.settings.gestures.DoubleTapPowerSettings;
@@ -49,22 +54,31 @@
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settings.testutils.shadow.ShadowSecureSettings;
 import com.android.settingslib.drawer.Tile;
 import com.android.settingslib.suggestions.SuggestionParser;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+
+import java.time.LocalDateTime;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(
+    manifest = TestConfig.MANIFEST_PATH,
+    sdk = TestConfig.SDK_VERSION,
+    shadows = {ShadowSecureSettings.class, SettingsShadowResources.class}
+)
 public class SuggestionFeatureProviderImplTest {
 
     private static final String DOUBLE_TWIST_SENSOR_NAME = "double_twist_sensor_name";
@@ -77,11 +91,15 @@
     @Mock
     private Tile mSuggestion;
     @Mock
+    private ActivityManager mActivityManager;
+    @Mock
     private PackageManager mPackageManager;
     @Mock
     private FingerprintManager mFingerprintManager;
     @Mock
     private SharedPreferences mSharedPreferences;
+    @Captor
+    private ArgumentCaptor<Pair> mTaggedDataCaptor = ArgumentCaptor.forClass(Pair.class);
 
     private FakeFeatureFactory mFactory;
     private SuggestionFeatureProviderImpl mProvider;
@@ -96,6 +114,8 @@
         when((Object) mContext.getSystemService(FingerprintManager.class))
                 .thenReturn(mFingerprintManager);
         when(mContext.getApplicationContext()).thenReturn(RuntimeEnvironment.application);
+        when(mContext.getSystemService(Context.ACTIVITY_SERVICE)).thenReturn(mActivityManager);
+        when(mActivityManager.isLowRamDevice()).thenReturn(false);
 
         mSuggestion.intent = new Intent().setClassName("pkg", "cls");
         mSuggestion.category = "category";
@@ -104,7 +124,6 @@
     }
 
     @Test
-    @Config(shadows = SettingsShadowResources.class)
     public void isSuggestionCompleted_doubleTapPower_trueWhenNotAvailable() {
         SettingsShadowResources.overrideResource(
                 com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, false);
@@ -115,7 +134,6 @@
     }
 
     @Test
-    @Config(shadows = SettingsShadowResources.class)
     public void isSuggestionCompleted_doubleTapPower_falseWhenNotVisited() {
         SettingsShadowResources.overrideResource(
                 com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, true);
@@ -127,7 +145,6 @@
     }
 
     @Test
-    @Config(shadows = SettingsShadowResources.class)
     public void isSuggestionCompleted_doubleTapPower_trueWhenVisited() {
         SettingsShadowResources.overrideResource(
                 com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, true);
@@ -140,7 +157,6 @@
     }
 
     @Test
-    @Config(shadows = SettingsShadowResources.class)
     public void isSuggestionCompleted_doubleTwist_trueWhenNotAvailable() {
         SettingsShadowResources.overrideResource(
                 R.string.gesture_double_twist_sensor_name, "nonexistant name");
@@ -153,7 +169,6 @@
     }
 
     @Test
-    @Config(shadows = SettingsShadowResources.class)
     public void isSuggestionCompleted_ambientDisplay_falseWhenNotVisited() {
         SettingsShadowResources.overrideResource(
                 com.android.internal.R.string.config_dozeComponent, "foo");
@@ -167,7 +182,6 @@
     }
 
     @Test
-    @Config(shadows = SettingsShadowResources.class)
     public void isSuggestionCompleted_ambientDisplay_trueWhenVisited() {
         SettingsShadowResources.overrideResource(
                 com.android.internal.R.string.config_dozeComponent, "foo");
@@ -182,7 +196,6 @@
     }
 
     @Test
-    @Config(shadows = SettingsShadowResources.class)
     public void isSuggestionCompleted_ambientDisplayPickup_falseWhenNotVisited() {
         SettingsShadowResources.overrideResource(
                 com.android.internal.R.string.config_dozeComponent, "foo");
@@ -196,7 +209,6 @@
     }
 
     @Test
-    @Config(shadows = SettingsShadowResources.class)
     public void isSuggestionCompleted_ambientDisplayPickup_trueWhenVisited() {
         SettingsShadowResources.overrideResource(
                 com.android.internal.R.string.config_dozeComponent, "foo");
@@ -264,6 +276,20 @@
     }
 
     @Test
+    public void isSuggestionEnabled_isLowMemoryDevice_shouldReturnFalse() {
+        when(mActivityManager.isLowRamDevice()).thenReturn(true);
+
+        assertThat(mProvider.isSuggestionEnabled(mContext)).isFalse();
+    }
+
+    @Test
+    public void isSuggestionEnabled_isNotLowMemoryDevice_shouldReturnTrue() {
+        when(mActivityManager.isLowRamDevice()).thenReturn(false);
+
+        assertThat(mProvider.isSuggestionEnabled(mContext)).isTrue();
+    }
+
+    @Test
     public void dismissSuggestion_noParserOrSuggestion_noop() {
         mProvider.dismissSuggestion(mContext, null, null);
         mProvider.dismissSuggestion(mContext, mSuggestionParser, null);
@@ -309,14 +335,17 @@
 
     @Test
     public void dismissSuggestion_hasMoreDismissCount_shouldNotDisableComponent() {
-        when(mSuggestionParser.dismissSuggestion(any(Tile.class), anyBoolean()))
+        when(mSuggestionParser.dismissSuggestion(any(Tile.class)))
                 .thenReturn(false);
         mProvider.dismissSuggestion(mContext, mSuggestionParser, mSuggestion);
 
         verify(mFactory.metricsFeatureProvider).action(
                 eq(mContext),
                 eq(MetricsProto.MetricsEvent.ACTION_SETTINGS_DISMISS_SUGGESTION),
-                anyString());
+                anyString(),
+                mTaggedDataCaptor.capture());
+        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
         verify(mContext, never()).getPackageManager();
     }
 
@@ -329,7 +358,7 @@
 
     @Test
     public void dismissSuggestion_hasNoMoreDismissCount_shouldDisableComponent() {
-        when(mSuggestionParser.dismissSuggestion(any(Tile.class), anyBoolean()))
+        when(mSuggestionParser.dismissSuggestion(any(Tile.class)))
                 .thenReturn(true);
 
         mProvider.dismissSuggestion(mContext, mSuggestionParser, mSuggestion);
@@ -337,8 +366,10 @@
         verify(mFactory.metricsFeatureProvider).action(
                 eq(mContext),
                 eq(MetricsProto.MetricsEvent.ACTION_SETTINGS_DISMISS_SUGGESTION),
-                anyString());
-
+                anyString(),
+                mTaggedDataCaptor.capture());
+        assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
         verify(mContext.getPackageManager())
                 .setComponentEnabledSetting(mSuggestion.intent.getComponent(),
                         PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
@@ -365,4 +396,51 @@
 
         assertThat(suggestions).hasSize(3);
     }
+
+    @Test
+    public void hasUsedNightDisplay_returnsFalse_byDefault() {
+        assertThat(mProvider.hasUsedNightDisplay(mContext)).isFalse();
+    }
+
+    @Test
+    public void hasUsedNightDisplay_returnsTrue_ifPreviouslyActivatedAndManual() {
+        Secure.putString(mContext.getContentResolver(), Secure.NIGHT_DISPLAY_LAST_ACTIVATED_TIME,
+                LocalDateTime.now().toString());
+        Secure.putInt(mContext.getContentResolver(), Secure.NIGHT_DISPLAY_AUTO_MODE, 1);
+        assertThat(mProvider.hasUsedNightDisplay(mContext)).isTrue();
+    }
+
+    @Test
+    public void nightDisplaySuggestion_isCompleted_ifPreviouslyActivated() {
+        Secure.putString(mContext.getContentResolver(), Secure.NIGHT_DISPLAY_LAST_ACTIVATED_TIME,
+                LocalDateTime.now().toString());
+        final ComponentName componentName =
+                new ComponentName(mContext, NightDisplaySuggestionActivity.class);
+        assertThat(mProvider.isSuggestionCompleted(mContext, componentName)).isTrue();
+    }
+
+    @Test
+    public void nightDisplaySuggestion_isCompleted_ifNonManualMode() {
+        Secure.putInt(mContext.getContentResolver(), Secure.NIGHT_DISPLAY_AUTO_MODE, 1);
+        final ComponentName componentName =
+                new ComponentName(mContext, NightDisplaySuggestionActivity.class);
+        assertThat(mProvider.isSuggestionCompleted(mContext, componentName)).isTrue();
+    }
+
+    @Test
+    public void nightDisplaySuggestion_isCompleted_ifPreviouslyCleared() {
+        Secure.putString(mContext.getContentResolver(), Secure.NIGHT_DISPLAY_LAST_ACTIVATED_TIME,
+                null);
+        Secure.putInt(mContext.getContentResolver(), Secure.NIGHT_DISPLAY_AUTO_MODE, 1);
+        final ComponentName componentName =
+                new ComponentName(mContext, NightDisplaySuggestionActivity.class);
+        assertThat(mProvider.isSuggestionCompleted(mContext, componentName)).isTrue();
+    }
+
+    @Test
+    public void nightDisplaySuggestion_isNotCompleted_byDefault() {
+        final ComponentName componentName =
+                new ComponentName(mContext, NightDisplaySuggestionActivity.class);
+        assertThat(mProvider.isSuggestionCompleted(mContext, componentName)).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionLogHelperTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionLogHelperTest.java
new file mode 100644
index 0000000..8eb4273
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionLogHelperTest.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.dashboard.suggestions;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.util.Pair;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+
+import org.junit.Test;
+
+public class SuggestionLogHelperTest {
+
+    @Test
+    public void testGetSmartSuggestionEnabledTaggedData_disabled() {
+        assertThat(SuggestionLogHelper.getSuggestionTaggedData(false)).asList().containsExactly(
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
+    }
+
+    @Test
+    public void testGetSmartSuggestionEnabledTaggedData_enabled() {
+        assertThat(SuggestionLogHelper.getSuggestionTaggedData(true)).asList().containsExactly(
+                Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 1));
+    }
+}
+
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionsChecksTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionsChecksTest.java
index 028df05..59752c6 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionsChecksTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionsChecksTest.java
@@ -101,7 +101,6 @@
         assertThat(mSuggestionsChecks.isSuggestionComplete(tile)).isTrue();
     }
 
-
     @Test
     public void testFingerprintEnrollmentIntroductionIsCompleteWhenFingerprintNotSupported() {
         stubFingerprintSupported(false);
@@ -127,7 +126,7 @@
     }
 
     private Tile createFingerprintTile() {
-        Tile tile = new Tile();
+        final Tile tile = new Tile();
         tile.intent = new Intent();
         tile.intent.setComponent(new ComponentName(mContext,
                 Settings.FingerprintEnrollSuggestionActivity.class));
diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
index 05efa9f..2f2a685 100644
--- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
@@ -17,21 +17,33 @@
 package com.android.settings.datausage;
 
 
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
+import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
 import android.util.ArraySet;
 import android.view.View;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
 import com.android.settings.widget.EntityHeaderController;
-import com.android.settings.widget.EntityHeaderController.ActionType;
 import com.android.settingslib.AppItem;
 
 import org.junit.After;
@@ -45,16 +57,6 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
         shadows = ShadowEntityHeaderController.class)
@@ -96,7 +98,7 @@
 
         mFragment.onViewCreated(new View(RuntimeEnvironment.application), new Bundle());
 
-        verify(mHeaderController).setButtonActions(ActionType.ACTION_NONE, ActionType.ACTION_NONE);
+        verify(mHeaderController).setHasAppInfoLink(false);
     }
 
     @Test
@@ -119,6 +121,7 @@
         ShadowEntityHeaderController.setUseMock(mHeaderController);
         when(mHeaderController.setRecyclerView(any(), any())).thenReturn(mHeaderController);
         when(mHeaderController.setUid(fakeUserId)).thenReturn(mHeaderController);
+        when(mHeaderController.setHasAppInfoLink(anyBoolean())).thenReturn(mHeaderController);
 
         doReturn(mock(PreferenceManager.class, RETURNS_DEEP_STUBS))
                 .when(mFragment)
@@ -127,9 +130,24 @@
 
         mFragment.onViewCreated(new View(RuntimeEnvironment.application), new Bundle());
 
-        verify(mHeaderController)
-                .setButtonActions(ActionType.ACTION_APP_INFO, ActionType.ACTION_NONE);
-        verify(mHeaderController)
-                .setUid(fakeUserId);
+        verify(mHeaderController).setHasAppInfoLink(true);
+        verify(mHeaderController).setUid(fakeUserId);
+    }
+
+    @Test
+    public void changePreference_backgroundData_shouldUpdateUI() {
+        mFragment = spy(new AppDataUsage());
+        final AppItem appItem = new AppItem(123456789);
+        final SwitchPreference pref = mock(SwitchPreference.class);
+        final DataSaverBackend dataSaverBackend = mock(DataSaverBackend.class);
+        ReflectionHelpers.setField(mFragment, "mAppItem", appItem);
+        ReflectionHelpers.setField(mFragment, "mRestrictBackground", pref);
+        ReflectionHelpers.setField(mFragment, "mDataSaverBackend", dataSaverBackend);
+
+        doNothing().when(mFragment).updatePrefs();
+
+        mFragment.onPreferenceChange(pref, true /* value */);
+
+        verify(mFragment).updatePrefs();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/datausage/DataPlanSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataPlanSummaryPreferenceTest.java
new file mode 100644
index 0000000..a5dbf78
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/datausage/DataPlanSummaryPreferenceTest.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package com.android.settings.datausage;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settings.widget.DonutView;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                SettingsShadowResources.class,
+                SettingsShadowResources.SettingsShadowTheme.class
+        }
+)
+public final class DataPlanSummaryPreferenceTest {
+
+    private static final String TEST_PLAN_USAGE = "Test plan usage";
+    private static final String TEST_PLAN_NAME = "Test plan name";
+    private static final String TEST_PLAN_DESCRIPTION = "Test plan description";
+    private static final int PLAN_USAGE_TEXT_COLOR = Color.parseColor("#FF5C94F1");
+    private static final int METER_BACKGROUND_COLOR = Color.parseColor("#FFDBDCDC");
+    private static final int METER_CONSUMED_COLOR = Color.parseColor("#FF5C94F1");
+
+    private DataPlanSummaryPreference mPreference;
+    private PreferenceViewHolder mHolder;
+
+    @Before
+    public void setUp() {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.string.config_headlineFontFamily, "");
+        Context context = RuntimeEnvironment.application;
+        mPreference = new DataPlanSummaryPreference(context);
+        LayoutInflater inflater = LayoutInflater.from(context);
+        View view = inflater.inflate(mPreference.getLayoutResource(),
+                new LinearLayout(context), false);
+        mHolder = PreferenceViewHolder.createInstanceForTests(view);
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
+    @Test
+    public void shouldRender_withoutData() {
+        mPreference.onBindViewHolder(mHolder);
+
+        TextView planUsageTextView = (TextView) mHolder.findViewById(android.R.id.title);
+        assertThat(planUsageTextView.getText().toString()).isEmpty();
+        TextView planNameTextView = (TextView) mHolder.findViewById(android.R.id.text1);
+        assertThat(planNameTextView.getText().toString()).isEmpty();
+        TextView planDescriptionTextView = (TextView) mHolder.findViewById(android.R.id.text2);
+        assertThat(planDescriptionTextView.getText().toString()).isEmpty();
+    }
+
+    @Test
+    public void shouldRender_withData() {
+        mPreference.setTitle(TEST_PLAN_USAGE);
+        mPreference.setUsageTextColor(PLAN_USAGE_TEXT_COLOR);
+        mPreference.setName(TEST_PLAN_NAME);
+        mPreference.setDescription(TEST_PLAN_DESCRIPTION);
+        mPreference.setPercentageUsage(0.25D);
+        mPreference.setMeterBackgroundColor(METER_BACKGROUND_COLOR);
+        mPreference.setMeterConsumedColor(METER_CONSUMED_COLOR);
+
+        mPreference.onBindViewHolder(mHolder);
+
+        TextView planUsageTextView = (TextView) mHolder.findViewById(android.R.id.title);
+        assertThat(planUsageTextView.getTextColors().getDefaultColor())
+                .isEqualTo(PLAN_USAGE_TEXT_COLOR);
+        assertThat(planUsageTextView.getText()).isEqualTo(TEST_PLAN_USAGE);
+
+        TextView planNameTextView = (TextView) mHolder.findViewById(android.R.id.text1);
+        assertThat(planNameTextView.getText()).isEqualTo(TEST_PLAN_NAME);
+
+        TextView planDescriptionTextView = (TextView) mHolder.findViewById(android.R.id.text2);
+        assertThat(planDescriptionTextView.getText()).isEqualTo(TEST_PLAN_DESCRIPTION);
+
+        DonutView donutView = (DonutView) mHolder.findViewById(R.id.donut);
+        assertThat(donutView.getMeterBackgroundColor()).isEqualTo(METER_BACKGROUND_COLOR);
+        assertThat(donutView.getMeterConsumedColor()).isEqualTo(METER_CONSUMED_COLOR);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/datausage/DataPlanUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataPlanUsageSummaryTest.java
new file mode 100644
index 0000000..30c7736
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/datausage/DataPlanUsageSummaryTest.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.datausage;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkPolicy;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.XmlTestUtils;
+import com.android.settings.testutils.shadow.ShadowConnectivityManager;
+import com.android.settings.testutils.shadow.ShadowDataUsageUtils;
+import com.android.settingslib.NetworkPolicyEditor;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class DataPlanUsageSummaryTest {
+    @Mock
+    private ConnectivityManager mManager;
+
+    private Context mContext;
+    private DataPlanUsageSummary mDataUsageSummary;
+    private NetworkPolicyEditor mPolicyEditor;
+    private WifiConfiguration mWifiConfiguration;
+    private NetworkPolicy mNetworkPolicy;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowContext = ShadowApplication.getInstance();
+        shadowContext.setSystemService(Context.CONNECTIVITY_SERVICE, mManager);
+        mContext = shadowContext.getApplicationContext();
+        when(mManager.isNetworkSupported(anyInt())).thenReturn(true);
+    }
+
+    @Test
+    public void testUpdateNetworkRestrictionSummary_shouldSetSummary() {
+        mDataUsageSummary = spy(new DataPlanUsageSummary());
+        NetworkRestrictionsPreference preference = mock(NetworkRestrictionsPreference.class);
+        mPolicyEditor = mock(NetworkPolicyEditor.class);
+        WifiManager wifiManager = mock(WifiManager.class);
+        ReflectionHelpers.setField(mDataUsageSummary, "mPolicyEditor", mPolicyEditor);
+        ReflectionHelpers.setField(mDataUsageSummary, "mWifiManager", wifiManager);
+        when(wifiManager.getConfiguredNetworks()).thenReturn(new ArrayList<>());
+        doReturn(mContext.getResources()).when(mDataUsageSummary).getResources();
+
+        mDataUsageSummary.updateNetworkRestrictionSummary(preference);
+
+        verify(preference).setSummary(mContext.getResources().getQuantityString(
+                R.plurals.network_restrictions_summary, 0, 0));
+    }
+
+    @Test
+    public void testIsMetered_noSsid_shouldReturnFalse() {
+        initTest();
+
+        assertThat(mDataUsageSummary.isMetered(mWifiConfiguration)).isFalse();
+    }
+
+    @Test
+    public void testIsMetered_noNetworkPolicy_shouldReturnFalse() {
+        initTest();
+        mWifiConfiguration.SSID = "network1";
+        doReturn(null).when(mPolicyEditor).getPolicyMaybeUnquoted(any());
+
+        assertThat(mDataUsageSummary.isMetered(mWifiConfiguration)).isFalse();
+    }
+
+    @Test
+    public void testIsMetered_policyHasLimit_shouldReturnTrue() {
+        initTest();
+        mWifiConfiguration.SSID = "network1";
+        mNetworkPolicy = mock(NetworkPolicy.class);
+        mNetworkPolicy.limitBytes = 100;
+        doReturn(mNetworkPolicy).when(mPolicyEditor).getPolicyMaybeUnquoted(any());
+
+        assertThat(mDataUsageSummary.isMetered(mWifiConfiguration)).isTrue();
+    }
+
+    @Test
+    public void testIsMetered_noPolicyLimit_shouldReturnMeteredValue() {
+        initTest();
+        mWifiConfiguration.SSID = "network1";
+        mNetworkPolicy = mock(NetworkPolicy.class);
+        mNetworkPolicy.limitBytes = NetworkPolicy.LIMIT_DISABLED;
+        doReturn(mNetworkPolicy).when(mPolicyEditor).getPolicyMaybeUnquoted(any());
+
+        mNetworkPolicy.metered = true;
+        assertThat(mDataUsageSummary.isMetered(mWifiConfiguration)).isTrue();
+
+        mNetworkPolicy.metered = false;
+        assertThat(mDataUsageSummary.isMetered(mWifiConfiguration)).isFalse();
+    }
+
+    @Test
+    @Config(shadows = ShadowDataUsageUtils.class)
+    public void testNonIndexableKeys_existInXmlLayout() {
+        final Context context = RuntimeEnvironment.application;
+        ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true;
+        ShadowDataUsageUtils.IS_MOBILE_DATA_SUPPORTED = true;
+        final List<String> niks = DataPlanUsageSummary.SEARCH_INDEX_DATA_PROVIDER
+                .getNonIndexableKeys(context);
+        final List<String> keys = new ArrayList<>();
+
+        keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.data_usage_wifi));
+        keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.data_usage));
+        keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context,
+                R.xml.data_plan_usage_cell_data_preference_screen));
+
+        assertThat(keys).containsAllIn(niks);
+    }
+
+    @Test
+    @Config(shadows = ShadowDataUsageUtils.class)
+    public void testNonIndexableKeys_hasMobileData_hasWifi_allNonIndexableKeysAdded() {
+        ShadowDataUsageUtils.IS_WIFI_SUPPORTED = false;
+        ShadowDataUsageUtils.IS_MOBILE_DATA_SUPPORTED = false;
+        List<String> keys = DataPlanUsageSummary.SEARCH_INDEX_DATA_PROVIDER
+                .getNonIndexableKeys(mContext);
+
+        // Mobile data keys
+        assertThat(keys).contains(DataPlanUsageSummary.KEY_MOBILE_USAGE_TITLE);
+        assertThat(keys).contains(DataPlanUsageSummary.KEY_MOBILE_DATA_USAGE_TOGGLE);
+
+        // Wifi keys
+        assertThat(keys).contains(DataPlanUsageSummary.KEY_WIFI_DATA_USAGE);
+        assertThat(keys).contains(DataPlanUsageSummary.KEY_NETWORK_RESTRICTIONS);
+        assertThat(keys).contains(DataPlanUsageSummary.KEY_WIFI_USAGE_TITLE);
+    }
+
+    @Test
+    @Config(shadows = ShadowDataUsageUtils.class)
+    public void testNonIndexableKeys_noMobile_noWifi_limitedNonIndexableKeys() {
+        ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true;
+        ShadowDataUsageUtils.IS_MOBILE_DATA_SUPPORTED = true;
+        List<String> keys = DataPlanUsageSummary.SEARCH_INDEX_DATA_PROVIDER
+                .getNonIndexableKeys(mContext);
+
+        assertThat(keys).containsExactly(DataPlanUsageSummary.KEY_WIFI_USAGE_TITLE);
+    }
+
+    private void initTest() {
+        mDataUsageSummary = new DataPlanUsageSummary();
+        mPolicyEditor = mock(NetworkPolicyEditor.class);
+        ReflectionHelpers.setField(mDataUsageSummary, "mPolicyEditor", mPolicyEditor);
+        mWifiConfiguration = mock(WifiConfiguration.class);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/datausage/DataPlansSyncTimePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataPlansSyncTimePreferenceTest.java
new file mode 100644
index 0000000..ba2d5f1
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/datausage/DataPlansSyncTimePreferenceTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.datausage;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public final class DataPlansSyncTimePreferenceTest {
+    private static final String SYNC_TIME = "Today 12:24pm";
+
+    private Preference mPreference;
+    private PreferenceViewHolder mHolder;
+
+    @Before
+    public void setUp() {
+        Context context = RuntimeEnvironment.application;
+        mPreference = new Preference(context);
+        mPreference.setLayoutResource(R.layout.data_plans_sync_time_preference);
+
+        LayoutInflater inflater = LayoutInflater.from(context);
+        View view = inflater.inflate(mPreference.getLayoutResource(),
+                new LinearLayout(context), false);
+        mHolder = PreferenceViewHolder.createInstanceForTests(view);
+    }
+
+    @Test
+    public void shouldRender_withData() {
+        mPreference.setTitle(SYNC_TIME);
+
+        mPreference.onBindViewHolder(mHolder);
+
+        TextView syncTimeTextView = (TextView) mHolder.findViewById(android.R.id.title);
+        assertThat(syncTimeTextView.getText()).isEqualTo(SYNC_TIME);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
index e4ad5b5..431796a 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
@@ -16,20 +16,26 @@
 
 package com.android.settings.datausage;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.net.ConnectivityManager;
-import android.net.NetworkPolicy;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
-
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settings.testutils.shadow.ShadowConnectivityManager;
-import com.android.settings.testutils.shadow.ShadowDataUsageSummary;
 import com.android.settingslib.NetworkPolicyEditor;
-
+import java.util.ArrayList;
+import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -40,18 +46,6 @@
 import org.robolectric.shadows.ShadowApplication;
 import org.robolectric.util.ReflectionHelpers;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DataUsageSummaryTest {
@@ -73,12 +67,6 @@
     }
 
     @Test
-    public void testMobileDataStatus() {
-        boolean hasMobileData = DataUsageSummary.hasMobileData(mContext);
-        assertThat(hasMobileData).isTrue();
-    }
-
-    @Test
     public void testUpdateNetworkRestrictionSummary_shouldSetSummary() {
         final DataUsageSummary dataUsageSummary = spy(new DataUsageSummary());
         final NetworkRestrictionsPreference preference = mock(NetworkRestrictionsPreference.class);
@@ -94,106 +82,4 @@
         verify(preference).setSummary(mContext.getResources().getQuantityString(
             R.plurals.network_restrictions_summary, 0, 0));
     }
-
-    @Test
-    public void testIsMetered_noSsid_shouldReturnFalse() {
-        final DataUsageSummary dataUsageSummary = new DataUsageSummary();
-        final NetworkPolicyEditor policyEditor = mock(NetworkPolicyEditor.class);
-        ReflectionHelpers.setField(dataUsageSummary, "mPolicyEditor", policyEditor);
-        WifiConfiguration config = mock(WifiConfiguration.class);
-
-        assertThat(dataUsageSummary.isMetered(config)).isFalse();
-    }
-
-    @Test
-    public void testIsMetered_noNetworkPolicy_shouldReturnFalse() {
-        final DataUsageSummary dataUsageSummary = new DataUsageSummary();
-        final NetworkPolicyEditor policyEditor = mock(NetworkPolicyEditor.class);
-        ReflectionHelpers.setField(dataUsageSummary, "mPolicyEditor", policyEditor);
-        WifiConfiguration config = mock(WifiConfiguration.class);
-        config.SSID = "network1";
-        doReturn(null).when(policyEditor).getPolicyMaybeUnquoted(any());
-
-        assertThat(dataUsageSummary.isMetered(config)).isFalse();
-    }
-
-    @Test
-    public void testIsMetered_policyHasLimit_shouldReturnTrue() {
-        final DataUsageSummary dataUsageSummary = new DataUsageSummary();
-        final NetworkPolicyEditor policyEditor = mock(NetworkPolicyEditor.class);
-        ReflectionHelpers.setField(dataUsageSummary, "mPolicyEditor", policyEditor);
-        WifiConfiguration config = mock(WifiConfiguration.class);
-        config.SSID = "network1";
-        NetworkPolicy policy = mock(NetworkPolicy.class);
-        policy.limitBytes = 100;
-        doReturn(policy).when(policyEditor).getPolicyMaybeUnquoted(any());
-
-        assertThat(dataUsageSummary.isMetered(config)).isTrue();
-    }
-
-    @Test
-    public void testIsMetered_noPolicyLimit_shouldReturnMeteredValue() {
-        final DataUsageSummary dataUsageSummary = new DataUsageSummary();
-        final NetworkPolicyEditor policyEditor = mock(NetworkPolicyEditor.class);
-        ReflectionHelpers.setField(dataUsageSummary, "mPolicyEditor", policyEditor);
-        WifiConfiguration config = mock(WifiConfiguration.class);
-        config.SSID = "network1";
-        NetworkPolicy policy = mock(NetworkPolicy.class);
-        policy.limitBytes = NetworkPolicy.LIMIT_DISABLED;
-        doReturn(policy).when(policyEditor).getPolicyMaybeUnquoted(any());
-
-        policy.metered = true;
-        assertThat(dataUsageSummary.isMetered(config)).isTrue();
-
-        policy.metered = false;
-        assertThat(dataUsageSummary.isMetered(config)).isFalse();
-    }
-
-    @Test
-    @Config(shadows = ShadowDataUsageSummary.class)
-    public void testNonIndexableKeys_existInXmlLayout() {
-        final Context context = RuntimeEnvironment.application;
-        ShadowDataUsageSummary.IS_WIFI_SUPPORTED = true;
-        ShadowDataUsageSummary.IS_MOBILE_DATA_SUPPORTED = true;
-        final List<String> niks = DataUsageSummary.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(context);
-        final List<String> keys = new ArrayList<>();
-
-        keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.data_usage_wifi));
-        keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.data_usage));
-        keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.data_usage_cellular));
-
-        assertThat(keys).containsAllIn(niks);
-    }
-
-    @Test
-    @Config(shadows = ShadowDataUsageSummary.class)
-    public void testNonIndexableKeys_hasMobileData_hasWifi_allNonIndexableKeysAdded() {
-        ShadowDataUsageSummary.IS_WIFI_SUPPORTED = false;
-        ShadowDataUsageSummary.IS_MOBILE_DATA_SUPPORTED = false;
-        List<String> keys = DataUsageSummary.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(mContext);
-
-        // Mobile data keys
-        assertThat(keys).contains(DataUsageSummary.KEY_MOBILE_CATEGORY);
-        assertThat(keys).contains(DataUsageSummary.KEY_MOBILE_DATA_USAGE_TOGGLE);
-        assertThat(keys).contains(DataUsageSummary.KEY_MOBILE_DATA_USAGE);
-        assertThat(keys).contains(DataUsageSummary.KEY_MOBILE_BILLING_CYCLE);
-
-        // Wifi keys
-        assertThat(keys).contains(DataUsageSummary.KEY_WIFI_DATA_USAGE);
-        assertThat(keys).contains(DataUsageSummary.KEY_NETWORK_RESTRICTIONS);
-        assertThat(keys).contains(DataUsageSummary.KEY_WIFI_USAGE_TITLE);
-    }
-
-    @Test
-    @Config(shadows = ShadowDataUsageSummary.class)
-    public void testNonIndexableKeys_noMobile_noWifi_limitedNonIndexableKeys() {
-        ShadowDataUsageSummary.IS_WIFI_SUPPORTED = true;
-        ShadowDataUsageSummary.IS_MOBILE_DATA_SUPPORTED = true;
-        List<String> keys = DataUsageSummary.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(mContext);
-
-        assertThat(keys).containsExactly(DataUsageSummary.KEY_WIFI_USAGE_TITLE);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java
new file mode 100644
index 0000000..cdcd3a9
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.datausage;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public final class DataUsageUtilsTest {
+    @Mock private ConnectivityManager mManager;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowContext = ShadowApplication.getInstance();
+        mContext = shadowContext.getApplicationContext();
+        shadowContext.setSystemService(Context.CONNECTIVITY_SERVICE, mManager);
+    }
+
+    @Test
+    public void mobileDataStatus_whenNetworkIsSupported() {
+        when(mManager.isNetworkSupported(anyInt())).thenReturn(true);
+        boolean hasMobileData = DataUsageUtils.hasMobileData(mContext);
+        assertThat(hasMobileData).isTrue();
+    }
+
+    @Test
+    public void mobileDataStatus_whenNetworkIsNotSupported() {
+        when(mManager.isNetworkSupported(anyInt())).thenReturn(false);
+        boolean hasMobileData = DataUsageUtils.hasMobileData(mContext);
+        assertThat(hasMobileData).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/datausage/ManageDataPlansPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/ManageDataPlansPreferenceTest.java
new file mode 100644
index 0000000..6eff393
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/datausage/ManageDataPlansPreferenceTest.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.datausage;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public final class ManageDataPlansPreferenceTest {
+    private Preference mPreference;
+    private PreferenceViewHolder mHolder;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mPreference = new Preference(mContext);
+        mPreference.setLayoutResource(R.layout.manage_data_plans_preference);
+        LayoutInflater inflater = LayoutInflater.from(mContext);
+        View view = inflater.inflate(mPreference.getLayoutResource(),
+                new LinearLayout(mContext), false);
+        mHolder = PreferenceViewHolder.createInstanceForTests(view);
+    }
+
+    @Test
+    public void shouldRender_withData() {
+        mPreference.onBindViewHolder(mHolder);
+        Button managePlanButton = (Button) mHolder.findViewById(R.id.manage_data_plans);
+        assertThat(managePlanButton.getText())
+                .isEqualTo(mContext.getString(R.string.data_plan_usage_manage_plans_button_text));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java
new file mode 100644
index 0000000..dd438ff
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java
@@ -0,0 +1,83 @@
+package com.android.settings.deletionhelper;
+
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AutomaticStorageManagerDescriptionPreferenceControllerTest {
+    @Mock private PreferenceScreen mScreen;
+    @Mock private Preference mPreference;
+    private AutomaticStorageManagerDescriptionPreferenceController mController;
+    private Context mContext = RuntimeEnvironment.application;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mController = new AutomaticStorageManagerDescriptionPreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
+        when(mPreference.getContext()).thenReturn(mContext);
+    }
+
+    @Test
+    public void displayPreference_asmDisabled_shouldHaveDescription() {
+        mController.displayPreference(mScreen);
+
+        verify(mPreference).setSummary(eq(R.string.automatic_storage_manager_text));
+    }
+
+    @Test
+    public void displayPreference_asmEnabledButUnused_shouldHaveDescription() {
+        Settings.Secure.putInt(
+                mContext.getContentResolver(),
+                Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED,
+                1);
+
+        mController.displayPreference(mScreen);
+
+        verify(mPreference).setSummary(eq(R.string.automatic_storage_manager_text));
+    }
+
+    @Ignore("Robolectric doesn't do locale switching for date localization -- yet.")
+    @Test
+    @Config(qualifiers = "en")
+    public void displayPreference_asmEnabledAndUsed_shouldHaveDescriptionFilledOut() {
+        Settings.Secure.putInt(
+                mContext.getContentResolver(),
+                Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED,
+                1);
+        Settings.Secure.putLong(
+                mContext.getContentResolver(),
+                Settings.Secure.AUTOMATIC_STORAGE_MANAGER_BYTES_CLEARED,
+                10);
+        Settings.Secure.putLong(
+                mContext.getContentResolver(),
+                Settings.Secure.AUTOMATIC_STORAGE_MANAGER_LAST_RUN,
+                43200000); // January 1, 1970 12:00:00 PM to avoid timezone issues.
+
+        mController.displayPreference(mScreen);
+
+        verify(mPreference)
+                .setSummary(eq("10.00B total made available\n\nLast ran on January 1, 1970"));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerTest.java
new file mode 100644
index 0000000..f5ef38f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerTest.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+import org.robolectric.RuntimeEnvironment;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = {SettingsShadowSystemProperties.class})
+public class CameraHalHdrplusPreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private SwitchPreference mPreference;
+
+    static final String USERDEBUG_BUILD = "userdebug";
+
+    private CameraHalHdrplusPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mController = new CameraHalHdrplusPreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void isAvailable_withConfigNoShow_shouldReturnFalse() {
+        when(mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus))
+                .thenReturn(false);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void displayPreference_cameraHalHdrplusEnabled_shouldCheckedPreference() {
+        when(mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus))
+                .thenReturn(true);
+
+        SettingsShadowSystemProperties.set(
+                CameraHalHdrplusPreferenceController.PROPERTY_CAMERA_HAL_HDRPLUS,
+                CameraHalHdrplusPreferenceController.ENABLED);
+        SettingsShadowSystemProperties.set(
+                CameraHalHdrplusPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
+
+        mController.displayPreference(mScreen);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void displayPreference_cameraHalHdrplusEnabled_shouldUncheckedPreference() {
+        when(mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus))
+                .thenReturn(true);
+
+        SettingsShadowSystemProperties.set(
+                CameraHalHdrplusPreferenceController.PROPERTY_CAMERA_HAL_HDRPLUS,
+                CameraHalHdrplusPreferenceController.DISABLED);
+        SettingsShadowSystemProperties.set(
+                CameraHalHdrplusPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
+
+        mController.displayPreference(mScreen);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_preferenceChecked_shouldEnableCameraHalHdrplus() {
+        when(mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus))
+                .thenReturn(true);
+
+        when(mPreference.isChecked()).thenReturn(true);
+
+        when(mContext.getResources().getString(R.string.camera_hal_hdrplus_toast)).thenReturn(
+            RuntimeEnvironment.application.getString(R.string.camera_hal_hdrplus_toast));
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(CameraHalHdrplusPreferenceController.ENABLED.equals(
+            SystemProperties.get(
+                        CameraHalHdrplusPreferenceController.PROPERTY_CAMERA_HAL_HDRPLUS,
+                        CameraHalHdrplusPreferenceController.DISABLED))).isTrue();
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_preferenceUnchecked_shouldDisableCameraHalHdrplus() {
+        when(mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus))
+                .thenReturn(true);
+
+        when(mPreference.isChecked()).thenReturn(false);
+
+        when(mContext.getResources().getString(R.string.camera_hal_hdrplus_toast)).thenReturn(
+                RuntimeEnvironment.application.getString(R.string.camera_hal_hdrplus_toast));
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(CameraHalHdrplusPreferenceController.DISABLED.equals(
+                SystemProperties.get(
+                        CameraHalHdrplusPreferenceController.PROPERTY_CAMERA_HAL_HDRPLUS,
+                        CameraHalHdrplusPreferenceController.DISABLED))).isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java
new file mode 100644
index 0000000..7aab99d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+import org.robolectric.RuntimeEnvironment;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = {SettingsShadowSystemProperties.class})
+public class CameraLaserSensorPreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private SwitchPreference mPreference;
+
+    static final String USERDEBUG_BUILD = "userdebug";
+    static final String ENG_BUILD = "eng";
+    static final String USER_BUILD = "user";
+
+    private CameraLaserSensorPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mController = new CameraLaserSensorPreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void isAvailable_withConfigNoShow_shouldReturnFalse() {
+        when(mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor))
+                .thenReturn(false);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_withUserdebugBuild_shouldReturnTrue() {
+        when(mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor))
+                .thenReturn(true);
+
+        SettingsShadowSystemProperties.set(
+                CameraLaserSensorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_withEngBuild_shouldReturnTrue() {
+        when(mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor))
+                .thenReturn(true);
+
+        SettingsShadowSystemProperties.set(
+                CameraLaserSensorPreferenceController.BUILD_TYPE, ENG_BUILD);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_withUserBuild_shouldReturnFalse() {
+        when(mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor))
+                .thenReturn(true);
+
+        SettingsShadowSystemProperties.set(
+                CameraLaserSensorPreferenceController.BUILD_TYPE, USER_BUILD);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void displayPreference_cameraLaserSensorEnabled_shouldCheckedPreference() {
+        when(mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor))
+                .thenReturn(true);
+
+        SettingsShadowSystemProperties.set(
+                CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR,
+                Integer.toString(CameraLaserSensorPreferenceController.ENABLED));
+        SettingsShadowSystemProperties.set(
+                CameraLaserSensorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
+
+        mController.displayPreference(mScreen);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void displayPreference_cameraLaserSensorEnabled_shouldUncheckedPreference() {
+        when(mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor))
+                .thenReturn(true);
+
+        SettingsShadowSystemProperties.set(
+                CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR,
+                Integer.toString(CameraLaserSensorPreferenceController.DISABLED));
+        SettingsShadowSystemProperties.set(
+                CameraLaserSensorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
+
+        mController.displayPreference(mScreen);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_preferenceChecked_shouldEnableCameraLaserSensor() {
+        when(mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor))
+                .thenReturn(true);
+
+        when(mPreference.isChecked()).thenReturn(true);
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(Integer.toString(CameraLaserSensorPreferenceController.ENABLED).equals(
+            SystemProperties.get(
+                        CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR,
+                        Integer.toString(CameraLaserSensorPreferenceController.ENABLED)))).isTrue();
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_preferenceUnchecked_shouldDisableCameraLaserSensor() {
+        when(mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor))
+                .thenReturn(true);
+
+        when(mPreference.isChecked()).thenReturn(false);
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(Integer.toString(CameraLaserSensorPreferenceController.DISABLED).equals(
+                SystemProperties.get(
+                        CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR,
+                        Integer.toString(CameraLaserSensorPreferenceController.ENABLED)))).isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsEnablerTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsEnablerTest.java
index c937841..223f98d 100644
--- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsEnablerTest.java
@@ -16,12 +16,14 @@
 
 package com.android.settings.development;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.provider.Settings;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -33,8 +35,6 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
-import static com.google.common.truth.Truth.assertThat;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DevelopmentSettingsEnablerTest {
@@ -53,6 +53,16 @@
     }
 
     @Test
+    public void constructor_shouldInitEnabledState() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
+
+        mEnabler = new DevelopmentSettingsEnabler(mContext, null);
+
+        assertThat(mEnabler.getLastEnabledState()).isTrue();
+    }
+
+    @Test
     public void onResume_shouldReadStateFromSettingProvider() {
         Settings.Global.putInt(mContext.getContentResolver(),
                 Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java
new file mode 100644
index 0000000..a53b836
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowUtils;
+import com.android.settings.widget.SwitchBar;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.ArrayList;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                ShadowUtils.class
+        })
+public class DevelopmentSwitchBarControllerTest {
+
+    @Mock
+    private DevelopmentSettings mSettings;
+    private Lifecycle mLifecycle;
+    private SwitchBar mSwitchBar;
+    private DevelopmentSwitchBarController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mLifecycle = new Lifecycle();
+        mSwitchBar = new SwitchBar(RuntimeEnvironment.application);
+    }
+
+    @After
+    public void tearDown() {
+        ShadowUtils.reset();
+    }
+
+    @Test
+    public void runThroughLifecycle_isMonkeyRun_shouldNotRegisterListener() {
+        ShadowUtils.setIsUserAMonkey(true);
+        mController = new DevelopmentSwitchBarController(mSettings, mSwitchBar,
+                true /* isAvailable */, mLifecycle);
+        final ArrayList<SwitchBar.OnSwitchChangeListener> listeners =
+                ReflectionHelpers.getField(mSwitchBar, "mSwitchChangeListeners");
+
+        mLifecycle.onStart();
+        assertThat(listeners).doesNotContain(mSettings);
+
+        mLifecycle.onStop();
+        assertThat(listeners).doesNotContain(mSettings);
+    }
+
+    @Test
+    public void runThroughLifecycle_isNotMonkeyRun_shouldRegisterAndRemoveListener() {
+        ShadowUtils.setIsUserAMonkey(false);
+        mController = new DevelopmentSwitchBarController(mSettings, mSwitchBar,
+                true /* isAvailable */, mLifecycle);
+        final ArrayList<SwitchBar.OnSwitchChangeListener> listeners =
+                ReflectionHelpers.getField(mSwitchBar, "mSwitchChangeListeners");
+
+        mLifecycle.onStart();
+        assertThat(listeners).contains(mSettings);
+
+        mLifecycle.onStop();
+        assertThat(listeners).doesNotContain(mSettings);
+    }
+
+    @Test
+    public void buildController_unavailable_shouldDisableSwitchBar() {
+        ShadowUtils.setIsUserAMonkey(false);
+        mController = new DevelopmentSwitchBarController(mSettings, mSwitchBar,
+                false /* isAvailable */, mLifecycle);
+
+        assertThat(mSwitchBar.isEnabled()).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
index 7601f8a..6dc7bbe 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
@@ -16,33 +16,6 @@
 
 package com.android.settings.deviceinfo;
 
-import android.app.Activity;
-import android.app.Fragment;
-import android.content.Context;
-import android.os.Build;
-import android.os.UserManager;
-import android.provider.Settings;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.development.DevelopmentSettings;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.search.DatabaseIndexingManager;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
 import static org.mockito.Matchers.any;
@@ -53,8 +26,41 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import android.app.Activity;
+import android.app.Fragment;
+import android.content.Context;
+import android.os.Build;
+import android.os.UserManager;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.BidiFormatter;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.TestConfig;
+import com.android.settings.development.DevelopmentSettings;
+import com.android.settings.search.DatabaseIndexingManager;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowUtils;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                ShadowUtils.class
+        })
 public class BuildNumberPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -76,8 +82,7 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
+        mFactory = FakeFeatureFactory.setupForTest(mContext);
         mLifecycle = new Lifecycle();
         when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
         mController = new BuildNumberPreferenceController(
@@ -87,11 +92,17 @@
         mPreference.setKey(mController.getPreferenceKey());
     }
 
+    @After
+    public void tearDown() {
+        ShadowUtils.reset();
+    }
+
     @Test
     public void displayPref_shouldAlwaysDisplay() {
         mController.displayPreference(mScreen);
 
-        verify(mScreen.findPreference(mController.getPreferenceKey())).setSummary(Build.DISPLAY);
+        verify(mScreen.findPreference(mController.getPreferenceKey()))
+                .setSummary(BidiFormatter.getInstance().unicodeWrap(Build.DISPLAY));
         verify(mScreen, never()).removePreference(any(Preference.class));
     }
 
@@ -126,6 +137,18 @@
     }
 
     @Test
+    public void handlePrefTreeClick_isMonkeyRun_doNothing() {
+        final Context context = spy(RuntimeEnvironment.application);
+        Settings.Global.putInt(context.getContentResolver(),
+                Settings.Global.DEVICE_PROVISIONED, 1);
+        ShadowUtils.setIsUserAMonkey(true);
+        mController = new BuildNumberPreferenceController(
+                context, mActivity, mFragment, mLifecycle);
+
+        assertThat(mController.handlePreferenceTreeClick(mPreference)).isFalse();
+    }
+
+    @Test
     public void handlePrefTreeClick_userHasRestriction_doNothing() {
         final Context context = spy(RuntimeEnvironment.application);
         Settings.Global.putInt(context.getContentResolver(),
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java
index b2d259a..b1296e5 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java
@@ -18,16 +18,27 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import android.app.Activity;
 import android.os.storage.StorageManager;
 import android.provider.SearchIndexableResource;
+import android.util.SparseArray;
+import android.view.View;
 
+import com.android.settings.deviceinfo.storage.CachedStorageValuesHelper;
+import com.android.settings.deviceinfo.storage.StorageAsyncLoader;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settingslib.deviceinfo.PrivateStorageInfo;
 import com.android.settingslib.drawer.CategoryKey;
+import android.support.v7.widget.RecyclerView;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -69,6 +80,128 @@
     }
 
     @Test
+    public void test_cacheProviderProvidesValuesIfBothCached() {
+        CachedStorageValuesHelper helper = mock(CachedStorageValuesHelper.class);
+        PrivateStorageInfo info = new PrivateStorageInfo(0, 0);
+        when(helper.getCachedPrivateStorageInfo()).thenReturn(info);
+        SparseArray<StorageAsyncLoader.AppsStorageResult> result = new SparseArray<>();
+        when(helper.getCachedAppsStorageResult()).thenReturn(result);
+
+        mFragment.setCachedStorageValuesHelper(helper);
+        mFragment.initializeCachedValues();
+
+        assertThat(mFragment.getPrivateStorageInfo()).isEqualTo(info);
+        assertThat(mFragment.getAppsStorageResult()).isEqualTo(result);
+    }
+
+    @Test
+    public void test_cacheProviderDoesntProvideValuesIfAppsMissing() {
+        CachedStorageValuesHelper helper = mock(CachedStorageValuesHelper.class);
+        PrivateStorageInfo info = new PrivateStorageInfo(0, 0);
+        when(helper.getCachedPrivateStorageInfo()).thenReturn(info);
+
+        mFragment.setCachedStorageValuesHelper(helper);
+        mFragment.initializeCachedValues();
+
+        assertThat(mFragment.getPrivateStorageInfo()).isNull();
+        assertThat(mFragment.getAppsStorageResult()).isNull();
+    }
+
+    @Test
+    public void test_cacheProviderDoesntProvideValuesIfVolumeInfoMissing() {
+        CachedStorageValuesHelper helper = mock(CachedStorageValuesHelper.class);
+        SparseArray<StorageAsyncLoader.AppsStorageResult> result = new SparseArray<>();
+        when(helper.getCachedAppsStorageResult()).thenReturn(result);
+
+        mFragment.setCachedStorageValuesHelper(helper);
+        mFragment.initializeCachedValues();
+
+        assertThat(mFragment.getPrivateStorageInfo()).isNull();
+        assertThat(mFragment.getAppsStorageResult()).isNull();
+    }
+
+    @Test
+    public void test_loadWhenQuotaOffIfVolumeInfoNotLoaded() {
+        View fakeView = mock(View.class, RETURNS_DEEP_STUBS);
+        RecyclerView fakeRecyclerView = mock(RecyclerView.class, RETURNS_DEEP_STUBS);
+        when(fakeView.findViewById(anyInt())).thenReturn(fakeView);
+        mFragment = spy(mFragment);
+        when(mFragment.getView()).thenReturn(fakeView);
+        when(mFragment.getListView()).thenReturn(fakeRecyclerView);
+
+        mFragment.maybeSetLoading(false);
+
+        verify(mFragment).setLoading(true, false);
+    }
+
+    @Test
+    public void test_dontLoadWhenQuotaOffIfVolumeInfoNotLoaded() {
+        View fakeView = mock(View.class, RETURNS_DEEP_STUBS);
+        RecyclerView fakeRecyclerView = mock(RecyclerView.class, RETURNS_DEEP_STUBS);
+        when(fakeView.findViewById(anyInt())).thenReturn(fakeView);
+        mFragment = spy(mFragment);
+        when(mFragment.getView()).thenReturn(fakeView);
+        when(mFragment.getListView()).thenReturn(fakeRecyclerView);
+
+        PrivateStorageInfo info = new PrivateStorageInfo(0, 0);
+        mFragment.setPrivateStorageInfo(info);
+
+        mFragment.maybeSetLoading(false);
+
+        verify(mFragment, never()).setLoading(true, false);
+    }
+
+    @Test
+    public void test_loadWhenQuotaOnAndVolumeInfoLoadedButAppsMissing() {
+        View fakeView = mock(View.class, RETURNS_DEEP_STUBS);
+        RecyclerView fakeRecyclerView = mock(RecyclerView.class, RETURNS_DEEP_STUBS);
+        when(fakeView.findViewById(anyInt())).thenReturn(fakeView);
+        mFragment = spy(mFragment);
+        when(mFragment.getView()).thenReturn(fakeView);
+        when(mFragment.getListView()).thenReturn(fakeRecyclerView);
+
+        PrivateStorageInfo info = new PrivateStorageInfo(0, 0);
+        mFragment.setPrivateStorageInfo(info);
+
+        mFragment.maybeSetLoading(true);
+
+        verify(mFragment).setLoading(true, false);
+    }
+
+    @Test
+    public void test_loadWhenQuotaOnAndAppsLoadedButVolumeInfoMissing() {
+        View fakeView = mock(View.class, RETURNS_DEEP_STUBS);
+        RecyclerView fakeRecyclerView = mock(RecyclerView.class, RETURNS_DEEP_STUBS);
+        when(fakeView.findViewById(anyInt())).thenReturn(fakeView);
+        mFragment = spy(mFragment);
+        when(mFragment.getView()).thenReturn(fakeView);
+        when(mFragment.getListView()).thenReturn(fakeRecyclerView);
+        mFragment.setAppsStorageResult(new SparseArray<>());
+
+        mFragment.maybeSetLoading(true);
+
+        verify(mFragment).setLoading(true, false);
+    }
+
+    @Test
+    public void test_dontLoadWhenQuotaOnAndAllLoaded() {
+        View fakeView = mock(View.class, RETURNS_DEEP_STUBS);
+        RecyclerView fakeRecyclerView = mock(RecyclerView.class, RETURNS_DEEP_STUBS);
+        when(fakeView.findViewById(anyInt())).thenReturn(fakeView);
+        mFragment = spy(mFragment);
+        when(mFragment.getView()).thenReturn(fakeView);
+        when(mFragment.getListView()).thenReturn(fakeRecyclerView);
+
+        mFragment.setAppsStorageResult(new SparseArray<>());
+        PrivateStorageInfo storageInfo = new PrivateStorageInfo(0, 0);
+        mFragment.setPrivateStorageInfo(storageInfo);
+
+        mFragment.maybeSetLoading(true);
+
+        verify(mFragment, never()).setLoading(true, false);
+    }
+
+    @Test
     public void testSearchIndexProvider_shouldIndexResource() {
         final List<SearchIndexableResource> indexRes =
                 StorageDashboardFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java
index a154c03..5b34c7d 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java
@@ -55,7 +55,7 @@
     @Test
     public void testAfterLoad() {
         mPreference.setStorageSize(MEGABYTE_IN_BYTES * 10, MEGABYTE_IN_BYTES * 100);
-        assertThat(((String) mPreference.getSummary())).isEqualTo("0.01GB");
+        assertThat(((String) mPreference.getSummary())).isEqualTo("0.01 GB");
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
index faf8b39..b737d1f 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
@@ -17,7 +17,6 @@
 package com.android.settings.deviceinfo.storage;
 
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
@@ -33,17 +32,15 @@
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
-
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.deletionhelper.ActivationWarningFragment;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
 import com.android.settings.widget.MasterSwitchPreference;
-import com.android.settings.overlay.FeatureFactory;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -55,7 +52,11 @@
 
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(
+    manifest = TestConfig.MANIFEST_PATH,
+    sdk = TestConfig.SDK_VERSION,
+    shadows = {SettingsShadowSystemProperties.class}
+)
 public class AutomaticStorageManagementSwitchPreferenceControllerTest {
 
     @Mock
@@ -84,11 +85,18 @@
     }
 
     @Test
-    public void isAvailable_shouldAlwaysReturnTrue() {
+    public void isAvailable_shouldReturnTrue_forHighRamDevice() {
         assertThat(mController.isAvailable()).isTrue();
     }
 
     @Test
+    public void isAvailable_shouldAlwaysReturnFalse_forLowRamDevice() {
+        SettingsShadowSystemProperties.set("ro.config.low_ram", "true");
+        assertThat(mController.isAvailable()).isFalse();
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
     public void onResume_shouldReflectEnabledStatus() {
         mController.displayPreference(mScreen);
         ContentResolver resolver = mContext.getContentResolver();
@@ -155,7 +163,6 @@
     }
 
 
-    @Config(shadows = {SettingsShadowSystemProperties.class})
     @Test
     public void togglingOnShouldNotTriggerWarningFragmentIfEnabledByDefault() {
         FragmentTransaction transaction = mock(FragmentTransaction.class);
@@ -169,7 +176,6 @@
         verify(transaction, never()).add(any(), eq(ActivationWarningFragment.TAG));
     }
 
-    @Config(shadows = {SettingsShadowSystemProperties.class})
     @Test
     public void togglingOnShouldTriggerWarningFragmentIfEnabledByDefaultAndDisabledByPolicy() {
         FragmentTransaction transaction = mock(FragmentTransaction.class);
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java
new file mode 100644
index 0000000..154a7a1
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java
@@ -0,0 +1,295 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo.storage;
+
+import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.CACHE_APPS_SIZE_KEY;
+import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_APP_BYTES;
+import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_AUDIO_BYTES;
+import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_IMAGE_BYTES;
+import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_TOTAL_BYTES;
+import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_VIDEO_BYTES;
+import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.FREE_BYTES_KEY;
+import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.GAME_APPS_SIZE_KEY;
+import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.MUSIC_APPS_SIZE_KEY;
+import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.OTHER_APPS_SIZE_KEY;
+import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.PHOTO_APPS_SIZE_KEY;
+import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.SHARED_PREFERENCES_NAME;
+import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.TIMESTAMP_KEY;
+import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.TOTAL_BYTES_KEY;
+import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.USER_ID_KEY;
+import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.VIDEO_APPS_SIZE_KEY;
+
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.util.SparseArray;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.applications.StorageStatsSource;
+import com.android.settingslib.deviceinfo.PrivateStorageInfo;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class CachedStorageValuesHelperTest {
+    private Context mContext;
+
+    @Mock private CachedStorageValuesHelper.Clock mMockClock;
+    private CachedStorageValuesHelper mCachedValuesHelper;
+    private SharedPreferences mSharedPreferences;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application.getApplicationContext();
+        mSharedPreferences = mContext.getSharedPreferences(SHARED_PREFERENCES_NAME, 0);
+        mCachedValuesHelper = new CachedStorageValuesHelper(mContext, 0);
+        mCachedValuesHelper.mClock = mMockClock;
+    }
+
+    @Test
+    public void getCachedPrivateStorageInfo_cachedValuesAreLoaded() throws Exception {
+        when(mMockClock.getCurrentTime()).thenReturn(10001L);
+        mSharedPreferences
+                .edit()
+                .putLong(GAME_APPS_SIZE_KEY, 0)
+                .putLong(MUSIC_APPS_SIZE_KEY, 10)
+                .putLong(VIDEO_APPS_SIZE_KEY, 100)
+                .putLong(PHOTO_APPS_SIZE_KEY, 1000)
+                .putLong(OTHER_APPS_SIZE_KEY, 10000)
+                .putLong(CACHE_APPS_SIZE_KEY, 100000)
+                .putLong(EXTERNAL_TOTAL_BYTES, 2)
+                .putLong(EXTERNAL_AUDIO_BYTES, 22)
+                .putLong(EXTERNAL_VIDEO_BYTES, 222)
+                .putLong(EXTERNAL_IMAGE_BYTES, 2222)
+                .putLong(EXTERNAL_APP_BYTES, 22222)
+                .putLong(FREE_BYTES_KEY, 1000L)
+                .putLong(TOTAL_BYTES_KEY, 6000L)
+                .putInt(USER_ID_KEY, 0)
+                .putLong(TIMESTAMP_KEY, 10000L)
+                .apply();
+
+        PrivateStorageInfo info = mCachedValuesHelper.getCachedPrivateStorageInfo();
+
+        assertThat(info.freeBytes).isEqualTo(1000L);
+        assertThat(info.totalBytes).isEqualTo(6000L);
+    }
+
+    @Test
+    public void getCachedAppsStorageResult_cachedValuesAreLoaded() throws Exception {
+        when(mMockClock.getCurrentTime()).thenReturn(10001L);
+        mSharedPreferences
+                .edit()
+                .putLong(GAME_APPS_SIZE_KEY, 1)
+                .putLong(MUSIC_APPS_SIZE_KEY, 10)
+                .putLong(VIDEO_APPS_SIZE_KEY, 100)
+                .putLong(PHOTO_APPS_SIZE_KEY, 1000)
+                .putLong(OTHER_APPS_SIZE_KEY, 10000)
+                .putLong(CACHE_APPS_SIZE_KEY, 100000)
+                .putLong(EXTERNAL_TOTAL_BYTES, 222222)
+                .putLong(EXTERNAL_AUDIO_BYTES, 22)
+                .putLong(EXTERNAL_VIDEO_BYTES, 222)
+                .putLong(EXTERNAL_IMAGE_BYTES, 2222)
+                .putLong(EXTERNAL_APP_BYTES, 22222)
+                .putLong(FREE_BYTES_KEY, 1000L)
+                .putLong(TOTAL_BYTES_KEY, 5000L)
+                .putInt(USER_ID_KEY, 0)
+                .putLong(TIMESTAMP_KEY, 10000L)
+                .apply();
+
+        SparseArray<StorageAsyncLoader.AppsStorageResult> result =
+                mCachedValuesHelper.getCachedAppsStorageResult();
+
+        StorageAsyncLoader.AppsStorageResult primaryResult = result.get(0);
+        assertThat(primaryResult.gamesSize).isEqualTo(1L);
+        assertThat(primaryResult.musicAppsSize).isEqualTo(10L);
+        assertThat(primaryResult.videoAppsSize).isEqualTo(100L);
+        assertThat(primaryResult.photosAppsSize).isEqualTo(1000L);
+        assertThat(primaryResult.otherAppsSize).isEqualTo(10000L);
+        assertThat(primaryResult.cacheSize).isEqualTo(100000L);
+        assertThat(primaryResult.externalStats.totalBytes).isEqualTo(222222L);
+        assertThat(primaryResult.externalStats.audioBytes).isEqualTo(22L);
+        assertThat(primaryResult.externalStats.videoBytes).isEqualTo(222L);
+        assertThat(primaryResult.externalStats.imageBytes).isEqualTo(2222L);
+        assertThat(primaryResult.externalStats.appBytes).isEqualTo(22222L);
+    }
+
+    @Test
+    public void getCachedPrivateStorageInfo_nullIfDataIsStale() throws Exception {
+        when(mMockClock.getCurrentTime()).thenReturn(10000000L);
+        mSharedPreferences
+                .edit()
+                .putLong(GAME_APPS_SIZE_KEY, 0)
+                .putLong(MUSIC_APPS_SIZE_KEY, 10)
+                .putLong(VIDEO_APPS_SIZE_KEY, 100)
+                .putLong(PHOTO_APPS_SIZE_KEY, 1000)
+                .putLong(OTHER_APPS_SIZE_KEY, 10000)
+                .putLong(CACHE_APPS_SIZE_KEY, 100000)
+                .putLong(EXTERNAL_TOTAL_BYTES, 2)
+                .putLong(EXTERNAL_AUDIO_BYTES, 22)
+                .putLong(EXTERNAL_VIDEO_BYTES, 222)
+                .putLong(EXTERNAL_IMAGE_BYTES, 2222)
+                .putLong(EXTERNAL_APP_BYTES, 22222)
+                .putLong(FREE_BYTES_KEY, 1000L)
+                .putLong(TOTAL_BYTES_KEY, 5000L)
+                .putInt(USER_ID_KEY, 0)
+                .putLong(TIMESTAMP_KEY, 10000L)
+                .apply();
+
+        PrivateStorageInfo info = mCachedValuesHelper.getCachedPrivateStorageInfo();
+        assertThat(info).isNull();
+    }
+
+    @Test
+    public void getCachedAppsStorageResult_nullIfDataIsStale() throws Exception {
+        when(mMockClock.getCurrentTime()).thenReturn(10000000L);
+        mSharedPreferences
+                .edit()
+                .putLong(GAME_APPS_SIZE_KEY, 0)
+                .putLong(MUSIC_APPS_SIZE_KEY, 10)
+                .putLong(VIDEO_APPS_SIZE_KEY, 100)
+                .putLong(PHOTO_APPS_SIZE_KEY, 1000)
+                .putLong(OTHER_APPS_SIZE_KEY, 10000)
+                .putLong(CACHE_APPS_SIZE_KEY, 100000)
+                .putLong(EXTERNAL_TOTAL_BYTES, 2)
+                .putLong(EXTERNAL_AUDIO_BYTES, 22)
+                .putLong(EXTERNAL_VIDEO_BYTES, 222)
+                .putLong(EXTERNAL_IMAGE_BYTES, 2222)
+                .putLong(EXTERNAL_APP_BYTES, 22222)
+                .putLong(FREE_BYTES_KEY, 1000L)
+                .putLong(TOTAL_BYTES_KEY, 5000L)
+                .putInt(USER_ID_KEY, 0)
+                .putLong(TIMESTAMP_KEY, 10000L)
+                .apply();
+
+        SparseArray<StorageAsyncLoader.AppsStorageResult> result =
+                mCachedValuesHelper.getCachedAppsStorageResult();
+        assertThat(result).isNull();
+    }
+
+    @Test
+    public void getCachedPrivateStorageInfo_nullIfWrongUser() throws Exception {
+        when(mMockClock.getCurrentTime()).thenReturn(10001L);
+        mSharedPreferences
+                .edit()
+                .putLong(GAME_APPS_SIZE_KEY, 0)
+                .putLong(MUSIC_APPS_SIZE_KEY, 10)
+                .putLong(VIDEO_APPS_SIZE_KEY, 100)
+                .putLong(PHOTO_APPS_SIZE_KEY, 1000)
+                .putLong(OTHER_APPS_SIZE_KEY, 10000)
+                .putLong(CACHE_APPS_SIZE_KEY, 100000)
+                .putLong(EXTERNAL_TOTAL_BYTES, 2)
+                .putLong(EXTERNAL_AUDIO_BYTES, 22)
+                .putLong(EXTERNAL_VIDEO_BYTES, 222)
+                .putLong(EXTERNAL_IMAGE_BYTES, 2222)
+                .putLong(EXTERNAL_APP_BYTES, 22222)
+                .putLong(FREE_BYTES_KEY, 1000L)
+                .putLong(TOTAL_BYTES_KEY, 5000L)
+                .putInt(USER_ID_KEY, 1)
+                .putLong(TIMESTAMP_KEY, 10000L)
+                .apply();
+
+        PrivateStorageInfo info = mCachedValuesHelper.getCachedPrivateStorageInfo();
+        assertThat(info).isNull();
+    }
+
+    @Test
+    public void getCachedAppsStorageResult_nullIfWrongUser() throws Exception {
+        when(mMockClock.getCurrentTime()).thenReturn(10001L);
+        mSharedPreferences
+                .edit()
+                .putLong(GAME_APPS_SIZE_KEY, 0)
+                .putLong(MUSIC_APPS_SIZE_KEY, 10)
+                .putLong(VIDEO_APPS_SIZE_KEY, 100)
+                .putLong(PHOTO_APPS_SIZE_KEY, 1000)
+                .putLong(OTHER_APPS_SIZE_KEY, 10000)
+                .putLong(CACHE_APPS_SIZE_KEY, 100000)
+                .putLong(EXTERNAL_TOTAL_BYTES, 2)
+                .putLong(EXTERNAL_AUDIO_BYTES, 22)
+                .putLong(EXTERNAL_VIDEO_BYTES, 222)
+                .putLong(EXTERNAL_IMAGE_BYTES, 2222)
+                .putLong(EXTERNAL_APP_BYTES, 22222)
+                .putLong(FREE_BYTES_KEY, 1000L)
+                .putLong(TOTAL_BYTES_KEY, 5000L)
+                .putInt(USER_ID_KEY, 1)
+                .putLong(TIMESTAMP_KEY, 10000L)
+                .apply();
+
+        SparseArray<StorageAsyncLoader.AppsStorageResult> result =
+                mCachedValuesHelper.getCachedAppsStorageResult();
+        assertThat(result).isNull();
+    }
+
+    @Test
+    public void getCachedPrivateStorageInfo_nullIfEmpty() throws Exception {
+        PrivateStorageInfo info = mCachedValuesHelper.getCachedPrivateStorageInfo();
+        assertThat(info).isNull();
+    }
+
+    @Test
+    public void getCachedAppsStorageResult_nullIfEmpty() throws Exception {
+        SparseArray<StorageAsyncLoader.AppsStorageResult> result =
+                mCachedValuesHelper.getCachedAppsStorageResult();
+        assertThat(result).isNull();
+    }
+
+    @Test
+    public void cacheResult_succeeds() throws Exception {
+        when(mMockClock.getCurrentTime()).thenReturn(10000L);
+        final StorageStatsSource.ExternalStorageStats externalStats =
+                new StorageStatsSource.ExternalStorageStats(22222l, 2l, 20L, 200L, 2000L);
+        final StorageAsyncLoader.AppsStorageResult result =
+                new StorageAsyncLoader.AppsStorageResult();
+        result.gamesSize = 1L;
+        result.musicAppsSize = 10l;
+        result.videoAppsSize = 100L;
+        result.photosAppsSize = 1000L;
+        result.otherAppsSize = 10000L;
+        result.cacheSize = 100000l;
+        result.externalStats = externalStats;
+        final PrivateStorageInfo info = new PrivateStorageInfo(1000L, 6000L);
+
+        mCachedValuesHelper.cacheResult(info, result);
+
+        assertThat(mSharedPreferences.getLong(GAME_APPS_SIZE_KEY, -1)).isEqualTo(1L);
+        assertThat(mSharedPreferences.getLong(MUSIC_APPS_SIZE_KEY, -1)).isEqualTo(10L);
+        assertThat(mSharedPreferences.getLong(VIDEO_APPS_SIZE_KEY, -1)).isEqualTo(100L);
+        assertThat(mSharedPreferences.getLong(PHOTO_APPS_SIZE_KEY, -1)).isEqualTo(1000L);
+        assertThat(mSharedPreferences.getLong(OTHER_APPS_SIZE_KEY, -1)).isEqualTo(10000L);
+        assertThat(mSharedPreferences.getLong(CACHE_APPS_SIZE_KEY, -1)).isEqualTo(100000L);
+        assertThat(mSharedPreferences.getLong(EXTERNAL_TOTAL_BYTES, -1)).isEqualTo(22222L);
+        assertThat(mSharedPreferences.getLong(EXTERNAL_AUDIO_BYTES, -1)).isEqualTo(2L);
+        assertThat(mSharedPreferences.getLong(EXTERNAL_VIDEO_BYTES, -1)).isEqualTo(20L);
+        assertThat(mSharedPreferences.getLong(EXTERNAL_IMAGE_BYTES, -1)).isEqualTo(200L);
+        assertThat(mSharedPreferences.getLong(EXTERNAL_APP_BYTES, -1)).isEqualTo(2000L);
+        assertThat(mSharedPreferences.getLong(FREE_BYTES_KEY, -1)).isEqualTo(1000L);
+        assertThat(mSharedPreferences.getLong(TOTAL_BYTES_KEY, -1)).isEqualTo(6000L);
+        assertThat(mSharedPreferences.getInt(USER_ID_KEY, -1)).isEqualTo(0);
+        assertThat(mSharedPreferences.getLong(TIMESTAMP_KEY, -1)).isEqualTo(10000L);
+    };
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
index 9b4f30e..a871c19 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
@@ -16,9 +16,10 @@
 
 package com.android.settings.deviceinfo.storage;
 
-import static com.google.common.truth.Truth.assertThat;
 import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -36,9 +37,9 @@
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.UserManagerWrapper;
-import com.android.settings.core.PreferenceController;
 import com.android.settingslib.R;
 import com.android.settingslib.applications.StorageStatsSource;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.drawable.UserIconDrawable;
 
 import org.junit.Before;
@@ -103,7 +104,7 @@
         verify(mGroup).addPreference(argumentCaptor.capture());
 
         Preference preference = argumentCaptor.getValue();
-        assertThat(preference.getSummary()).isEqualTo("0.01GB");
+        assertThat(preference.getSummary()).isEqualTo("0.01 GB");
     }
 
     @Test
@@ -112,7 +113,7 @@
         userInfos.add(mPrimaryUser);
         when(mUserManager.getPrimaryUser()).thenReturn(mPrimaryUser);
         when(mUserManager.getUsers()).thenReturn(userInfos);
-        List<PreferenceController> controllers =
+        List<AbstractPreferenceController> controllers =
                 SecondaryUserController.getSecondaryUserControllers(mContext, mUserManager);
 
         assertThat(controllers).hasSize(1);
@@ -130,7 +131,7 @@
         userInfos.add(secondaryUser);
         when(mUserManager.getPrimaryUser()).thenReturn(mPrimaryUser);
         when(mUserManager.getUsers()).thenReturn(userInfos);
-        List<PreferenceController> controllers =
+        List<AbstractPreferenceController> controllers =
                 SecondaryUserController.getSecondaryUserControllers(mContext, mUserManager);
 
         assertThat(controllers).hasSize(1);
@@ -147,7 +148,7 @@
         when(mUserManager.getPrimaryUser()).thenReturn(mPrimaryUser);
         when(mUserManager.getUsers()).thenReturn(userInfos);
 
-        List<PreferenceController> controllers =
+        List<AbstractPreferenceController> controllers =
                 SecondaryUserController.getSecondaryUserControllers(mContext, mUserManager);
 
         assertThat(controllers).hasSize(2);
@@ -176,7 +177,7 @@
         verify(mGroup).addPreference(argumentCaptor.capture());
         Preference preference = argumentCaptor.getValue();
 
-        assertThat(preference.getSummary()).isEqualTo("0.03GB");
+        assertThat(preference.getSummary()).isEqualTo("0.03 GB");
     }
 
     @Test
@@ -190,7 +191,7 @@
         userInfos.add(primaryUserRenamed);
         when(mUserManager.getPrimaryUser()).thenReturn(mPrimaryUser);
         when(mUserManager.getUsers()).thenReturn(userInfos);
-        List<PreferenceController> controllers =
+        List<AbstractPreferenceController> controllers =
                 SecondaryUserController.getSecondaryUserControllers(mContext, mUserManager);
 
         assertThat(controllers).hasSize(1);
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
index 0d6a4d7..9bef560 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
@@ -16,12 +16,13 @@
 package com.android.settings.deviceinfo.storage;
 
 
+import static com.android.settings.applications.ManageApplications.EXTRA_WORK_ID;
+import static com.android.settings.applications.ManageApplications.EXTRA_WORK_ONLY;
 import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES;
 
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -84,8 +85,6 @@
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
-        SettingsShadowResources.overrideResource("android:string/fileSizeSuffix", "%1$s %2$s");
-        SettingsShadowResources.overrideResource("android:string/gigabyteShort", "GB");
         mContext = spy(RuntimeEnvironment.application.getApplicationContext());
         FakeFeatureFactory.setupForTest(mContext);
         mFakeFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
@@ -123,9 +122,12 @@
                 nullable(UserHandle.class));
 
         Intent intent = argumentCaptor.getValue();
-        assertThat(intent.getType()).isEqualTo("image/*");
-        assertThat(intent.getAction()).isEqualTo(android.content.Intent.ACTION_VIEW);
-        assertThat(intent.getBooleanExtra(Intent.EXTRA_FROM_STORAGE, false)).isTrue();
+        assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
+        assertThat(intent.getComponent().getClassName()).isEqualTo(SubSettings.class.getName());
+        assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
+                .isEqualTo(ManageApplications.class.getName());
+        assertThat(intent.getIntExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, 0))
+                .isEqualTo(R.string.storage_photos_videos);
     }
 
     @Test
@@ -174,6 +176,33 @@
     }
 
     @Test
+    public void testClickAppsForWork() {
+        mController = new StorageItemPreferenceController(mContext, mFragment, mVolume, mSvp, true);
+        mPreference.setKey("pref_other_apps");
+        mController.handlePreferenceTreeClick(mPreference);
+
+        final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
+        verify(mFragment.getActivity())
+                .startActivityAsUser(argumentCaptor.capture(), nullable(UserHandle.class));
+
+        Intent intent = argumentCaptor.getValue();
+        assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
+        assertThat(intent.getComponent().getClassName()).isEqualTo(SubSettings.class.getName());
+        assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
+                .isEqualTo(ManageApplications.class.getName());
+        assertThat(intent.getIntExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, 0))
+                .isEqualTo(R.string.apps_storage);
+        assertThat(
+                        intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
+                                .getBoolean(EXTRA_WORK_ONLY))
+                .isTrue();
+        assertThat(
+                        intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
+                                .getInt(EXTRA_WORK_ID))
+                .isEqualTo(0);
+    }
+
+    @Test
     public void handlePreferenceTreeClick_tappingAppsWhileUninitializedDoesntCrash() {
         mController.setVolume(null);
 
@@ -287,12 +316,12 @@
         results.put(0, result);
         mController.onLoadFinished(results, 0);
 
-        assertThat(audio.getSummary().toString()).isEqualTo("0.14GB");
-        assertThat(image.getSummary().toString()).isEqualTo("0.35GB");
-        assertThat(games.getSummary().toString()).isEqualTo("0.08GB");
-        assertThat(movies.getSummary().toString()).isEqualTo("0.16GB");
-        assertThat(apps.getSummary().toString()).isEqualTo("0.09GB");
-        assertThat(files.getSummary().toString()).isEqualTo("0.05GB");
+        assertThat(audio.getSummary().toString()).isEqualTo("0.14 GB");
+        assertThat(image.getSummary().toString()).isEqualTo("0.35 GB");
+        assertThat(games.getSummary().toString()).isEqualTo("0.08 GB");
+        assertThat(movies.getSummary().toString()).isEqualTo("0.16 GB");
+        assertThat(apps.getSummary().toString()).isEqualTo("0.09 GB");
+        assertThat(files.getSummary().toString()).isEqualTo("0.05 GB");
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
index db7c9f7..a2e57b9 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
@@ -122,7 +122,7 @@
         verify(mScreen).addPreference(argumentCaptor.capture());
         Preference preference = argumentCaptor.getValue();
 
-        assertThat(preference.getSummary()).isEqualTo("0.10GB");
+        assertThat(preference.getSummary()).isEqualTo("0.10 GB");
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java
index 6d9cbab..06fd297 100644
--- a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java
@@ -45,7 +45,11 @@
 import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(
+    manifest = TestConfig.MANIFEST_PATH,
+    sdk = TestConfig.SDK_VERSION,
+    shadows = ShadowSystemSettings.class
+)
 public class AutoRotatePreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -88,7 +92,6 @@
     }
 
     @Test
-    @Config(shadows = ShadowSystemSettings.class)
     public void updatePreference_settingsIsOff_shouldTurnOffToggle() {
         Settings.System.putIntForUser(mContentResolver,
                 Settings.System.ACCELEROMETER_ROTATION, 0, UserHandle.USER_CURRENT);
@@ -99,7 +102,6 @@
     }
 
     @Test
-    @Config(shadows = ShadowSystemSettings.class)
     public void updatePreference_settingsIsOn_shouldTurnOnToggle() {
         Settings.System.putIntForUser(mContentResolver,
                 Settings.System.ACCELEROMETER_ROTATION, 1, UserHandle.USER_CURRENT);
diff --git a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
index d35adef..56b940b 100644
--- a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
@@ -79,14 +79,14 @@
     }
 
     @Test
-    public void onResume_shouldRegisterObserver() {
+    public void onStart_shouldRegisterObserver() {
         Context context = RuntimeEnvironment.application;
         BrightnessLevelPreferenceController controller =
             new BrightnessLevelPreferenceController(context, null, mPowerManager);
         ShadowContentResolver shadowContentResolver =
             (ShadowContentResolver) ShadowExtractor.extract(context.getContentResolver());
 
-        controller.onResume();
+        controller.onStart();
 
         assertThat(shadowContentResolver.getContentObservers(
             System.getUriFor(System.SCREEN_BRIGHTNESS_MODE))).isNotEmpty();
@@ -99,7 +99,7 @@
     }
 
     @Test
-    public void onPause_shouldUnregisterObserver() {
+    public void onStop_shouldUnregisterObserver() {
         Context context = RuntimeEnvironment.application;
         BrightnessLevelPreferenceController controller =
             new BrightnessLevelPreferenceController(context, null, mPowerManager);
@@ -107,8 +107,8 @@
             (ShadowContentResolver) ShadowExtractor.extract(context.getContentResolver());
 
         controller.displayPreference(mScreen);
-        controller.onResume();
-        controller.onPause();
+        controller.onStart();
+        controller.onStop();
 
         assertThat(shadowContentResolver.getContentObservers(
             System.getUriFor(System.SCREEN_BRIGHTNESS_MODE))).isEmpty();
diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java
index 83ea399..a6f95aa 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java
@@ -16,6 +16,13 @@
 
 package com.android.settings.enterprise;
 
+import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.content.pm.UserInfo;
 import android.support.v7.preference.PreferenceManager;
@@ -27,7 +34,7 @@
 import com.android.settings.TestConfig;
 import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.applications.UserAppInfo;
-import com.android.settings.core.PreferenceController;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -40,11 +47,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class ApplicationListFragmentTest {
@@ -84,7 +86,7 @@
 
     @Test
     public void getPreferenceControllers() {
-        final List<PreferenceController> controllers = mFragment.getPreferenceControllers(mContext);
+        final List<AbstractPreferenceController> controllers = mFragment.getPreferenceControllers(mContext);
         assertThat(controllers).isNotNull();
         assertThat(controllers.size()).isEqualTo(1);
         int position = 0;
diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java
new file mode 100644
index 0000000..35d78a5
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.enterprise;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.when;
+
+import android.support.v7.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+/**
+ * Tests for {@link CaCertsCurrentUserPreferenceController}.
+ */
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public final class CaCertsCurrentUserPreferenceControllerTest extends
+        CaCertsPreferenceControllerTestBase {
+
+    private static final String CA_CERT_DEVICE = "CA certs";
+    private static final String CA_CERT_PERSONAL = "CA certs in personal profile";
+
+    @Before
+    public void mockGetString() {
+        when(mContext.getString(R.string.enterprise_privacy_ca_certs_device))
+                .thenReturn(CA_CERT_DEVICE);
+        when(mContext.getString(R.string.enterprise_privacy_ca_certs_personal))
+                .thenReturn(CA_CERT_PERSONAL);
+    }
+
+    @Test
+    public void testUpdateState_nonCompMode() {
+        assertUpdateState(false /* isCompMode */, CA_CERT_DEVICE);
+    }
+
+    @Test
+    public void testUpdateState_compMode() {
+        assertUpdateState(true /* isCompMode */, CA_CERT_PERSONAL);
+    }
+
+    @Override
+    void mockGetNumberOfCaCerts(int numOfCaCerts) {
+        when(mFeatureFactory.enterprisePrivacyFeatureProvider
+                .getNumberOfOwnerInstalledCaCertsForCurrentUser()).thenReturn(numOfCaCerts);
+    }
+
+    @Override
+    String getPreferenceKey() {
+        return CaCertsCurrentUserPreferenceController.CA_CERTS_CURRENT_USER;
+    }
+
+    @Override
+    CaCertsPreferenceControllerBase createController() {
+        return new CaCertsCurrentUserPreferenceController(mContext, null /* lifecycle */);
+    }
+
+    private void assertUpdateState(boolean isCompMode, String expectedTitle) {
+        final Preference preference = new Preference(mContext, null, 0, 0);
+
+        mockGetNumberOfCaCerts(2);
+        when(mFeatureFactory.enterprisePrivacyFeatureProvider.isInCompMode())
+                .thenReturn(isCompMode);
+        mController.updateState(preference);
+        assertThat(preference.getTitle()).isEqualTo(expectedTitle);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java
new file mode 100644
index 0000000..41b7f45
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.enterprise;
+
+import static org.mockito.Mockito.when;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+/**
+ * Tests for {@link CaCertsManagedProfilePreferenceController}.
+ */
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public final class CaCertsManagedProfilePreferenceControllerTest extends
+        CaCertsPreferenceControllerTestBase {
+
+    @Override
+    void mockGetNumberOfCaCerts(int numOfCaCerts) {
+        when(mFeatureFactory.enterprisePrivacyFeatureProvider
+                .getNumberOfOwnerInstalledCaCertsForManagedProfile()).thenReturn(numOfCaCerts);
+    }
+
+    @Override
+    String getPreferenceKey() {
+        return CaCertsManagedProfilePreferenceController.CA_CERTS_MANAGED_PROFILE;
+    }
+
+    @Override
+    CaCertsPreferenceControllerBase createController() {
+        return new CaCertsManagedProfilePreferenceController(mContext, null /* lifecycle */);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerBaseTest.java
new file mode 100644
index 0000000..37b903a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerBaseTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.enterprise;
+
+import android.content.Context;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+/**
+ * Tests for {@link CaCertsPreferenceControllerBase}.
+ */
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class CaCertsPreferenceControllerBaseTest extends CaCertsPreferenceControllerTestBase {
+    private static final String PREF_KEY = "pref";
+
+    private int mNumOfCaCerts;
+
+    void mockGetNumberOfCaCerts(int numOfCaCerts) {
+        mNumOfCaCerts = numOfCaCerts;
+    }
+
+    String getPreferenceKey() {
+        return PREF_KEY;
+    }
+
+    CaCertsPreferenceControllerBase createController() {
+        return new CaCertsPreferenceControllerBaseTestable(mContext);
+    }
+
+    private class CaCertsPreferenceControllerBaseTestable extends
+            CaCertsPreferenceControllerBase {
+
+        public CaCertsPreferenceControllerBaseTestable(Context context) {
+            super(context, null);
+        }
+
+        @Override
+        public String getPreferenceKey() {
+            return PREF_KEY;
+        }
+
+        @Override
+        protected int getNumberOfCaCerts() {
+            return mNumOfCaCerts;
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java
similarity index 62%
rename from tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java
index 00b3573..c171fba 100644
--- a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java
@@ -16,50 +16,42 @@
 
 package com.android.settings.enterprise;
 
-import android.content.Context;
+import static com.google.common.truth.Truth.assertThat;
 
-import com.android.settings.R;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
+import com.android.settings.R;
 import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 /**
- * Tests for {@link CaCertsPreferenceController}.
+ * Base test class for testing {@link CaCertsPreferenceControllerBase}'s subclass.
  */
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class CaCertsPreferenceControllerTest {
-
-    private static final String KEY_CA_CERTS = "ca_certs";
+public abstract class CaCertsPreferenceControllerTestBase {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    private FakeFeatureFactory mFeatureFactory;
-    @Mock private PreferenceAvailabilityObserver mObserver;
-
-    private CaCertsPreferenceController mController;
+    protected Context mContext;
+    protected FakeFeatureFactory mFeatureFactory;
+    protected CaCertsPreferenceControllerBase mController;
+    @Mock
+    private PreferenceAvailabilityObserver mObserver;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         FakeFeatureFactory.setupForTest(mContext);
         mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mController = new CaCertsPreferenceController(mContext, null /* lifecycle */);
+        mController = createController();
         mController.setAvailabilityObserver(mObserver);
     }
 
@@ -74,23 +66,20 @@
 
         when(mContext.getResources().getQuantityString(R.plurals.enterprise_privacy_number_ca_certs,
                 10, 10)).thenReturn("10 certs");
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider
-                .getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile()).thenReturn(10);
+        mockGetNumberOfCaCerts(10);
         mController.updateState(preference);
         assertThat(preference.getSummary()).isEqualTo("10 certs");
     }
 
     @Test
     public void testIsAvailable() {
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider
-                .getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile()).thenReturn(0);
+        mockGetNumberOfCaCerts(0);
         assertThat(mController.isAvailable()).isFalse();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_CA_CERTS, false);
+        verify(mObserver).onPreferenceAvailabilityUpdated(getPreferenceKey(), false);
 
-        when(mFeatureFactory.enterprisePrivacyFeatureProvider
-                .getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile()).thenReturn(10);
+        mockGetNumberOfCaCerts(10);
         assertThat(mController.isAvailable()).isTrue();
-        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_CA_CERTS, true);
+        verify(mObserver).onPreferenceAvailabilityUpdated(getPreferenceKey(), true);
     }
 
     @Test
@@ -101,6 +90,13 @@
 
     @Test
     public void testGetPreferenceKey() {
-        assertThat(mController.getPreferenceKey()).isEqualTo(KEY_CA_CERTS);
+        assertThat(mController.getPreferenceKey()).isEqualTo(getPreferenceKey());
     }
+
+    abstract void mockGetNumberOfCaCerts(int numOfCaCerts);
+
+    abstract String getPreferenceKey();
+
+    abstract CaCertsPreferenceControllerBase createController();
+
 }
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
index 474b278..899ff5c 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
@@ -288,7 +288,7 @@
     }
 
     @Test
-    public void testGetNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile() {
+    public void testGetNumberOfOwnerInstalledCaCertsForCurrent() {
         final UserHandle userHandle = new UserHandle(UserHandle.USER_SYSTEM);
         final UserHandle managedProfileUserHandle = new UserHandle(MANAGED_PROFILE_USER_ID);
         final UserInfo managedProfile =
@@ -299,33 +299,44 @@
 
         when(mDevicePolicyManager.getOwnerInstalledCaCerts(userHandle))
                 .thenReturn(null);
-        assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile())
+        assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForCurrentUser())
                 .isEqualTo(0);
         when(mDevicePolicyManager.getOwnerInstalledCaCerts(userHandle))
-                .thenReturn(new ArrayList<String>());
-        assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile())
+                .thenReturn(new ArrayList<>());
+        assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForCurrentUser())
                 .isEqualTo(0);
         when(mDevicePolicyManager.getOwnerInstalledCaCerts(userHandle))
                 .thenReturn(Arrays.asList(new String[] {"ca1", "ca2"}));
-        assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile())
+        assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForCurrentUser())
                 .isEqualTo(2);
+    }
 
+    @Test
+    public void testGetNumberOfOwnerInstalledCaCertsForManagedProfile() {
+        final UserHandle userHandle = new UserHandle(UserHandle.USER_SYSTEM);
+        final UserHandle managedProfileUserHandle = new UserHandle(MANAGED_PROFILE_USER_ID);
+        final UserInfo managedProfile =
+                new UserInfo(MANAGED_PROFILE_USER_ID, "", "", UserInfo.FLAG_MANAGED_PROFILE);
+
+        // Without a profile
+        when(mDevicePolicyManager.getOwnerInstalledCaCerts(managedProfileUserHandle))
+                .thenReturn(Arrays.asList(new String[] {"ca1", "ca2"}));
+        assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForManagedProfile())
+                .isEqualTo(0);
+
+        // With a profile
         mProfiles.add(managedProfile);
         when(mDevicePolicyManager.getOwnerInstalledCaCerts(managedProfileUserHandle))
                 .thenReturn(null);
-        assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile())
-                .isEqualTo(2);
-        when(mDevicePolicyManager.getOwnerInstalledCaCerts(managedProfileUserHandle))
-                .thenReturn(new ArrayList<String>());
-        assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile())
-                .isEqualTo(2);
+        assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForManagedProfile())
+                .isEqualTo(0);
+        when(mDevicePolicyManager.getOwnerInstalledCaCerts(userHandle))
+                .thenReturn(new ArrayList<>());
+        assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForManagedProfile())
+                .isEqualTo(0);
         when(mDevicePolicyManager.getOwnerInstalledCaCerts(managedProfileUserHandle))
                 .thenReturn(Arrays.asList(new String[] {"ca1", "ca2"}));
-        assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile())
-                .isEqualTo(4);
-
-        mProfiles.remove(managedProfile);
-        assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile())
+        assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForManagedProfile())
                 .isEqualTo(2);
     }
 
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
index 42639d6..4da3289 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
@@ -16,16 +16,20 @@
 
 package com.android.settings.enterprise;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.content.res.XmlResourceParser;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.DynamicAvailabilityPreferenceController;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -42,9 +46,6 @@
 import java.util.List;
 import java.util.Set;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
 /**
  * Tests for {@link EnterprisePrivacySettings}.
  */
@@ -111,23 +112,23 @@
 
     @Test
     public void getPreferenceControllers() throws Exception {
-        final List<PreferenceController> controllers = mSettings.getPreferenceControllers(
+        final List<AbstractPreferenceController> controllers = mSettings.getPreferenceControllers(
                 ShadowApplication.getInstance().getApplicationContext());
         verifyPreferenceControllers(controllers);
     }
 
     @Test
     public void getSearchIndexProviderPreferenceControllers() throws Exception {
-        final List<PreferenceController> controllers
+        final List<AbstractPreferenceController> controllers
                 = EnterprisePrivacySettings.SEARCH_INDEX_DATA_PROVIDER.getPreferenceControllers(
                         ShadowApplication.getInstance().getApplicationContext());
         verifyPreferenceControllers(controllers);
     }
 
-    private void verifyPreferenceControllers(List<PreferenceController> controllers)
+    private void verifyPreferenceControllers(List<AbstractPreferenceController> controllers)
             throws Exception {
         assertThat(controllers).isNotNull();
-        assertThat(controllers.size()).isEqualTo(16);
+        assertThat(controllers.size()).isEqualTo(17);
         int position = 0;
         assertThat(controllers.get(position++)).isInstanceOf(NetworkLogsPreferenceController.class);
         assertThat(controllers.get(position++)).isInstanceOf(BugReportsPreferenceController.class);
@@ -151,8 +152,11 @@
         assertThat(controllers.get(position++)).isInstanceOf(
                 GlobalHttpProxyPreferenceController.class);
         assertThat(controllers.get(position++)).isInstanceOf(
-                CaCertsPreferenceController.class);
-        final PreferenceController exposureChangesCategoryController = controllers.get(position);
+                CaCertsCurrentUserPreferenceController.class);
+        assertThat(controllers.get(position++)).isInstanceOf(
+                CaCertsManagedProfilePreferenceController.class);
+        final AbstractPreferenceController exposureChangesCategoryController =
+                controllers.get(position);
         final int exposureChangesCategoryControllerIndex = position;
         assertThat(controllers.get(position++)).isInstanceOf(
                 ExposureChangesCategoryPreferenceController.class);
@@ -200,7 +204,7 @@
         final Set<String> actualObserved = new HashSet<>();
         int maxObservedIndex = -1;
         for (int i = 0; i < controllers.size(); i++) {
-            final PreferenceController controller = controllers.get(i);
+            final AbstractPreferenceController controller = controllers.get(i);
             if (controller instanceof DynamicAvailabilityPreferenceController &&
                     ((DynamicAvailabilityPreferenceController) controller).getAvailabilityObserver()
                             == exposureChangesCategoryController) {
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java
index 54a825e..567c06f 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java
@@ -16,14 +16,21 @@
 
 package com.android.settings.enterprise;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.PreferenceController;
+import com.android.settingslib.core.AbstractPreferenceController;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -34,10 +41,6 @@
 
 import java.util.List;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class EnterpriseSetDefaultAppsListFragmentTest {
@@ -77,7 +80,7 @@
 
     @Test
     public void getPreferenceControllers() {
-        final List<PreferenceController> controllers = mFragment.getPreferenceControllers(mContext);
+        final List<AbstractPreferenceController> controllers = mFragment.getPreferenceControllers(mContext);
         assertThat(controllers).isNotNull();
         assertThat(controllers.size()).isEqualTo(1);
         int position = 0;
diff --git a/tests/robotests/src/com/android/settings/fingerprint/DeleteFingerprintDialogTest.java b/tests/robotests/src/com/android/settings/fingerprint/DeleteFingerprintDialogTest.java
new file mode 100644
index 0000000..c3c1b42
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fingerprint/DeleteFingerprintDialogTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.fingerprint;
+
+
+import android.app.Dialog;
+import android.hardware.fingerprint.Fingerprint;
+
+import com.android.settings.TestConfig;
+import com.android.settings.fingerprint.FingerprintSettings.FingerprintSettingsFragment;
+import com.android.settings.fingerprint.FingerprintSettings.FingerprintSettingsFragment
+        .DeleteFingerprintDialog;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowEventLogWriter;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.FragmentTestUtil;
+
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                ShadowEventLogWriter.class
+        })
+public class DeleteFingerprintDialogTest {
+
+    @Mock
+    private FingerprintSettingsFragment mTarget;
+    @Mock
+    private Fingerprint mFingerprint;
+    private DeleteFingerprintDialog mFragment;
+
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mFragment = DeleteFingerprintDialog.newInstance(mFingerprint, mTarget);
+    }
+
+    @Test
+    public void launchDialog_clickPositive_shouldDeleteFingerprint() {
+        FragmentTestUtil.startFragment(mFragment);
+
+        mFragment.onClick(mFragment.getDialog(), Dialog.BUTTON_POSITIVE);
+
+        verify(mTarget).deleteFingerPrint(mFingerprint);
+    }
+
+    @Test
+    public void launchDialog_clickNegative_shouldDoNothing() {
+        FragmentTestUtil.startFragment(mFragment);
+
+        mFragment.onClick(mFragment.getDialog(), Dialog.BUTTON_NEGATIVE);
+
+        verify(mTarget, never()).deleteFingerPrint(mFingerprint);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java
index 344914a..ad52bf6 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java
@@ -36,7 +36,6 @@
 import com.android.settings.password.IFingerprintManager;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;
 import com.android.settings.testutils.shadow.ShadowEventLogWriter;
 import com.android.settings.testutils.shadow.ShadowUtils;
 
@@ -61,7 +60,6 @@
         shadows = {
                 SettingsShadowResources.class,
                 SettingsShadowResources.SettingsShadowTheme.class,
-                ShadowDynamicIndexableContentMonitor.class,
                 ShadowEventLogWriter.class,
                 ShadowUtils.class
         })
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java
new file mode 100644
index 0000000..29c6f10
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.fingerprint;
+
+import android.content.Context;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.FrameLayout;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.fingerprint.FingerprintSettings.FingerprintPreference;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class FingerprintPreferenceTest {
+
+    @Mock
+    private FingerprintPreference.OnDeleteClickListener mOnDeleteClickListener;
+
+    private Context mContext;
+    private FingerprintPreference mPreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mPreference = new FingerprintPreference(mContext, mOnDeleteClickListener);
+    }
+
+    @Test
+    public void shouldShowDeleteButton() {
+        assertThat(mPreference.getSecondTargetResId()).isEqualTo(R.layout.preference_widget_delete);
+    }
+
+    @Test
+    public void bindAndClickDeleteButton_shouldInvokeOnDeleteListener() {
+        final FrameLayout layout = new FrameLayout(mContext);
+        final View deleteButton = LayoutInflater.from(mContext)
+                .inflate(mPreference.getSecondTargetResId(), layout, true);
+        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(layout);
+        mPreference.onBindViewHolder(holder);
+
+        layout.findViewById(R.id.delete_button).performClick();
+
+        verify(mOnDeleteClickListener).onDeleteClick(mPreference);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java
new file mode 100644
index 0000000..ce31328
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.fingerprint;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.robolectric.RuntimeEnvironment.application;
+
+import android.app.AlertDialog;
+import android.content.Intent;
+import android.widget.Button;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.password.ChooseLockSettingsHelper;
+import com.android.settings.password.IFingerprintManager;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settings.testutils.shadow.ShadowEventLogWriter;
+import com.android.settings.testutils.shadow.ShadowUtils;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowAlertDialog;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(
+        manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                SettingsShadowResources.class,
+                SettingsShadowResources.SettingsShadowTheme.class,
+                ShadowEventLogWriter.class,
+                ShadowUtils.class
+        })
+public class SetupFingerprintEnrollFindSensorTest {
+
+    @Mock
+    private IFingerprintManager mFingerprintManager;
+
+    private SetupFingerprintEnrollFindSensor mActivity;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        ShadowUtils.setFingerprintManager(mFingerprintManager);
+        RuntimeEnvironment.getAppResourceLoader().getResourceIndex();
+
+    }
+
+    private void createActivity(Intent intent) {
+        mActivity = Robolectric.buildActivity(
+                SetupFingerprintEnrollFindSensor.class, intent)
+                .setup().get();
+    }
+
+    private Intent createIntent() {
+        return new Intent()
+                // Set the challenge token so the confirm screen will not be shown
+                .putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, new byte[0]);
+    }
+
+    @After
+    public void tearDown() {
+        ShadowUtils.reset();
+    }
+
+    @Test
+    public void fingerprintEnroll_showsAlert_whenClickingSkip() {
+        createActivity(createIntent());
+        Button skipButton = mActivity.findViewById(R.id.skip_button);
+        skipButton.performClick();
+        AlertDialog alertDialog = ShadowAlertDialog.getLatestAlertDialog();
+        assertNotNull(alertDialog);
+        ShadowAlertDialog shadowAlertDialog = Shadows.shadowOf(alertDialog);
+        int titleRes = R.string.setup_fingerprint_enroll_skip_title;
+        assertEquals(application.getString(titleRes), shadowAlertDialog.getTitle());
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java
index 801ee5d..f5859ac 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java
@@ -23,28 +23,38 @@
 
 import android.app.KeyguardManager;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.content.pm.UserInfo;
 import android.view.View;
 import android.widget.Button;
 
 import com.android.settings.R;
 import com.android.settings.TestConfig;
+import com.android.settings.fingerprint.SetupFingerprintEnrollIntroductionTest
+        .ShadowStorageManagerWrapper;
 import com.android.settings.password.SetupChooseLockGeneric.SetupChooseLockGenericFragment;
 import com.android.settings.password.SetupSkipDialog;
+import com.android.settings.password.StorageManagerWrapper;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowEventLogWriter;
+import com.android.settings.testutils.shadow.ShadowFingerprintManager;
 import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
 import com.android.settings.testutils.shadow.ShadowUserManager;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
 import org.robolectric.shadows.ShadowActivity;
+import org.robolectric.shadows.ShadowActivity.IntentForResult;
 import org.robolectric.shadows.ShadowKeyguardManager;
 import org.robolectric.util.ActivityController;
 
@@ -54,7 +64,9 @@
         sdk = TestConfig.SDK_VERSION,
         shadows = {
                 ShadowEventLogWriter.class,
+                ShadowFingerprintManager.class,
                 ShadowLockPatternUtils.class,
+                ShadowStorageManagerWrapper.class,
                 ShadowUserManager.class
         })
 public class SetupFingerprintEnrollIntroductionTest {
@@ -68,12 +80,22 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
+        RuntimeEnvironment.getRobolectricPackageManager()
+                .setSystemFeature(PackageManager.FEATURE_FINGERPRINT, true);
+        ShadowFingerprintManager.addToServiceMap();
+
         final Intent intent = new Intent();
         mController = Robolectric.buildActivity(SetupFingerprintEnrollIntroduction.class, intent);
 
         ShadowUserManager.getShadow().setUserInfo(0, mUserInfo);
     }
 
+    @After
+    public void tearDown() {
+        ShadowStorageManagerWrapper.reset();
+        ShadowFingerprintManager.reset();
+    }
+
     @Test
     public void testKeyguardNotSecure_shouldFinishWithSetupSkipDialogResultSkip() {
         getShadowKeyguardManager().setIsKeyguardSecure(false);
@@ -188,8 +210,41 @@
         assertThat(Shadows.shadowOf(activity).getResultIntent()).isNull();
     }
 
+    @Test
+    public void testLockPattern() {
+        ShadowStorageManagerWrapper.sIsFileEncrypted = false;
+
+        mController.create().postCreate(null).resume();
+
+        SetupFingerprintEnrollIntroduction activity = mController.get();
+
+        final Button nextButton = activity.findViewById(R.id.fingerprint_next_button);
+        nextButton.performClick();
+
+        ShadowActivity shadowActivity = Shadows.shadowOf(activity);
+        IntentForResult startedActivity = shadowActivity.getNextStartedActivityForResult();
+        assertThat(startedActivity).isNotNull();
+        assertThat(startedActivity.intent.hasExtra(
+                SetupChooseLockGenericFragment.EXTRA_PASSWORD_QUALITY)).isFalse();
+    }
+
 
     private ShadowKeyguardManager getShadowKeyguardManager() {
         return Shadows.shadowOf(application.getSystemService(KeyguardManager.class));
     }
+
+    @Implements(StorageManagerWrapper.class)
+    public static class ShadowStorageManagerWrapper {
+
+        private static boolean sIsFileEncrypted = true;
+
+        public static void reset() {
+            sIsFileEncrypted = true;
+        }
+
+        @Implementation
+        public static boolean isFileEncryptedNativeOrEmulated() {
+            return sIsFileEncrypted;
+        }
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
index 61815f1..54d043c 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
@@ -87,10 +87,17 @@
     private static final int ICON_ID = 123;
     private static final int UID = 1;
     private static final int POWER_MAH = 150;
-    private static final long BACKGROUND_TIME_US = 100 * 1000;
-    private static final long FOREGROUND_TIME_US = 200 * 1000;
     private static final long BACKGROUND_TIME_MS = 100;
-    private static final long FOREGROUND_TIME_MS = 200;
+    private static final long FOREGROUND_ACTIVITY_TIME_MS = 123;
+    private static final long FOREGROUND_SERVICE_TIME_MS = 444;
+    private static final long FOREGROUND_TIME_MS =
+            FOREGROUND_ACTIVITY_TIME_MS + FOREGROUND_SERVICE_TIME_MS;
+    private static final long PROCSTATE_TOP_TIME_MS = FOREGROUND_ACTIVITY_TIME_MS;
+    private static final long BACKGROUND_TIME_US = BACKGROUND_TIME_MS * 1000;
+    private static final long FOREGROUND_ACTIVITY_TIME_US = FOREGROUND_ACTIVITY_TIME_MS * 1000;
+    private static final long FOREGROUND_SERVICE_TIME_US = FOREGROUND_SERVICE_TIME_MS * 1000;
+    private static final long FOREGROUND_TIME_US = FOREGROUND_TIME_MS * 1000;
+    private static final long PROCSTATE_TOP_TIME_US = PROCSTATE_TOP_TIME_MS * 1000;
     private static final long PHONE_FOREGROUND_TIME_MS = 250 * 1000;
     private static final long PHONE_BACKGROUND_TIME_MS = 0;
 
@@ -123,7 +130,9 @@
     @Mock
     private AnomalySummaryPreferenceController mAnomalySummaryPreferenceController;
     @Mock
-    private BatteryStats.Timer mTimer;
+    private BatteryStats.Timer mForegroundActivityTimer;
+    @Mock
+    private BatteryUtils mBatteryUtils;
     private Context mContext;
     private Preference mForegroundPreference;
     private Preference mBackgroundPreference;
@@ -171,10 +180,11 @@
         doReturn(APP_LABEL).when(mBatteryEntry).getLabel();
         doReturn(BACKGROUND_TIME_US).when(mUid).getProcessStateTime(
                 eq(BatteryStats.Uid.PROCESS_STATE_BACKGROUND), anyLong(), anyInt());
-        doReturn(FOREGROUND_TIME_US).when(mUid).getProcessStateTime(
+        doReturn(PROCSTATE_TOP_TIME_US).when(mUid).getProcessStateTime(
                 eq(BatteryStats.Uid.PROCESS_STATE_TOP), anyLong(), anyInt());
-        doReturn(mTimer).when(mUid).getForegroundActivityTimer();
-        doReturn(FOREGROUND_TIME_US).when(mTimer).getTotalTimeLocked(anyLong(), anyInt());
+        doReturn(mForegroundActivityTimer).when(mUid).getForegroundActivityTimer();
+        doReturn(FOREGROUND_ACTIVITY_TIME_US).when(mForegroundActivityTimer)
+                .getTotalTimeLocked(anyLong(), anyInt());
         ReflectionHelpers.setField(mBatteryEntry, "sipper", mBatterySipper);
         mBatteryEntry.iconId = ICON_ID;
         mBatterySipper.uidObj = mUid;
@@ -189,6 +199,10 @@
         doReturn(mPackageManager).when(mTestActivity).getPackageManager();
         doReturn(mAppOpsManager).when(mTestActivity).getSystemService(Context.APP_OPS_SERVICE);
 
+        mBatteryUtils = spy(BatteryUtils.getInstance(mTestActivity));
+        doReturn(FOREGROUND_SERVICE_TIME_US).when(mBatteryUtils).getForegroundServiceTotalTimeUs(
+                any(BatteryStats.Uid.class), anyLong());
+
         final ArgumentCaptor<Bundle> captor = ArgumentCaptor.forClass(Bundle.class);
 
         Answer<Void> callable = invocation -> {
@@ -263,8 +277,8 @@
 
     @Test
     public void testStartBatteryDetailPage_hasBasicData() {
-        AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, null, mBatteryStatsHelper, 0,
-                mBatteryEntry, USAGE_PERCENT, mAnomalies);
+        AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, mBatteryUtils, null,
+                mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT, mAnomalies);
 
         assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_UID)).isEqualTo(UID);
         assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_BACKGROUND_TIME)).isEqualTo(
@@ -282,8 +296,8 @@
         mBatterySipper.drainType = BatterySipper.DrainType.PHONE;
         mBatterySipper.usageTimeMs = PHONE_FOREGROUND_TIME_MS;
 
-        AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, null, mBatteryStatsHelper, 0,
-                mBatteryEntry, USAGE_PERCENT, null);
+        AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, mBatteryUtils, null,
+                mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT, null);
 
         assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_UID)).isEqualTo(UID);
         assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_FOREGROUND_TIME)).isEqualTo(
@@ -300,8 +314,8 @@
     public void testStartBatteryDetailPage_NormalApp() {
         mBatterySipper.mPackages = PACKAGE_NAME;
         mBatteryEntry.defaultPackageName = PACKAGE_NAME[0];
-        AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, null, mBatteryStatsHelper, 0,
-                mBatteryEntry, USAGE_PERCENT, mAnomalies);
+        AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, mBatteryUtils, null,
+                mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT, mAnomalies);
 
         assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME)).isEqualTo(
                 PACKAGE_NAME[0]);
@@ -312,8 +326,8 @@
     @Test
     public void testStartBatteryDetailPage_SystemApp() {
         mBatterySipper.mPackages = null;
-        AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, null, mBatteryStatsHelper, 0,
-                mBatteryEntry, USAGE_PERCENT, null);
+        AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, mBatteryUtils, null,
+                mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT, null);
 
         assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_LABEL)).isEqualTo(APP_LABEL);
         assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_ICON_ID)).isEqualTo(ICON_ID);
@@ -327,8 +341,8 @@
         final int appUid = 1010019;
         mBatterySipper.mPackages = PACKAGE_NAME;
         doReturn(appUid).when(mBatterySipper).getUid();
-        AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, null, mBatteryStatsHelper, 0,
-                mBatteryEntry, USAGE_PERCENT, null);
+        AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, mBatteryUtils, null,
+                mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT, null);
 
         verify(mTestActivity).startPreferencePanelAsUser(
                 nullable(Fragment.class), nullable(String.class), nullable(Bundle.class), anyInt(),
@@ -355,12 +369,22 @@
     }
 
     @Test
-    public void testStartBatteryDetailPage_defaultPackageNull_choseFromBatterySipper() {
+    public void testStartBatteryDetailPage_batteryEntryNotExisted_extractUidFromPackageName() throws
+            PackageManager.NameNotFoundException{
+        doReturn(UID).when(mPackageManager).getPackageUid(PACKAGE_NAME[0], 0 /* no flag */);
+
+        AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, null, PACKAGE_NAME[0]);
+
+        assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_UID)).isEqualTo(UID);
+    }
+
+    @Test
+    public void testStartBatteryDetailPage_defaultPackageNull_chooseFromBatterySipper() {
         mBatteryEntry.defaultPackageName = null;
         mBatteryEntry.sipper.mPackages = PACKAGE_NAME;
 
-        AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, null, mBatteryStatsHelper, 0,
-                mBatteryEntry, USAGE_PERCENT, null);
+        AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, mBatteryUtils, null,
+                mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT, null);
 
         assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME)).isEqualTo(
                 PACKAGE_NAME[0]);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
index 4f48945..91f4a2b 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
@@ -17,14 +17,17 @@
 package com.android.settings.fuelgauge;
 
 import android.app.AppOpsManager;
+import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
+import android.os.UserManager;
 import android.support.v14.preference.SwitchPreference;
 
 import com.android.settings.R;
 import com.android.settings.TestConfig;
+import com.android.settings.enterprise.DevicePolicyManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -62,6 +65,12 @@
     private ApplicationInfo mHighApplicationInfo;
     @Mock
     private ApplicationInfo mLowApplicationInfo;
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private DevicePolicyManager mDevicePolicyManager;
+    @Mock
+    private DevicePolicyManagerWrapper mDevicePolicyManagerWrapper;
     private BackgroundActivityPreferenceController mController;
     private SwitchPreference mPreference;
     private Context mShadowContext;
@@ -73,6 +82,9 @@
         mShadowContext = RuntimeEnvironment.application;
         when(mContext.getPackageManager()).thenReturn(mPackageManager);
         when(mContext.getSystemService(Context.APP_OPS_SERVICE)).thenReturn(mAppOpsManager);
+        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+        when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE)).thenReturn(
+                mDevicePolicyManager);
         when(mPackageManager.getPackagesForUid(UID_NORMAL)).thenReturn(PACKAGES_NORMAL);
         when(mPackageManager.getPackagesForUid(UID_SPECIAL)).thenReturn(PACKAGES_SPECIAL);
 
@@ -86,6 +98,7 @@
         mPreference = new SwitchPreference(mShadowContext);
         mController = spy(new BackgroundActivityPreferenceController(mContext, UID_NORMAL));
         mController.isAvailable();
+        mController.mDpm = mDevicePolicyManagerWrapper;
     }
 
     @Test
@@ -181,6 +194,7 @@
     @Test
     public void testMultiplePackages_ReturnStatusForTargetPackage() {
         mController = new BackgroundActivityPreferenceController(mContext, UID_SPECIAL);
+        mController.mDpm = mDevicePolicyManagerWrapper;
         when(mAppOpsManager
                 .checkOpNoThrow(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_SPECIAL, LOW_SDK_PACKAGE))
                 .thenReturn(AppOpsManager.MODE_ALLOWED);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java
index 632d549..a461f46 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java
@@ -21,6 +21,7 @@
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Handler;
+import android.os.Process;
 import android.os.UserManager;
 
 import com.android.internal.os.BatterySipper;
@@ -46,9 +47,12 @@
 public class BatteryEntryTest {
 
     private static final int APP_UID = 123;
+    private static final int SYSTEM_UID = Process.SYSTEM_UID;
     private static final String APP_DEFAULT_PACKAGE_NAME = "com.android.test";
     private static final String APP_LABEL = "Test App Name";
     private static final String HIGH_DRAIN_PACKAGE = "com.android.test.screen";
+    private static final String ANDROID_PACKAGE = "android";
+    private static final String[] SYSTEM_PACKAGES = {HIGH_DRAIN_PACKAGE, ANDROID_PACKAGE};
 
     @Rule public MockitoRule mocks = MockitoJUnit.rule();
 
@@ -84,6 +88,18 @@
         return sipper;
     }
 
+    private BatteryEntry createBatteryEntryForSystem() {
+        return new BatteryEntry(mockContext, mockHandler, mockUserManager, createSipperForSystem());
+    }
+
+    private BatterySipper createSipperForSystem() {
+        BatterySipper sipper =
+                new BatterySipper(DrainType.APP, new FakeUid(SYSTEM_UID), 0 /* power use */);
+        sipper.packageWithHighestDrain = HIGH_DRAIN_PACKAGE;
+        sipper.mPackages = SYSTEM_PACKAGES;
+        return sipper;
+    }
+
     @Test
     public void batteryEntryForApp_shouldSetDefaultPackageNameAndLabel() throws Exception {
         BatteryEntry entry = createBatteryEntryForApp();
@@ -118,7 +134,22 @@
             new String[]{APP_DEFAULT_PACKAGE_NAME, "package2", "package3"});
 
         BatteryEntry entry = createBatteryEntryForApp();
-        
+
         assertThat(entry.getLabel()).isEqualTo(HIGH_DRAIN_PACKAGE);
     }
+
+    @Test
+    public void extractPackageFromSipper_systemSipper_returnSystemPackage() {
+        BatteryEntry entry = createBatteryEntryForSystem();
+
+        assertThat(entry.extractPackagesFromSipper(entry.sipper)).isEqualTo(
+                new String[]{ANDROID_PACKAGE});
+    }
+
+    @Test
+    public void extractPackageFromSipper_normalSipper_returnDefaultPakcage() {
+        BatteryEntry entry = createBatteryEntryForApp();
+
+        assertThat(entry.extractPackagesFromSipper(entry.sipper)).isEqualTo(entry.sipper.mPackages);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
index 013d379..e434bb3 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
@@ -17,6 +17,15 @@
 
 package com.android.settings.fuelgauge;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -27,11 +36,10 @@
 import android.widget.TextView;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.LayoutPreference;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;
 import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
 import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -45,23 +53,12 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH,
         sdk = TestConfig.SDK_VERSION,
         shadows = {
                 SettingsShadowResources.class,
                 SettingsShadowResources.SettingsShadowTheme.class,
-                ShadowDynamicIndexableContentMonitor.class,
                 ShadowEntityHeaderController.class
         })
 public class BatteryHeaderPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
index 9bd0b6f..d82a89b 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
@@ -123,15 +123,18 @@
     }
 
     @Test
-    public void testGetBatteryInfo_pluggedIn_dischargingFalse() {
+    public void testGetBatteryInfo_pluggedInUsingShortString_usesCorrectData() {
+        doReturn(TEST_CHARGE_TIME_REMAINING).when(mBatteryStats).computeChargeTimeRemaining(
+                anyLong());
         BatteryInfo info = BatteryInfo.getBatteryInfoOld(mContext, mChargingBatteryBroadcast,
                 mBatteryStats, SystemClock.elapsedRealtime() * 1000, true /* shortString */);
 
         assertThat(info.discharging).isEqualTo(false);
+        assertThat(info.chargeLabel.toString()).isEqualTo("50% - 1m until fully charged");
     }
 
     @Test
-    public void testGetBatteryInfo_basedOnUsageTrue_usesUsageString() {
+    public void testGetBatteryInfo_basedOnUsageTrue_usesCorrectString() {
         BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
                 mBatteryStats, SystemClock.elapsedRealtime() * 1000, false /* shortString */,
                 1000, true /* basedOnUsage */);
@@ -139,8 +142,10 @@
                 mBatteryStats, SystemClock.elapsedRealtime() * 1000, true /* shortString */,
                 1000, true /* basedOnUsage */);
 
+        // We only add special mention for the long string
         assertThat(info.remainingLabel.toString()).contains(ENHANCED_STRING_SUFFIX);
-        assertThat(info2.remainingLabel.toString()).contains(ENHANCED_STRING_SUFFIX);
+        // shortened string should not have extra text
+        assertThat(info2.remainingLabel.toString()).doesNotContain(ENHANCED_STRING_SUFFIX);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java
index e3a94d2..3a1fad0 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java
@@ -16,15 +16,17 @@
 package com.android.settings.fuelgauge;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 
 import android.content.Context;
 import android.graphics.ColorFilter;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.testutils.shadow.SettingsShadowResources.SettingsShadowTheme;
-import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -34,10 +36,6 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 // TODO: Consider making the shadow class set global using a robolectric.properties file.
 @Config(manifest = TestConfig.MANIFEST_PATH,
@@ -45,7 +43,6 @@
         shadows = {
                 SettingsShadowResources.class,
                 SettingsShadowTheme.class,
-                ShadowDynamicIndexableContentMonitor.class
         })
 public class BatteryMeterViewTest {
     private static final int BATTERY_LEVEL = 100;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
index aa19055..c08b01d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
@@ -195,6 +195,8 @@
         doReturn(mAppOpsManager).when(shadowContext).getSystemService(Context.APP_OPS_SERVICE);
         mBatteryUtils = spy(new BatteryUtils(shadowContext));
         mBatteryUtils.mPowerUsageFeatureProvider = mProvider;
+        doReturn(0L).when(mBatteryUtils).getForegroundServiceTotalTimeUs(
+                any(BatteryStats.Uid.class), anyLong());
     }
 
     @Test
@@ -453,7 +455,7 @@
         if (!isUidNull) {
             final BatteryStats.Uid uid = mock(BatteryStats.Uid.class, RETURNS_DEEP_STUBS);
             doReturn(topTime).when(mBatteryUtils).getProcessTimeMs(
-                    eq(BatteryUtils.StatusType.FOREGROUND), eq(uid), anyInt());
+                    eq(BatteryUtils.StatusType.SCREEN_USAGE), eq(uid), anyInt());
             doReturn(uidCode).when(uid).getUid();
             sipper.uidObj = uid;
         }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java
index 806acf3..1259670 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java
@@ -15,10 +15,6 @@
  */
 package com.android.settings.fuelgauge;
 
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.verify;
-
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.VectorDrawable;
@@ -29,8 +25,8 @@
 import android.widget.TextView;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -39,6 +35,8 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+import static com.google.common.truth.Truth.assertThat;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class PowerGaugePreferenceTest {
@@ -55,7 +53,7 @@
         MockitoAnnotations.initMocks(this);
 
         mContext = RuntimeEnvironment.application;
-        mRootView = LayoutInflater.from(mContext).inflate(R.layout.preference_material_settings,
+        mRootView = LayoutInflater.from(mContext).inflate(R.layout.preference,
                 null);
         mWidgetView = LayoutInflater.from(mContext).inflate(R.layout.preference_widget_summary,
                 null);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
index bf89cac..3643013 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
@@ -31,6 +31,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.net.ConnectivityManager;
 import android.os.UserManager;
 import android.support.v7.preference.PreferenceCategory;
 import android.support.v7.preference.PreferenceGroup;
@@ -91,6 +92,8 @@
     private BatteryHistoryPreference mHistPref;
     @Mock
     private PreferenceGroup mUsageListGroup;
+    @Mock
+    private ConnectivityManager mConnectivityManager;
     private PowerUsageAdvanced mPowerUsageAdvanced;
     private PowerUsageData mPowerUsageData;
     private Context mShadowContext;
@@ -127,8 +130,10 @@
         mPowerUsageAdvanced.setPowerUsageFeatureProvider(mPowerUsageFeatureProvider);
         mPowerUsageAdvanced.setUserManager(mUserManager);
         mPowerUsageAdvanced.setBatteryUtils(BatteryUtils.getInstance(mShadowContext));
+        when(mShadowContext.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn(
+                mConnectivityManager);
 
-        mPowerUsageData = new PowerUsageData(UsageType.SYSTEM);
+        mPowerUsageData = new PowerUsageData(UsageType.USER);
         mMaxBatterySipper.totalPowerMah = TYPE_BLUETOOTH_USAGE;
         mMaxBatterySipper.drainType = DrainType.BLUETOOTH;
         mNormalBatterySipper.drainType = DrainType.SCREEN;
@@ -297,6 +302,24 @@
     }
 
     @Test
+    public void testShouldHideCategory_typeCellWhileNotSupported_returnTrue() {
+        mPowerUsageData.usageType = UsageType.CELL;
+        doReturn(false).when(mConnectivityManager).isNetworkSupported(
+                ConnectivityManager.TYPE_MOBILE);
+
+        assertThat(mPowerUsageAdvanced.shouldHideCategory(mPowerUsageData)).isTrue();
+    }
+
+    @Test
+    public void testShouldHideCategory_typeCellWhileSupported_returnFalse() {
+        mPowerUsageData.usageType = UsageType.CELL;
+        doReturn(true).when(mConnectivityManager).isNetworkSupported(
+                ConnectivityManager.TYPE_MOBILE);
+
+        assertThat(mPowerUsageAdvanced.shouldHideCategory(mPowerUsageData)).isFalse();
+    }
+
+    @Test
     public void testShouldHideCategory_typeUserAndMoreThanOne_returnFalse() {
         mPowerUsageData.usageType = UsageType.USER;
         doReturn(2).when(mUserManager).getUserCount();
@@ -319,6 +342,13 @@
     }
 
     @Test
+    public void testShouldHideSummary_typeSystem_returnTrue() {
+        mPowerUsageData.usageType = UsageType.SYSTEM;
+
+        assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isTrue();
+    }
+
+    @Test
     public void testShouldHideSummary_typeWifi_returnTrue() {
         mPowerUsageData.usageType = UsageType.WIFI;
 
@@ -341,7 +371,7 @@
 
     @Test
     public void testShouldHideSummary_typeNormal_returnFalse() {
-        mPowerUsageData.usageType = UsageType.SYSTEM;
+        mPowerUsageData.usageType = UsageType.IDLE;
 
         assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isFalse();
     }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
index d76d64b..48a48b1 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
@@ -18,9 +18,7 @@
 import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_ADDITIONAL_BATTERY_INFO;
 import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_HIGH_POWER_APPS;
 import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_TOGGLE_APPS;
-
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyLong;
@@ -60,14 +58,13 @@
 import com.android.settings.TestConfig;
 import com.android.settings.Utils;
 import com.android.settings.applications.LayoutPreference;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.fuelgauge.anomaly.Anomaly;
 import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -93,7 +90,6 @@
         shadows = {
                 SettingsShadowResources.class,
                 SettingsShadowResources.SettingsShadowTheme.class,
-                ShadowDynamicIndexableContentMonitor.class
         })
 public class PowerUsageSummaryTest {
     private static final String[] PACKAGE_NAMES = {"com.app1", "com.app2"};
@@ -337,13 +333,13 @@
     @Test
     public void testSetUsageSummary_timeMoreThanOneMinute_normalApp_setScreenSummary() {
         mNormalBatterySipper.usageTimeMs = 2 * DateUtils.MINUTE_IN_MILLIS;
-        doReturn(mRealContext.getText(R.string.battery_screen_usage)).when(mFragment).getText(
-                R.string.battery_screen_usage);
+        doReturn(mRealContext.getText(R.string.battery_used_for)).when(mFragment).getText(
+                R.string.battery_used_for);
         doReturn(mRealContext).when(mFragment).getContext();
 
         mFragment.setUsageSummary(mPreference, mNormalBatterySipper);
 
-        assertThat(mPreference.getSummary().toString()).isEqualTo("Screen usage 2m");
+        assertThat(mPreference.getSummary().toString()).isEqualTo("Used for 2m");
     }
 
     @Test
@@ -455,7 +451,7 @@
                 fragment.getPreferenceScreenResId());
         final List<String> preferenceKeys = new ArrayList<>();
 
-        for (PreferenceController controller : fragment.getPreferenceControllers(context)) {
+        for (AbstractPreferenceController controller : fragment.getPreferenceControllers(context)) {
             preferenceKeys.add(controller.getPreferenceKey());
         }
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java
index 914cc2f..8d07629 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java
@@ -40,11 +40,13 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class AnomalyDetectionPolicyTest {
-    private static final String ANOMALY_DETECTION_CONSTANTS_VALUE = "anomaly_detection_enabled=true"
+    private static final String ANOMALY_DETECTION_CONSTANTS_VALUE =
+            "anomaly_detection_enabled=true"
             + ",wakelock_enabled=false"
             + ",wakelock_threshold=3000"
             + ",wakeup_alarm_enabled=true"
             + ",wakeup_alarm_threshold=100"
+            + ",wakeup_blacklisted_tags=tag1:tag2:with%2Ccomma:with%3Acolon"
             + ",bluetooth_scan_enabled=true"
             + ",bluetooth_scan_threshold=2000";
     private Context mContext;
@@ -58,7 +60,7 @@
     }
 
     @Test
-    public void testInit_containsDataFromSettings() {
+    public void testInit_usesConfigValues() {
         AnomalyDetectionPolicy anomalyDetectionPolicy = createAnomalyPolicyWithConfig();
 
         assertThat(anomalyDetectionPolicy.anomalyDetectionEnabled).isTrue();
@@ -66,12 +68,14 @@
         assertThat(anomalyDetectionPolicy.wakeLockThreshold).isEqualTo(3000);
         assertThat(anomalyDetectionPolicy.wakeupAlarmDetectionEnabled).isTrue();
         assertThat(anomalyDetectionPolicy.wakeupAlarmThreshold).isEqualTo(100);
+        assertThat(anomalyDetectionPolicy.wakeupBlacklistedTags)
+                .containsExactly("tag1", "tag2", "with,comma", "with:colon");
         assertThat(anomalyDetectionPolicy.bluetoothScanDetectionEnabled).isTrue();
         assertThat(anomalyDetectionPolicy.bluetoothScanThreshold).isEqualTo(2000);
     }
 
     @Test
-    public void testInit_containsDefaultData() {
+    public void testInit_defaultValues() {
         Settings.Global.putString(mContext.getContentResolver(),
                 Settings.Global.ANOMALY_DETECTION_CONSTANTS, "");
         // Mock it to avoid noSuchMethodError
@@ -81,18 +85,19 @@
         AnomalyDetectionPolicy anomalyDetectionPolicy = new AnomalyDetectionPolicy(mContext,
                 mKeyValueListParserWrapper);
 
-        assertThat(anomalyDetectionPolicy.anomalyDetectionEnabled).isTrue();
-        assertThat(anomalyDetectionPolicy.wakeLockDetectionEnabled).isTrue();
+        assertThat(anomalyDetectionPolicy.anomalyDetectionEnabled).isFalse();
+        assertThat(anomalyDetectionPolicy.wakeLockDetectionEnabled).isFalse();
         assertThat(anomalyDetectionPolicy.wakeLockThreshold).isEqualTo(DateUtils.HOUR_IN_MILLIS);
         assertThat(anomalyDetectionPolicy.wakeupAlarmDetectionEnabled).isFalse();
-        assertThat(anomalyDetectionPolicy.wakeupAlarmThreshold).isEqualTo(60);
-        assertThat(anomalyDetectionPolicy.bluetoothScanDetectionEnabled).isTrue();
+        assertThat(anomalyDetectionPolicy.wakeupAlarmThreshold).isEqualTo(10);
+        assertThat(anomalyDetectionPolicy.wakeupBlacklistedTags).isNull();
+        assertThat(anomalyDetectionPolicy.bluetoothScanDetectionEnabled).isFalse();
         assertThat(anomalyDetectionPolicy.bluetoothScanThreshold).isEqualTo(
                 30 * DateUtils.MINUTE_IN_MILLIS);
     }
 
     @Test
-    public void testIsAnomalyDetectorEnabled() {
+    public void testIsAnomalyDetectorEnabled_usesConfigValues() {
         AnomalyDetectionPolicy anomalyDetectionPolicy = createAnomalyPolicyWithConfig();
 
         assertThat(anomalyDetectionPolicy.isAnomalyDetectorEnabled(
@@ -103,18 +108,37 @@
                 Anomaly.AnomalyType.BLUETOOTH_SCAN)).isTrue();
     }
 
+    @Test
+    public void testIsAnomalyDetectorEnabled_usesDefaultValues() {
+        Settings.Global.putString(mContext.getContentResolver(),
+                Settings.Global.ANOMALY_DETECTION_CONSTANTS, "");
+        // Mock it to avoid noSuchMethodError
+        doReturn(true).when(mKeyValueListParserWrapper).getBoolean(anyString(), eq(true));
+        doReturn(false).when(mKeyValueListParserWrapper).getBoolean(anyString(), eq(false));
+
+        AnomalyDetectionPolicy anomalyDetectionPolicy = new AnomalyDetectionPolicy(mContext,
+                mKeyValueListParserWrapper);
+
+        assertThat(anomalyDetectionPolicy.isAnomalyDetectorEnabled(
+                Anomaly.AnomalyType.WAKE_LOCK)).isFalse();
+        assertThat(anomalyDetectionPolicy.isAnomalyDetectorEnabled(
+                Anomaly.AnomalyType.WAKEUP_ALARM)).isFalse();
+        assertThat(anomalyDetectionPolicy.isAnomalyDetectorEnabled(
+                Anomaly.AnomalyType.BLUETOOTH_SCAN)).isFalse();
+    }
+
     private AnomalyDetectionPolicy createAnomalyPolicyWithConfig() {
         Settings.Global.putString(mContext.getContentResolver(),
                 Settings.Global.ANOMALY_DETECTION_CONSTANTS, ANOMALY_DETECTION_CONSTANTS_VALUE);
         // Mock it to avoid noSuchMethodError
         doReturn(true).when(mKeyValueListParserWrapper).getBoolean(
-                AnomalyDetectionPolicy.KEY_ANOMALY_DETECTION_ENABLED, true);
+                AnomalyDetectionPolicy.KEY_ANOMALY_DETECTION_ENABLED, false);
         doReturn(false).when(mKeyValueListParserWrapper).getBoolean(
-                AnomalyDetectionPolicy.KEY_WAKELOCK_DETECTION_ENABLED, true);
+                AnomalyDetectionPolicy.KEY_WAKELOCK_DETECTION_ENABLED, false);
         doReturn(true).when(mKeyValueListParserWrapper).getBoolean(
                 AnomalyDetectionPolicy.KEY_WAKEUP_ALARM_DETECTION_ENABLED, false);
         doReturn(true).when(mKeyValueListParserWrapper).getBoolean(
-                AnomalyDetectionPolicy.KEY_BLUETOOTH_SCAN_DETECTION_ENABLED, true);
+                AnomalyDetectionPolicy.KEY_BLUETOOTH_SCAN_DETECTION_ENABLED, false);
 
         return new AnomalyDetectionPolicy(mContext, mKeyValueListParserWrapper);
     }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java
index 72d8b69..8297e81 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java
@@ -107,6 +107,16 @@
     }
 
     @Test
+    public void testUpdateAnomalySummaryPreference_emptyAnomaly_preferenceInvisible() {
+        mPreference.setVisible(true);
+        mAnomalyList.clear();
+
+        mAnomalySummaryPreferenceController.updateAnomalySummaryPreference(mAnomalyList);
+
+        assertThat(mPreference.isVisible()).isFalse();
+    }
+
+    @Test
     public void testUpdateAnomalySummaryPreference_multipleAnomalies_showCorrectSummary() {
         mAnomalyList.add(createTestAnomaly());
         mAnomalyList.add(createTestAnomaly());
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java
index 55be734..13a5ab8 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java
@@ -30,6 +30,7 @@
 import android.os.Build;
 import android.text.format.DateUtils;
 import android.util.ArrayMap;
+import android.util.ArraySet;
 
 import com.android.internal.os.BatterySipper;
 import com.android.internal.os.BatteryStatsHelper;
@@ -52,6 +53,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -69,6 +71,7 @@
             1 * DateUtils.HOUR_IN_MILLIS + 10 * DateUtils.MINUTE_IN_MILLIS;
     private static final int ANOMALY_WAKEUP_COUNT = 500;
     private static final int NORMAL_WAKEUP_COUNT = 61;
+    private static final int BLACKLISTED_WAKEUP_COUNT = 37;
     private static final int ANOMALY_WAKEUP_FREQUENCY = 428; // count per hour
     @Mock
     private BatteryStatsHelper mBatteryStatsHelper;
@@ -87,12 +90,12 @@
     @Mock
     private BatteryUtils mBatteryUtils;
     @Mock
-    private ApplicationInfo mApplicationInfo;
-    @Mock
     private BatteryStats.Uid.Pkg mPkg;
     @Mock
     private BatteryStats.Counter mCounter;
     @Mock
+    private BatteryStats.Counter mCounter2;
+    @Mock
     private AnomalyDetectionPolicy mPolicy;
     @Mock
     private AnomalyAction mAnomalyAction;
@@ -111,6 +114,9 @@
 
         mContext = spy(RuntimeEnvironment.application);
         ReflectionHelpers.setField(mPolicy, "wakeupAlarmThreshold", 60);
+        final Set<String> blacklistedTags = new ArraySet<>();
+        blacklistedTags.add("blacklistedTag");
+        ReflectionHelpers.setField(mPolicy, "wakeupBlacklistedTags", blacklistedTags);
 
         doReturn(false).when(mBatteryUtils).shouldHideSipper(any());
         doReturn(RUNNING_TIME_MS).when(mBatteryUtils).calculateRunningTimeBasedOnStatsType(any(),
@@ -207,4 +213,20 @@
         assertThat(mWakeupAlarmAnomalyDetector.getWakeupAlarmCountFromUid(mAnomalyUid)).isEqualTo(
                 2 * NORMAL_WAKEUP_COUNT);
     }
+
+    @Test
+    public void testGetWakeupAlarmCountFromUid_filterOutBlacklistedTags() {
+        final ArrayMap<String, BatteryStats.Uid.Pkg> packageStats = new ArrayMap<>();
+        final ArrayMap<String, BatteryStats.Counter> alarms = new ArrayMap<>();
+        doReturn(alarms).when(mPkg).getWakeupAlarmStats();
+        doReturn(NORMAL_WAKEUP_COUNT).when(mCounter).getCountLocked(anyInt());
+        doReturn(BLACKLISTED_WAKEUP_COUNT).when(mCounter2).getCountLocked(anyInt());
+        doReturn(packageStats).when(mAnomalyUid).getPackageStats();
+        packageStats.put("", mPkg);
+        alarms.put("allowedTag", mCounter);
+        alarms.put("blacklistedTag", mCounter2);
+
+        assertThat(mWakeupAlarmAnomalyDetector.getWakeupAlarmCountFromUid(mAnomalyUid)).isEqualTo(
+                NORMAL_WAKEUP_COUNT);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java
similarity index 67%
rename from tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java
index b2d3596..7633ce9 100644
--- a/tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java
@@ -16,9 +16,6 @@
 
 package com.android.settings.gestures;
 
-import static android.provider.Settings.Secure.ASSIST_GESTURE_ENABLED;
-
-import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.when;
@@ -26,17 +23,16 @@
 import android.content.ContentResolver;
 import android.content.Context;
 import android.provider.Settings;
-
 import android.provider.Settings.Secure;
+
 import com.android.settings.TestConfig;
-import com.android.settings.display.AutoBrightnessPreferenceController;
 import com.android.settings.search.InlinePayload;
 import com.android.settings.search.InlineSwitchPayload;
 import com.android.settings.search.ResultPayload;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
 import com.android.settings.testutils.shadow.ShadowSecureSettings;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -45,16 +41,19 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AssistGesturePreferenceControllerTest {
+@Config(
+    manifest = TestConfig.MANIFEST_PATH,
+    sdk = TestConfig.SDK_VERSION,
+    shadows = ShadowSecureSettings.class
+)
+public class AssistGestureSettingsPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     private FakeFeatureFactory mFactory;
-    private AssistGesturePreferenceController mController;
+    private AssistGestureSettingsPreferenceController mController;
 
     private static final String KEY_ASSIST = "gesture_assist";
 
@@ -63,7 +62,8 @@
         MockitoAnnotations.initMocks(this);
         FakeFeatureFactory.setupForTest(mContext);
         mFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mController = new AssistGesturePreferenceController(mContext, null, KEY_ASSIST, false);
+        mController = new AssistGestureSettingsPreferenceController(mContext, null, KEY_ASSIST,
+                false);
     }
 
     @Test
@@ -80,37 +80,16 @@
     }
 
     @Test
-    public void testSwitchEnabled_configIsSet_shouldReturnTrue() {
-        // Set the setting to be enabled.
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
-        Settings.System.putInt(context.getContentResolver(), ASSIST_GESTURE_ENABLED, 1);
-        mController = new AssistGesturePreferenceController(context, null, KEY_ASSIST, false);
-
-        assertThat(mController.isSwitchPrefEnabled()).isTrue();
-    }
-
-    @Test
-    public void testSwitchEnabled_configIsNotSet_shouldReturnFalse() {
-        // Set the setting to be disabled.
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
-        Settings.System.putInt(context.getContentResolver(), ASSIST_GESTURE_ENABLED, 0);
-        mController = new AssistGesturePreferenceController(context, null, KEY_ASSIST, false);
-
-        assertThat(mController.isSwitchPrefEnabled()).isFalse();
-    }
-
-    @Test
     public void testPreferenceController_ProperResultPayloadType() {
         final Context context = RuntimeEnvironment.application;
-        AssistGesturePreferenceController controller =
-                new AssistGesturePreferenceController(context, null /* lifecycle */, KEY_ASSIST,
-                        false /* assistOnly */);
+        AssistGestureSettingsPreferenceController controller =
+                new AssistGestureSettingsPreferenceController(context, null /* lifecycle */,
+                        KEY_ASSIST, false /* assistOnly */);
         ResultPayload payload = controller.getResultPayload();
         assertThat(payload).isInstanceOf(InlineSwitchPayload.class);
     }
 
     @Test
-    @Config(shadows = ShadowSecureSettings.class)
     public void testSetValue_updatesCorrectly() {
         int newValue = 1;
         ContentResolver resolver = mContext.getContentResolver();
@@ -123,7 +102,6 @@
     }
 
     @Test
-    @Config(shadows = ShadowSecureSettings.class)
     public void testGetValue_correctValueReturned() {
         int currentValue = 1;
         ContentResolver resolver = mContext.getContentResolver();
diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java
index 49fd214..1f5c9be 100644
--- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java
@@ -16,42 +16,42 @@
 
 package com.android.settings.gestures;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
+import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.core.PreferenceController;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
 import java.util.List;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class AssistGestureSettingsTest {
     @Mock
     private Context mContext;
     private FakeFeatureFactory mFakeFeatureFactory;
-    private AssistGestureFeatureProvider mFeatureProvider;
     private AssistGestureSettings mSettings;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mFakeFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mFeatureProvider = mFakeFeatureFactory.getAssistGestureFeatureProvider();
         mSettings = new AssistGestureSettings();
     }
 
@@ -62,13 +62,6 @@
     }
 
     @Test
-    public void testGetPreferenceControllers_shouldAllBeCreated() {
-        final List<PreferenceController> controllers =
-            mSettings.getPreferenceControllers(mContext);
-        assertThat(controllers.isEmpty()).isFalse();
-    }
-
-    @Test
     public void testSearchIndexProvider_shouldIndexResource() {
         final List<SearchIndexableResource> indexRes =
                 AssistGestureSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
@@ -78,5 +71,15 @@
         assertThat(indexRes).isNotNull();
         assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
     }
+
+    @Test
+    public void testSearchIndexProvider_noSensor_shouldDisablePageSearch() {
+        when(mFakeFeatureFactory.assistGestureFeatureProvider.isSensorAvailable(any(Context.class)))
+                .thenReturn(false);
+
+        assertThat(AssistGestureSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
+                RuntimeEnvironment.application))
+                .contains("gesture_assist_settings_page");
+    }
 }
 
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
index f9ac02e..aa8121c 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
@@ -26,7 +26,6 @@
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowSecureSettings;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -65,11 +64,6 @@
         mController = new DoubleTwistPreferenceController(mContext, null, KEY_DOUBLE_TWIST);
     }
 
-    @After
-    public void tearDown() {
-        ShadowSecureSettings.clear();
-    }
-
     @Test
     public void isAvailable_hasSensor_shouldReturnTrue() {
         // Mock sensors
diff --git a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
index 8b4ef61..61b6909 100644
--- a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.gestures;
 
 import android.content.Context;
+import android.os.Bundle;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 import android.support.v7.preference.TwoStatePreference;
@@ -34,10 +35,12 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
+import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -84,30 +87,73 @@
     }
 
     @Test
-    public void onStart_shouldStartVideoPreference() {
+    public void onResume_shouldStartVideoPreferenceWithVideoPauseState() {
         final VideoPreference videoPreference = mock(VideoPreference.class);
         when(mScreen.findPreference(mController.getVideoPrefKey())).thenReturn(videoPreference);
         mController.mIsPrefAvailable = true;
 
         mController.displayPreference(mScreen);
-        mController.onStart();
+        final Bundle savedState = new Bundle();
 
-        verify(videoPreference).onViewVisible();
+        mController.onCreate(null);
+        mController.onResume();
+        verify(videoPreference).onViewVisible(false);
+
+        reset(videoPreference);
+        savedState.putBoolean(mController.KEY_VIDEO_PAUSED, true);
+        mController.onCreate(savedState);
+        mController.onResume();
+        verify(videoPreference).onViewVisible(true);
+
+        reset(videoPreference);
+        savedState.putBoolean(mController.KEY_VIDEO_PAUSED, false);
+        mController.onCreate(savedState);
+        mController.onResume();
+        verify(videoPreference).onViewVisible(false);
     }
 
     @Test
-    public void onStop_shouldStopVideoPreference() {
+    public void onPause_shouldStopVideoPreference() {
         final VideoPreference videoPreference = mock(VideoPreference.class);
         when(mScreen.findPreference(mController.getVideoPrefKey())).thenReturn(videoPreference);
         mController.mIsPrefAvailable = true;
 
         mController.displayPreference(mScreen);
-        mController.onStop();
+        mController.onPause();
 
         verify(videoPreference).onViewInvisible();
     }
 
     @Test
+    public void onPause_shouldUpdateVideoPauseState() {
+        final VideoPreference videoPreference = mock(VideoPreference.class);
+        when(mScreen.findPreference(mController.getVideoPrefKey())).thenReturn(videoPreference);
+        mController.mIsPrefAvailable = true;
+        mController.displayPreference(mScreen);
+
+        when(videoPreference.isVideoPaused()).thenReturn(true);
+        mController.onPause();
+        assertThat(mController.mVideoPaused).isTrue();
+
+        when(videoPreference.isVideoPaused()).thenReturn(false);
+        mController.onPause();
+        assertThat(mController.mVideoPaused).isFalse();
+    }
+
+    @Test
+    public void onSaveInstanceState_shouldSaveVideoPauseState() {
+        final Bundle outState = mock(Bundle.class);
+
+        mController.mVideoPaused = true;
+        mController.onSaveInstanceState(outState);
+        verify(outState).putBoolean(mController.KEY_VIDEO_PAUSED, true);
+
+        mController.mVideoPaused = false;
+        mController.onSaveInstanceState(outState);
+        verify(outState).putBoolean(mController.KEY_VIDEO_PAUSED, false);
+    }
+
+    @Test
     public void updateState_preferenceSetCheckedWhenSettingIsOn() {
         // Mock a TwoStatePreference
         final TwoStatePreference preference = mock(TwoStatePreference.class);
diff --git a/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java
new file mode 100644
index 0000000..b12b373
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Activity;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowSecureSettings;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class GesturesSettingsPreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Activity mActivity;
+    @Mock
+    private Preference mPreference;
+
+    private GesturesSettingPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest(mActivity);
+        mController = new GesturesSettingPreferenceController(mActivity);
+    }
+
+    @Test
+    public void isAvailable_hasGesture_shouldReturnTrue() {
+        final List<AbstractPreferenceController> mControllers = new ArrayList<>();
+        mControllers.add(new AbstractPreferenceController(RuntimeEnvironment.application) {
+            @Override
+            public boolean isAvailable() {
+                return true;
+            }
+
+            @Override
+            public String getPreferenceKey() {
+                return "test_key";
+            }
+        });
+        ReflectionHelpers.setField(mController, "mGestureControllers", mControllers);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_noGesture_shouldReturnFalse() {
+        ReflectionHelpers.setField(mController, "mGestureControllers",
+                new ArrayList<AbstractPreferenceController>());
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    @Config(shadows = {ShadowSecureSettings.class})
+    public void updateState_assistSupported_shouldSetToAssistGestureStatus() {
+        final FakeFeatureFactory featureFactory =
+                (FakeFeatureFactory) FakeFeatureFactory.getFactory(mActivity);
+        when(featureFactory.assistGestureFeatureProvider.isSupported(any(Context.class)))
+                .thenReturn(true);
+        when(featureFactory.assistGestureFeatureProvider.isSensorAvailable(any(Context.class)))
+                .thenReturn(true);
+
+        final ContentResolver cr = mActivity.getContentResolver();
+        Settings.Secure.putInt(cr, Settings.Secure.ASSIST_GESTURE_ENABLED, 0);
+        Settings.Secure.putInt(cr, Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED, 0);
+        mController.updateState(mPreference);
+        verify(mActivity).getString(R.string.language_input_gesture_summary_off);
+
+        Settings.Secure.putInt(cr, Settings.Secure.ASSIST_GESTURE_ENABLED, 1);
+        Settings.Secure.putInt(cr, Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED, 0);
+        mController.updateState(mPreference);
+        verify(mActivity).getString(R.string.language_input_gesture_summary_on_with_assist);
+
+        Settings.Secure.putInt(cr, Settings.Secure.ASSIST_GESTURE_ENABLED, 0);
+        Settings.Secure.putInt(cr, Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED, 1);
+        mController.updateState(mPreference);
+        verify(mActivity).getString(R.string.language_input_gesture_summary_on_non_assist);
+    }
+
+    @Test
+    @Config(shadows = {ShadowSecureSettings.class})
+    public void updateState_sensorNotAvailable_shouldSetToEmptyStatus() {
+        final FakeFeatureFactory featureFactory =
+                (FakeFeatureFactory) FakeFeatureFactory.getFactory(mActivity);
+        when(featureFactory.assistGestureFeatureProvider.isSensorAvailable(any(Context.class)))
+                .thenReturn(false);
+
+        mController.updateState(mPreference);
+        verify(mPreference).setSummary("");
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java
index e2ed14d..0b329d3 100644
--- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java
@@ -16,13 +16,15 @@
 
 package com.android.settings.gestures;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.content.Context;
 import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -34,8 +36,6 @@
 
 import java.util.List;
 
-import static com.google.common.truth.Truth.assertThat;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SwipeToNotificationSettingsTest {
@@ -58,7 +58,8 @@
 
     @Test
     public void testGetPreferenceControllers_shouldAllBeCreated() {
-        final List<PreferenceController> controllers = mFragment.getPreferenceControllers(mContext);
+        final List<AbstractPreferenceController> controllers =
+                mFragment.getPreferenceControllers(mContext);
 
         assertThat(controllers.isEmpty()).isFalse();
     }
diff --git a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java
index 7d803f4..2716fc3 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java
@@ -16,12 +16,17 @@
 
 package com.android.settings.inputmethod;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.hardware.input.InputManager;
 import android.view.InputDevice;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -31,10 +36,9 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -105,4 +109,18 @@
 
         assertThat(mController.isAvailable()).isFalse();
     }
+
+    @Test
+    public void updateNonIndexableKeys_shouldIncludeCategoryAndPrefKeys() {
+        when(mInputManager.getInputDeviceIds()).thenReturn(new int[]{});
+
+
+        final List<String> nonIndexables = new ArrayList<>();
+        mController.updateNonIndexableKeys(nonIndexables);
+
+        assertThat(mController.isAvailable()).isFalse();
+        assertThat(nonIndexables).containsExactlyElementsIn(Arrays.asList(
+                GameControllerPreferenceController.PREF_KEY,
+                mController.getPreferenceKey()));
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryCursorLoaderTest.java b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryCursorLoaderTest.java
new file mode 100644
index 0000000..a76aebc
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryCursorLoaderTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.net.Uri;
+import android.provider.UserDictionary;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowContentResolver;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class UserDictionaryCursorLoaderTest {
+
+    private ContentProvider mContentProvider;
+    private UserDictionaryCursorLoader mLoader;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContentProvider = new FakeProvider();
+        mLoader = new UserDictionaryCursorLoader(RuntimeEnvironment.application, "" /* locale */);
+        ShadowContentResolver.registerProvider(UserDictionary.AUTHORITY, mContentProvider);
+    }
+
+    @Test
+    public void testLoad_shouldRemoveDuplicate() {
+        final Cursor cursor = mLoader.loadInBackground();
+
+        assertThat(cursor.getCount()).isEqualTo(4);
+    }
+
+    public static class FakeProvider extends ContentProvider {
+
+
+        @Override
+        public boolean onCreate() {
+            return false;
+        }
+
+        @Override
+        public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
+                String sortOrder) {
+            final MatrixCursor cursor = new MatrixCursor(
+                    UserDictionaryCursorLoader.QUERY_PROJECTION);
+            cursor.addRow(new Object[]{1, "word1", "shortcut1"});
+            cursor.addRow(new Object[]{2, "word2", "shortcut2"});
+            cursor.addRow(new Object[]{3, "word3", "shortcut3"});
+            cursor.addRow(new Object[]{4, "word3", "shortcut3"});   // dupe of 3
+            cursor.addRow(new Object[]{5, "word5", null});          // no shortcut
+            return cursor;
+        }
+
+        @Override
+        public String getType(Uri uri) {
+            return null;
+        }
+
+        @Override
+        public Uri insert(Uri uri, ContentValues values) {
+            return null;
+        }
+
+        @Override
+        public int delete(Uri uri, String selection, String[] selectionArgs) {
+            return 0;
+        }
+
+        @Override
+        public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+            return 0;
+        }
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListTest.java b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListTest.java
new file mode 100644
index 0000000..c6793cb
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.net.Uri;
+import android.provider.UserDictionary;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowContentResolver;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class UserDictionaryListTest {
+
+    private FakeProvider mContentProvider;
+
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContentProvider = new FakeProvider();
+        ShadowContentResolver.registerProvider(UserDictionary.AUTHORITY, mContentProvider);
+    }
+
+    @Test
+    public void getUserDictionaryLocalesSet_noLocale_shouldReturnEmptySet() {
+        mContentProvider.hasDictionary = false;
+
+        assertThat(UserDictionaryList.getUserDictionaryLocalesSet(RuntimeEnvironment.application))
+                .isEmpty();
+    }
+
+    public static class FakeProvider extends ContentProvider {
+
+        public boolean hasDictionary = true;
+
+        @Override
+        public boolean onCreate() {
+            return false;
+        }
+
+        @Override
+        public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
+                String sortOrder) {
+            if (hasDictionary) {
+                final MatrixCursor cursor = new MatrixCursor(
+                        new String[]{UserDictionary.Words.LOCALE});
+                cursor.addRow(new Object[]{"en"});
+                cursor.addRow(new Object[]{"es"});
+                return cursor;
+            } else {
+                return null;
+            }
+        }
+
+        @Override
+        public String getType(Uri uri) {
+            return null;
+        }
+
+        @Override
+        public Uri insert(Uri uri, ContentValues values) {
+            return null;
+        }
+
+        @Override
+        public int delete(Uri uri, String selection, String[] selectionArgs) {
+            return 0;
+        }
+
+        @Override
+        public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+            return 0;
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
index b4a4638..809fb3a 100644
--- a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
@@ -16,9 +16,20 @@
 
 package com.android.settings.language;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.app.Activity;
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
@@ -30,15 +41,13 @@
 import android.view.inputmethod.InputMethodManager;
 import android.view.textservice.TextServicesManager;
 
-import com.android.internal.hardware.AmbientDisplayConfiguration;
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settings.testutils.shadow.ShadowSecureSettings;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 
@@ -54,15 +63,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class LanguageAndInputSettingsTest {
@@ -86,7 +86,6 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mActivity);
         when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mock(UserManager.class));
         when(mActivity.getSystemService(Context.INPUT_SERVICE))
                 .thenReturn(mock(InputManager.class));
@@ -107,10 +106,10 @@
 
     @Test
     public void testGetPreferenceControllers_shouldRegisterLifecycleObservers() {
-        final List<PreferenceController> controllers =
+        final List<AbstractPreferenceController> controllers =
                 mFragment.getPreferenceControllers(mActivity);
         int lifecycleObserverCount = 0;
-        for (PreferenceController controller : controllers) {
+        for (AbstractPreferenceController controller : controllers) {
             if (controller instanceof LifecycleObserver) {
                 lifecycleObserverCount++;
             }
@@ -120,9 +119,8 @@
     }
 
     @Test
-
     public void testGetPreferenceControllers_shouldAllBeCreated() {
-        final List<PreferenceController> controllers =
+        final List<AbstractPreferenceController> controllers =
                 mFragment.getPreferenceControllers(mActivity);
 
         assertThat(controllers.isEmpty()).isFalse();
@@ -136,7 +134,8 @@
         final Activity activity = mock(Activity.class);
         final SummaryLoader loader = mock(SummaryLoader.class);
         final ComponentName componentName = new ComponentName("pkg", "cls");
-        ShadowSecureSettings.putString(null, Settings.Secure.DEFAULT_INPUT_METHOD,
+        final ContentResolver cr = activity.getContentResolver();
+        Settings.Secure.putString(cr, Settings.Secure.DEFAULT_INPUT_METHOD,
                 componentName.flattenToString());
         when(activity.getSystemService(Context.INPUT_METHOD_SERVICE))
                 .thenReturn(mInputMethodManager);
@@ -156,40 +155,6 @@
     }
 
     @Test
-    @Config(shadows = {
-            ShadowSecureSettings.class,
-    })
-    public void testSummary_assistSupported_shouldSetToAssistGestureStatus() {
-        final FakeFeatureFactory featureFactory =
-            (FakeFeatureFactory) FakeFeatureFactory.getFactory(mActivity);
-        when(featureFactory.assistGestureFeatureProvider.isSupported(any(Context.class)))
-            .thenReturn(true);
-        when(featureFactory.assistGestureFeatureProvider.isSensorAvailable(any(Context.class)))
-                .thenReturn(true);
-
-        final SummaryLoader loader = mock(SummaryLoader.class);
-        SummaryLoader.SummaryProvider provider = mFragment.SUMMARY_PROVIDER_FACTORY
-                .createSummaryProvider(mActivity, loader);
-
-        ShadowSecureSettings.putInt(null, Settings.Secure.ASSIST_GESTURE_ENABLED, 0);
-        ShadowSecureSettings.putInt(null, Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED, 0);
-        provider.setListening(true);
-        verify(mActivity).getString(R.string.language_input_gesture_summary_off);
-
-        ShadowSecureSettings.putInt(null, Settings.Secure.ASSIST_GESTURE_ENABLED, 1);
-        ShadowSecureSettings.putInt(null, Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED, 0);
-        provider.setListening(true);
-        verify(mActivity).getString(
-                R.string.language_input_gesture_summary_on_with_assist);
-
-        ShadowSecureSettings.putInt(null, Settings.Secure.ASSIST_GESTURE_ENABLED, 0);
-        ShadowSecureSettings.putInt(null, Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED, 1);
-        provider.setListening(true);
-        verify(mActivity).getString(
-                R.string.language_input_gesture_summary_on_non_assist);
-    }
-
-    @Test
     public void testNonIndexableKeys_existInXmlLayout() {
         final Context context = spy(RuntimeEnvironment.application);
         final Resources res = spy(RuntimeEnvironment.application.getResources());
@@ -217,7 +182,7 @@
                 fragment.getPreferenceScreenResId());
         final List<String> preferenceKeys = new ArrayList<>();
 
-        for (PreferenceController controller : fragment.getPreferenceControllers(context)) {
+        for (AbstractPreferenceController controller : fragment.getPreferenceControllers(context)) {
             preferenceKeys.add(controller.getPreferenceKey());
         }
 
@@ -235,7 +200,6 @@
         public TestFragment(Context context) {
             mContext = context;
             mLifecycle = mock(Lifecycle.class);
-            setAmbientDisplayConfig(mock(AmbientDisplayConfiguration.class));
         }
 
         @Override
diff --git a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java
index 3fc99d2..26a160d 100644
--- a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java
@@ -16,15 +16,16 @@
 
 package com.android.settings.language;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.content.Context;
-import android.speech.tts.TtsEngines;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.UserDictionarySettings;
 import com.android.settings.inputmethod.UserDictionaryList;
+import com.android.settings.inputmethod.UserDictionarySettings;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -37,16 +38,12 @@
 
 import java.util.TreeSet;
 
-import static com.google.common.truth.Truth.assertThat;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class UserDictionaryPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
-    @Mock
-    private TtsEngines mTtsEngines;
     private Preference mPreference;
     private TestController mController;
 
@@ -59,16 +56,7 @@
     }
 
     @Test
-    public void testIsAvailable_noLocale_shouldReturnFalse() {
-        mController.mLocales = null;
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void testIsAvailable_hasLocale_shouldReturnTrue() {
-        mController.mLocales.add("en");
-
+    public void testIsAvailable_shouldReturnTrue() {
         assertThat(mController.isAvailable()).isTrue();
     }
 
diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
index 66e357b..2c11e0c 100644
--- a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
@@ -47,7 +47,11 @@
 import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(
+    manifest = TestConfig.MANIFEST_PATH,
+    sdk = TestConfig.SDK_VERSION,
+    shadows = ShadowRestrictedLockUtilsWrapper.class
+)
 public class MobileNetworkPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -88,7 +92,6 @@
     }
 
     @Test
-    @Config(shadows = ShadowRestrictedLockUtilsWrapper.class)
     public void wifiOnly_prefIsNotAvailable() {
         when(mUserManager.isAdminUser()).thenReturn(true);
         when(mUserManager.hasUserRestriction(anyString(), any(UserHandle.class)))
diff --git a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
index 7471632..fb3e75d 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
@@ -15,15 +15,23 @@
  */
 package com.android.settings.network;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
+import android.content.pm.UserInfo;
 import android.provider.SearchIndexableResource;
 import android.view.Menu;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.testutils.XmlTestUtils;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.drawer.CategoryKey;
 
 import org.junit.Before;
@@ -31,29 +39,20 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 import org.robolectric.util.ReflectionHelpers;
 
 import java.util.List;
 
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class NetworkDashboardFragmentTest {
 
     @Mock
     private Context mContext;
+    @Mock
+    private UserInfo mUserInfo;
 
     private NetworkDashboardFragment mFragment;
 
@@ -91,18 +90,6 @@
     }
 
     @Test
-    public void testNonIndexableKeys_existInXmlLayout() {
-        final Context context = RuntimeEnvironment.application;
-        final List<String> niks = NetworkDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(context);
-        final int xmlId = (new NetworkDashboardFragment()).getPreferenceScreenResId();
-
-        final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
-
-        assertThat(keys).containsAllIn(niks);
-    }
-
-    @Test
     public void testSummaryProvider_hasMobileAndHotspot_shouldReturnMobileSummary() {
         final MobileNetworkPreferenceController mobileNetworkPreferenceController =
                 mock(MobileNetworkPreferenceController.class);
@@ -155,4 +142,5 @@
         verify(mContext).getString(R.string.network_dashboard_summary_data_usage);
         verify(mContext).getString(R.string.join_many_items_middle, null, null);
     }
+
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java
new file mode 100644
index 0000000..8cf8f83
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+import static com.android.settings.notification.ConfigureNotificationSettings.KEY_LOCKSCREEN;
+import static com.android.settings.notification.ConfigureNotificationSettings
+        .KEY_LOCKSCREEN_WORK_PROFILE;
+import static com.android.settings.notification.ConfigureNotificationSettings
+        .KEY_LOCKSCREEN_WORK_PROFILE_HEADER;
+import static com.android.settings.notification.ConfigureNotificationSettings.KEY_SWIPE_DOWN;
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
+import com.android.settings.testutils.shadow.ShadowUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class ConfigureNotificationSettingsTest {
+
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+    }
+
+    @Test
+    @Config(shadows = {
+            ShadowUtils.class,
+            ShadowLockPatternUtils.class
+    })
+    public void getNonIndexableKeys_shouldContainLockScreenPrefs() {
+        final List<String> keys = ConfigureNotificationSettings.SEARCH_INDEX_DATA_PROVIDER
+                .getNonIndexableKeys(mContext);
+
+        assertThat(keys).containsAllOf(
+                KEY_SWIPE_DOWN, KEY_LOCKSCREEN, KEY_LOCKSCREEN_WORK_PROFILE,
+                KEY_LOCKSCREEN_WORK_PROFILE_HEADER);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/OWNERS b/tests/robotests/src/com/android/settings/notification/OWNERS
new file mode 100644
index 0000000..0d73685
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/OWNERS
@@ -0,0 +1,4 @@
+# Default reviewers for this and subdirectories.
+asc@google.com
+dsandler@google.com
+juliacr@google.com
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
index 5fa731e..b8f0679 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
@@ -31,7 +31,6 @@
 import com.android.settings.password.ChooseLockPassword.IntentBuilder;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;
 import com.android.settings.testutils.shadow.ShadowEventLogWriter;
 import com.android.settings.testutils.shadow.ShadowUtils;
 import com.android.setupwizardlib.GlifLayout;
@@ -52,7 +51,6 @@
         shadows = {
                 SettingsShadowResources.class,
                 SettingsShadowResources.SettingsShadowTheme.class,
-                ShadowDynamicIndexableContentMonitor.class,
                 ShadowEventLogWriter.class,
                 ShadowUtils.class
         })
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
index b238049..c74448b 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
@@ -29,7 +29,6 @@
 import com.android.settings.password.ChooseLockPattern.IntentBuilder;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;
 import com.android.settings.testutils.shadow.ShadowEventLogWriter;
 import com.android.settings.testutils.shadow.ShadowUtils;
 import com.android.setupwizardlib.GlifLayout;
@@ -48,7 +47,6 @@
         shadows = {
                 SettingsShadowResources.class,
                 SettingsShadowResources.SettingsShadowTheme.class,
-                ShadowDynamicIndexableContentMonitor.class,
                 ShadowEventLogWriter.class,
                 ShadowUtils.class
         })
diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
index 39a0fb6..1195a2c 100644
--- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
@@ -34,7 +34,6 @@
 import com.android.settings.password.SetupChooseLockPassword.SetupChooseLockPasswordFragment;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;
 import com.android.settings.testutils.shadow.ShadowEventLogWriter;
 import com.android.settings.testutils.shadow.ShadowUtils;
 
@@ -62,7 +61,6 @@
         shadows = {
                 SettingsShadowResources.class,
                 SettingsShadowResources.SettingsShadowTheme.class,
-                ShadowDynamicIndexableContentMonitor.class,
                 ShadowEventLogWriter.class,
                 ShadowUtils.class
         })
diff --git a/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java b/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java
new file mode 100644
index 0000000..0e6f28a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.password;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.robolectric.RuntimeEnvironment.application;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settings.testutils.shadow.ShadowEventLogWriter;
+import com.android.settings.testutils.shadow.ShadowUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowAlertDialog;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                SettingsShadowResources.class,
+                SettingsShadowResources.SettingsShadowTheme.class,
+                ShadowEventLogWriter.class,
+                ShadowUtils.class
+        })
+public class SetupSkipDialogTest {
+
+    private Activity mActivity;
+
+    @Before
+    public void setUp() {
+        mActivity = Robolectric.setupActivity(Activity.class);
+    }
+
+    @Test
+    public void frpMessages_areShownCorrectly_whenNotSupported() {
+        SetupSkipDialog setupSkipDialog = SetupSkipDialog.newInstance(false);
+        setupSkipDialog.show(mActivity.getFragmentManager());
+
+        AlertDialog alertDialog = ShadowAlertDialog.getLatestAlertDialog();
+        assertNotNull(alertDialog);
+        ShadowAlertDialog shadowAlertDialog = Shadows.shadowOf(alertDialog);
+        assertEquals(application.getString(R.string.lock_screen_intro_skip_title),
+                shadowAlertDialog.getTitle());
+        assertEquals(application.getString(R.string.lock_screen_intro_skip_dialog_text),
+                shadowAlertDialog.getMessage());
+    }
+
+    @Test
+    public void frpMessages_areShownCorrectly_whenSupported() {
+        SetupSkipDialog setupSkipDialog = SetupSkipDialog.newInstance(true);
+        setupSkipDialog.show(mActivity.getFragmentManager());
+
+        AlertDialog alertDialog = ShadowAlertDialog.getLatestAlertDialog();
+        assertNotNull(alertDialog);
+        ShadowAlertDialog shadowAlertDialog = Shadows.shadowOf(alertDialog);
+        assertEquals(application.getString(R.string.lock_screen_intro_skip_title),
+                shadowAlertDialog.getTitle());
+        assertEquals(application.getString(R.string.lock_screen_intro_skip_dialog_text_frp),
+                shadowAlertDialog.getMessage());
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/search/AccessibilityServiceResultLoaderTest.java b/tests/robotests/src/com/android/settings/search/AccessibilityServiceResultLoaderTest.java
new file mode 100644
index 0000000..4896dc4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/search/AccessibilityServiceResultLoaderTest.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.search;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import android.accessibilityservice.AccessibilityServiceInfo;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.view.accessibility.AccessibilityManager;
+
+import com.android.settings.TestConfig;
+import com.android.settings.dashboard.SiteMapManager;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AccessibilityServiceResultLoaderTest {
+
+    private static final String QUERY = "test_query";
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private AccessibilityManager mAccessibilityManager;
+    @Mock
+    private SiteMapManager mSiteMapManager;
+
+    private AccessibilityServiceResultLoader mLoader;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getSystemService(Context.ACCESSIBILITY_SERVICE))
+                .thenReturn(mAccessibilityManager);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+
+        mLoader = new AccessibilityServiceResultLoader(mContext, QUERY, mSiteMapManager);
+    }
+
+    @Test
+    public void query_noService_shouldNotReturnAnything() {
+        assertThat(mLoader.loadInBackground()).isEmpty();
+    }
+
+    @Test
+    public void query_hasServiceMatchingTitle_shouldReturnResult() {
+        addFakeAccessibilityService();
+
+        List<? extends SearchResult> results = new ArrayList<>(mLoader.loadInBackground());
+        assertThat(results).hasSize(1);
+
+        SearchResult result = results.get(0);
+        assertThat(result.title).isEqualTo(QUERY);
+    }
+
+    @Test
+    public void query_serviceDoesNotMatchTitle_shouldReturnResult() {
+        addFakeAccessibilityService();
+
+        mLoader = new AccessibilityServiceResultLoader(mContext,
+                QUERY + "no_match", mSiteMapManager);
+
+        assertThat(mLoader.loadInBackground()).isEmpty();
+    }
+
+    private void addFakeAccessibilityService() {
+        final List<AccessibilityServiceInfo> services = new ArrayList<>();
+        final AccessibilityServiceInfo info = mock(AccessibilityServiceInfo.class);
+        final ResolveInfo resolveInfo = mock(ResolveInfo.class);
+        when(info.getResolveInfo()).thenReturn(resolveInfo);
+        when(resolveInfo.loadIcon(mPackageManager)).thenReturn(new ColorDrawable(Color.BLUE));
+        when(resolveInfo.loadLabel(mPackageManager)).thenReturn(QUERY);
+        resolveInfo.serviceInfo = new ServiceInfo();
+        resolveInfo.serviceInfo.packageName = "pkg";
+        resolveInfo.serviceInfo.name = "class";
+        services.add(info);
+
+        when(mAccessibilityManager.getInstalledAccessibilityServiceList()).thenReturn(services);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
index ff39deb..6c6d7ab 100644
--- a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
+++ b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
@@ -17,13 +17,19 @@
 package com.android.settings.search;
 
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
 import android.content.Context;
 import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -38,10 +44,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class BaseSearchIndexProviderTest {
@@ -63,39 +65,53 @@
         assertThat(mIndexProvider.getNonIndexableKeys(mContext)).isEmpty();
     }
 
+    public static class AvailablePreferenceController extends AbstractPreferenceController
+            implements PreferenceControllerMixin {
+        public AvailablePreferenceController(Context context) {
+            super(context);
+        }
+
+        @Override
+        public boolean isAvailable() {
+            return true;
+        }
+
+        @Override
+        public String getPreferenceKey() {
+            return TEST_PREF_KEY;
+        }
+    }
+
     @Test
     public void getNonIndexableKeys_preferenceIsAvailable_shouldReturnEmptyList() {
-        List<PreferenceController> controllers = new ArrayList<>();
-        controllers.add(new PreferenceController(mContext) {
-            @Override
-            public boolean isAvailable() {
-                return true;
-            }
-
-            @Override
-            public String getPreferenceKey() {
-                return TEST_PREF_KEY;
-            }
-        });
+        List<AbstractPreferenceController> controllers = new ArrayList<>();
+        controllers.add(new AvailablePreferenceController(mContext));
         doReturn(controllers).when(mIndexProvider).getPreferenceControllers(mContext);
 
         assertThat(mIndexProvider.getNonIndexableKeys(mContext)).isEqualTo(Collections.EMPTY_LIST);
     }
 
+    public static class NotAvailablePreferenceController extends AbstractPreferenceController
+            implements PreferenceControllerMixin {
+        public NotAvailablePreferenceController(Context context) {
+            super(context);
+        }
+
+        @Override
+        public boolean isAvailable() {
+            return false;
+        }
+
+        @Override
+        public String getPreferenceKey() {
+            return TEST_PREF_KEY;
+        }
+    }
+
     @Test
     public void getNonIndexableKeys_preferenceIsNotAvailable_shouldReturnKey() {
-        List<PreferenceController> controllers = new ArrayList<>();
-        controllers.add(new PreferenceController(mContext) {
-            @Override
-            public boolean isAvailable() {
-                return false;
-            }
-
-            @Override
-            public String getPreferenceKey() {
-                return TEST_PREF_KEY;
-            }
-        });
+        List<AbstractPreferenceController> controllers = new ArrayList<>();
+        controllers.add(new NotAvailablePreferenceController(mContext));
         doReturn(controllers).when(mIndexProvider).getPreferenceControllers(mContext);
 
         assertThat(mIndexProvider.getNonIndexableKeys(mContext)).contains(TEST_PREF_KEY);
diff --git a/tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java b/tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java
index f7628ca..a15a449 100644
--- a/tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java
+++ b/tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java
@@ -17,6 +17,8 @@
 
 package com.android.settings.search;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -26,14 +28,14 @@
 
 import com.android.settings.DisplaySettings;
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.SiteMapManager;
 import com.android.settings.gestures.SwipeToNotificationSettings;
 import com.android.settings.search.ResultPayload.Availability;
 import com.android.settings.search.ResultPayload.PayloadType;
-
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.wifi.WifiSettings;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -48,8 +50,6 @@
 import java.util.List;
 import java.util.Set;
 
-import static com.google.common.truth.Truth.assertThat;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class CursorToSearchResultConverterTest {
@@ -60,7 +60,7 @@
     private static final String TARGET_CLASS = "a.b.c.class";
     private static final String KEY = "key";
     private static final Intent INTENT = new Intent("com.android.settings");
-    private static final int ICON = R.drawable.ic_search_history;
+    private static final int ICON = R.drawable.ic_search_24dp;
     private static final int BASE_RANK = 1;
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java b/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java
index ba2b636..afc7d7a 100644
--- a/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java
+++ b/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java
@@ -1,28 +1,28 @@
 package com.android.settings.search;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.content.Context;
 import android.provider.SearchIndexableResource;
 import android.util.ArraySet;
 import com.android.settings.DateTimeSettings;
 import com.android.settings.R;
 import com.android.settings.SecuritySettings;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.codeinspection.CodeInspector;
+import com.android.settings.datausage.DataPlanUsageSummary;
 import com.android.settings.datausage.DataUsageSummary;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import static com.google.common.truth.Truth.assertThat;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
         assetDir = "/tests/robotests/assets")
@@ -60,6 +60,7 @@
                 // Skip classes that are invalid or cannot be mocked. Add them as special Xml below.
                 if (clazz == null
                         || clazz == DateTimeSettings.class
+                        || clazz == DataPlanUsageSummary.class
                         || clazz == DataUsageSummary.class
                         || clazz == SecuritySettings.class) {
                     continue;
diff --git a/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
index 3641368..70ed568 100644
--- a/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
+++ b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
@@ -79,8 +79,15 @@
 import java.util.Set;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {ShadowRunnableAsyncTask.class})
+@Config(
+    manifest = TestConfig.MANIFEST_PATH,
+    sdk = TestConfig.SDK_VERSION,
+    shadows = {
+        ShadowRunnableAsyncTask.class,
+        ShadowDatabaseIndexingUtils.class,
+        ShadowContentResolver.class
+    }
+)
 public class DatabaseIndexingManagerTest {
     private final String localeStr = "en_US";
 
@@ -747,7 +754,6 @@
     // Test new public indexing flow
 
     @Test
-    @Config(shadows = {ShadowDatabaseIndexingUtils.class})
     public void testPerformIndexing_fullIndex_getsDataFromProviders() {
         DummyProvider provider = new DummyProvider();
         provider.onCreate();
@@ -767,7 +773,6 @@
     }
 
     @Test
-    @Config(shadows = {ShadowDatabaseIndexingUtils.class,})
     public void testPerformIndexing_incrementalIndex_noDataAdded() {
         final List<ResolveInfo> providerInfo = getDummyResolveInfo();
         skipFullIndex(providerInfo);
@@ -792,7 +797,6 @@
     }
 
     @Test
-    @Config(shadows = {ShadowDatabaseIndexingUtils.class,})
     public void testPerformIndexing_localeChanged_databaseDropped() {
         DummyProvider provider = new DummyProvider();
         provider.onCreate();
@@ -830,7 +834,6 @@
     }
 
     @Test
-    @Config(shadows = {ShadowDatabaseIndexingUtils.class,})
     public void testPerformIndexing_onOta_FullIndex() {
         DummyProvider provider = new DummyProvider();
         provider.onCreate();
@@ -851,7 +854,6 @@
     }
 
     @Test
-    @Config(shadows = {ShadowDatabaseIndexingUtils.class,})
     public void testPerformIndexing_onPackageChange_shouldFullIndex() {
         final List<ResolveInfo> providers = getDummyResolveInfo();
         final String buildNumber = Build.FINGERPRINT;
@@ -873,7 +875,6 @@
     }
 
     @Test
-    @Config(shadows = {ShadowDatabaseIndexingUtils.class,})
     public void testPerformIndexing_onOta_buildNumberIsCached() {
         DummyProvider provider = new DummyProvider();
         provider.onCreate();
@@ -1017,7 +1018,6 @@
     }
 
     @Test
-    @Config(shadows = {ShadowContentResolver.class})
     public void testEmptyNonIndexableKeys_emptyDataKeyResources_addedToDatabase() {
         insertSpecialCase(TITLE_ONE, true /* enabled */, null /* dataReferenceKey */);
 
diff --git a/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java b/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java
index d44ecff..3bfa936 100644
--- a/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java
@@ -25,7 +25,7 @@
 import com.android.internal.hardware.AmbientDisplayConfiguration;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.deviceinfo.SystemUpdatePreferenceController;
 
 import org.junit.Before;
@@ -67,7 +67,7 @@
     @Test
     public void testGetPreferenceControllerUriMap_CompatibleClass_ReturnsValidMap() {
         final String className = "com.android.settings.system.SystemDashboardFragment";
-        final Map<String, PreferenceController> map =
+        final Map<String, PreferenceControllerMixin> map =
                 DatabaseIndexingUtils.getPreferenceControllerUriMap(className, mContext);
         assertThat(map.get("system_update_settings"))
                 .isInstanceOf(SystemUpdatePreferenceController.class);
@@ -82,23 +82,13 @@
     @Test
     public void testGetPayloadFromMap_MatchingKey_ReturnsPayload() {
         final String key = "key";
-        PreferenceController prefController = new PreferenceController(mContext) {
-            @Override
-            public boolean isAvailable() {
-                return false;
-            }
-
-            @Override
-            public String getPreferenceKey() {
-                return key;
-            }
-
+        PreferenceControllerMixin prefController = new PreferenceControllerMixin() {
             @Override
             public ResultPayload getResultPayload() {
                 return new ResultPayload(null);
             }
         };
-        ArrayMap<String, PreferenceController> map = new ArrayMap<>();
+        ArrayMap<String, PreferenceControllerMixin> map = new ArrayMap<>();
         map.put(key, prefController);
 
         ResultPayload payload = DatabaseIndexingUtils.getPayloadFromUriMap(map, key);
diff --git a/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java b/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java
deleted file mode 100644
index 64a658e..0000000
--- a/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java
+++ /dev/null
@@ -1,625 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.search;
-
-import android.accessibilityservice.AccessibilityServiceInfo;
-import android.app.Activity;
-import android.app.Application;
-import android.app.LoaderManager;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.Loader;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-import android.database.ContentObserver;
-import android.hardware.input.InputManager;
-import android.net.Uri;
-import android.os.Bundle;
-import android.print.PrintManager;
-import android.print.PrintServicesLoader;
-import android.printservice.PrintServiceInfo;
-import android.provider.Settings;
-import android.provider.UserDictionary;
-import android.view.inputmethod.InputMethodInfo;
-
-import com.android.internal.content.PackageMonitor;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.accessibility.AccessibilitySettings;
-import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment;
-import com.android.settings.inputmethod.PhysicalKeyboardFragment;
-import com.android.settings.inputmethod.VirtualKeyboardFragment;
-import com.android.settings.language.LanguageAndInputSettings;
-import com.android.settings.print.PrintSettingsFragment;
-import com.android.settings.testutils.DatabaseTestUtils;
-import com.android.settings.testutils.shadow.ShadowActivityWithLoadManager;
-import com.android.settings.testutils.shadow.ShadowContextImplWithRegisterReceiver;
-import com.android.settings.testutils.shadow.ShadowInputManager;
-import com.android.settings.testutils.shadow.ShadowInputMethodManagerWithMethodList;
-import com.android.settings.testutils.shadow.ShadowPackageMonitor;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.internal.ShadowExtractor;
-import org.robolectric.res.builder.RobolectricPackageManager;
-import org.robolectric.shadows.ShadowAccessibilityManager;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.shadows.ShadowContentResolver;
-import org.xmlpull.v1.XmlPullParserException;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.only;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-        manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                ShadowActivityWithLoadManager.class,
-                ShadowContextImplWithRegisterReceiver.class,
-                ShadowInputManager.class,
-                ShadowInputMethodManagerWithMethodList.class,
-                ShadowPackageMonitor.class,
-        }
-)
-public class DynamicIndexableContentMonitorTest {
-
-    private static final int LOADER_ID = 1234;
-    private static final String A11Y_PACKAGE_1 = "a11y-1";
-    private static final String A11Y_PACKAGE_2 = "a11y-2";
-    private static final String IME_PACKAGE_1 = "ime-1";
-    private static final String IME_PACKAGE_2 = "ime-2";
-
-    @Mock
-    private LoaderManager mLoaderManager;
-    @Mock
-    private DatabaseIndexingManager mIndexManager;
-
-    private Activity mActivity;
-    private InputManager mInputManager;
-
-    private ShadowContextImplWithRegisterReceiver mShadowContextImpl;
-    private ShadowActivityWithLoadManager mShadowActivity;
-    private ShadowAccessibilityManager mShadowAccessibilityManager;
-    private ShadowInputMethodManagerWithMethodList mShadowInputMethodManager;
-    private RobolectricPackageManager mRobolectricPackageManager;
-
-    private final DynamicIndexableContentMonitor mMonitor = new DynamicIndexableContentMonitor();
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mActivity = Robolectric.buildActivity(Activity.class).get();
-        mInputManager = InputManager.getInstance();
-
-        // Robolectric shadows.
-        mShadowContextImpl = (ShadowContextImplWithRegisterReceiver) ShadowExtractor.extract(
-                ((Application) ShadowApplication.getInstance().getApplicationContext())
-                .getBaseContext());
-        mShadowActivity = (ShadowActivityWithLoadManager) ShadowExtractor.extract(mActivity);
-        mShadowAccessibilityManager = (ShadowAccessibilityManager) ShadowExtractor.extract(
-                mActivity.getSystemService(Context.ACCESSIBILITY_SERVICE));
-        mShadowInputMethodManager = (ShadowInputMethodManagerWithMethodList) ShadowExtractor
-                .extract(mActivity.getSystemService(Context.INPUT_METHOD_SERVICE));
-        mRobolectricPackageManager = RuntimeEnvironment.getRobolectricPackageManager();
-
-        // Setup shadows.
-        mShadowContextImpl.setSystemService(Context.PRINT_SERVICE, mock(PrintManager.class));
-        mShadowContextImpl.setSystemService(Context.INPUT_SERVICE, mInputManager);
-        mShadowActivity.setLoaderManager(mLoaderManager);
-        mShadowAccessibilityManager.setInstalledAccessibilityServiceList(Collections.emptyList());
-        mShadowInputMethodManager.setInputMethodList(Collections.emptyList());
-        mRobolectricPackageManager.setSystemFeature(PackageManager.FEATURE_PRINTING, true);
-        mRobolectricPackageManager.setSystemFeature(PackageManager.FEATURE_INPUT_METHODS, true);
-    }
-
-    @After
-    public void shutDown() {
-        mMonitor.unregister(mActivity, LOADER_ID);
-        // BroadcastReceiver must be unregistered.
-        assertThat(extractPackageMonitor()).isNull();
-
-        DynamicIndexableContentMonitor.resetForTesting();
-        mRobolectricPackageManager.reset();
-
-        DatabaseTestUtils.clearDb(mActivity);
-    }
-
-    @Test
-    public void testLockedUser() {
-        mMonitor.register(mActivity, LOADER_ID, mIndexManager, false /* isUserUnlocked */);
-
-        // No loader procedure happens.
-        verify(mLoaderManager, never()).initLoader(
-                anyInt(), any(Bundle.class), any(LoaderManager.LoaderCallbacks.class));
-        // No indexing happens.
-        verify(mIndexManager, never()).updateFromClassNameResource(
-                anyString(), anyBoolean());
-
-        mMonitor.unregister(mActivity, LOADER_ID);
-
-        // No destroy loader should happen.
-        verify(mLoaderManager, never()).destroyLoader(anyInt());
-    }
-
-    @Test
-    public void testWithNoPrintingFeature() {
-        mRobolectricPackageManager.setSystemFeature(PackageManager.FEATURE_PRINTING, false);
-
-        mMonitor.register(mActivity, LOADER_ID, mIndexManager, true /* isUserUnlocked */);
-
-        // No loader procedure happens.
-        verify(mLoaderManager, never()).initLoader(
-                anyInt(), any(Bundle.class), any(LoaderManager.LoaderCallbacks.class));
-        verifyNoIndexing(PrintSettingsFragment.class);
-
-        mMonitor.unregister(mActivity, LOADER_ID);
-
-        // No destroy loader should happen.
-        verify(mLoaderManager, never()).destroyLoader(anyInt());
-        // BroadcastReceiver must be unregistered.
-        assertThat(extractPackageMonitor()).isNull();
-
-        // To suppress spurious test fail in {@link #shutDown()}.
-        mMonitor.register(mActivity, LOADER_ID, mIndexManager, true /* isUserUnlocked */);
-    }
-
-    @Test
-    public void testPrinterServiceIndex() {
-        mMonitor.register(mActivity, LOADER_ID, mIndexManager, true /* isUserUnlocked */);
-
-        // Loader procedure happens.
-        verify(mLoaderManager, only()).initLoader(LOADER_ID, null, mMonitor);
-
-        // Loading print services happens.
-        final Loader<List<PrintServiceInfo>> loader =
-                mMonitor.onCreateLoader(LOADER_ID, null /* args */);
-        assertThat(loader).isInstanceOf(PrintServicesLoader.class);
-        verifyNoIndexing(PrintSettingsFragment.class);
-
-        mMonitor.onLoadFinished(loader, Collections.emptyList());
-
-        verifyIncrementalIndexing(PrintSettingsFragment.class);
-    }
-
-    @Test
-    public void testInputDevicesMonitor() {
-        mMonitor.register(mActivity, LOADER_ID, mIndexManager, true /* isUserUnlocked */);
-
-        // Rebuild indexing should happen.
-        verifyIncrementalIndexing(PhysicalKeyboardFragment.class);
-        // Input monitor should be registered to InputManager.
-        final InputManager.InputDeviceListener listener = extactInputDeviceListener();
-        assertThat(listener).isNotNull();
-
-        /*
-         * Nothing happens on successive register calls.
-         */
-        mMonitor.unregister(mActivity, LOADER_ID);
-        reset(mIndexManager);
-
-        mMonitor.register(mActivity, LOADER_ID, mIndexManager, true /* isUserUnlocked */);
-
-        verifyNoIndexing(PhysicalKeyboardFragment.class);
-        assertThat(extactInputDeviceListener()).isEqualTo(listener);
-
-        /*
-         * A device is added.
-         */
-        reset(mIndexManager);
-
-        listener.onInputDeviceAdded(1 /* deviceId */);
-
-        verifyIncrementalIndexing(PhysicalKeyboardFragment.class);
-
-        /*
-         * A device is removed.
-         */
-        reset(mIndexManager);
-
-        listener.onInputDeviceRemoved(2 /* deviceId */);
-
-        verifyIncrementalIndexing(PhysicalKeyboardFragment.class);
-
-        /*
-         * A device is changed.
-         */
-        reset(mIndexManager);
-
-        listener.onInputDeviceChanged(3 /* deviceId */);
-
-        verifyIncrementalIndexing(PhysicalKeyboardFragment.class);
-    }
-
-    @Test
-    public void testAccessibilityServicesMonitor() throws Exception {
-        mMonitor.register(mActivity, LOADER_ID, mIndexManager, true /* isUserUnlocked */);
-
-        verifyIncrementalIndexing(AccessibilitySettings.class);
-
-        /*
-         * When an accessibility service package is installed, incremental indexing happen.
-         */
-        reset(mIndexManager);
-
-        installAccessibilityService(A11Y_PACKAGE_1);
-
-        verifyIncrementalIndexing(AccessibilitySettings.class);
-
-        /*
-         * When another accessibility service package is installed, incremental indexing happens.
-         */
-        reset(mIndexManager);
-
-        installAccessibilityService(A11Y_PACKAGE_2);
-
-        verifyIncrementalIndexing(AccessibilitySettings.class);
-
-        /*
-         * When an accessibility service is disabled, rebuild indexing happens.
-         */
-        reset(mIndexManager);
-
-        disableInstalledPackage(A11Y_PACKAGE_1);
-
-        verifyIncrementalIndexing(AccessibilitySettings.class);
-
-        /*
-         * When an accessibility service is enabled, incremental indexing happens.
-         */
-        reset(mIndexManager);
-
-        enableInstalledPackage(A11Y_PACKAGE_1);
-
-        verifyIncrementalIndexing(AccessibilitySettings.class);
-
-        /*
-         * When an accessibility service package is uninstalled, rebuild indexing happens.
-         */
-        reset(mIndexManager);
-
-        uninstallAccessibilityService(A11Y_PACKAGE_1);
-
-        verifyIncrementalIndexing(AccessibilitySettings.class);
-
-        /*
-         * When an input method service package is installed, nothing happens.
-         */
-        reset(mIndexManager);
-
-        installInputMethodService(IME_PACKAGE_1);
-
-        verifyNoIndexing(AccessibilitySettings.class);
-    }
-
-    @Test
-    public void testInputMethodServicesMonitor() throws Exception {
-        mMonitor.register(mActivity, LOADER_ID, mIndexManager, true /* isUserUnlocked */);
-
-        verifyIncrementalIndexing(VirtualKeyboardFragment.class);
-        verifyIncrementalIndexing(AvailableVirtualKeyboardFragment.class);
-
-        final Uri enabledInputMethodsContentUri = Settings.Secure.getUriFor(
-                Settings.Secure.ENABLED_INPUT_METHODS);
-        // Content observer should be registered.
-        final ContentObserver observer = extractContentObserver(enabledInputMethodsContentUri);
-        assertThat(observer).isNotNull();
-
-        /*
-         * When an input method service package is installed, incremental indexing happen.
-         */
-        reset(mIndexManager);
-
-        installInputMethodService(IME_PACKAGE_1);
-
-        verifyIncrementalIndexing(VirtualKeyboardFragment.class);
-        verifyIncrementalIndexing(AvailableVirtualKeyboardFragment.class);
-
-        /*
-         * When another input method service package is installed, incremental indexing happens.
-         */
-        reset(mIndexManager);
-
-        installInputMethodService(IME_PACKAGE_2);
-
-        verifyIncrementalIndexing(VirtualKeyboardFragment.class);
-        verifyIncrementalIndexing(AvailableVirtualKeyboardFragment.class);
-
-        /*
-         * When an input method service is disabled, rebuild indexing happens.
-         */
-        reset(mIndexManager);
-
-        disableInstalledPackage(IME_PACKAGE_1);
-
-        verifyIncrementalIndexing(VirtualKeyboardFragment.class);
-        verifyIncrementalIndexing(AvailableVirtualKeyboardFragment.class);
-
-        /*
-         * When an input method service is enabled, incremental indexing happens.
-         */
-        reset(mIndexManager);
-
-        enableInstalledPackage(IME_PACKAGE_1);
-
-        verifyIncrementalIndexing(VirtualKeyboardFragment.class);
-        verifyIncrementalIndexing(AvailableVirtualKeyboardFragment.class);
-
-        /*
-         * When an input method service package is uninstalled, rebuild indexing happens.
-         */
-        reset(mIndexManager);
-
-        uninstallInputMethodService(IME_PACKAGE_1);
-
-        verifyIncrementalIndexing(VirtualKeyboardFragment.class);
-        verifyIncrementalIndexing(AvailableVirtualKeyboardFragment.class);
-
-        /*
-         * When an accessibility service package is installed, nothing happens.
-         */
-        reset(mIndexManager);
-
-        installAccessibilityService(A11Y_PACKAGE_1);
-
-        verifyNoIndexing(VirtualKeyboardFragment.class);
-        verifyNoIndexing(AvailableVirtualKeyboardFragment.class);
-
-        /*
-         * When enabled IMEs list is changed, rebuild indexing happens.
-         */
-        reset(mIndexManager);
-
-        observer.onChange(false /* selfChange */, enabledInputMethodsContentUri);
-
-        verifyIncrementalIndexing(VirtualKeyboardFragment.class);
-        verifyIncrementalIndexing(AvailableVirtualKeyboardFragment.class);
-    }
-
-    @Test
-    public void testUserDictionaryChangeMonitor() throws Exception {
-        mMonitor.register(mActivity, LOADER_ID, mIndexManager, true /* isUserUnlocked */);
-
-        // Content observer should be registered.
-        final ContentObserver observer = extractContentObserver(UserDictionary.Words.CONTENT_URI);
-        assertThat(observer).isNotNull();
-
-        verifyIncrementalIndexing(LanguageAndInputSettings.class);
-
-        /*
-         * When user dictionary content is changed, rebuild indexing happens.
-         */
-        reset(mIndexManager);
-
-        observer.onChange(false /* selfChange */, UserDictionary.Words.CONTENT_URI);
-
-        verifyIncrementalIndexing(LanguageAndInputSettings.class);
-    }
-
-    /*
-     * Verification helpers.
-     */
-
-    private void verifyNoIndexing(Class<?> indexingClass) {
-        verify(mIndexManager, never()).updateFromClassNameResource(eq(indexingClass.getName()),
-                anyBoolean());
-    }
-
-    private void verifyIncrementalIndexing(Class<?> indexingClass) {
-        verify(mIndexManager, times(1)).updateFromClassNameResource(indexingClass.getName(),
-                true /* includeInSearchResults */);
-        verify(mIndexManager, never()).updateFromClassNameResource(indexingClass.getName(),
-                false /* includeInSearchResults */);
-    }
-
-    /*
-     * Testing helper methods.
-     */
-
-    private InputManager.InputDeviceListener extactInputDeviceListener() {
-        List<InputManager.InputDeviceListener> listeners = ((ShadowInputManager) ShadowExtractor
-                .extract(mInputManager))
-                .getRegisteredInputDeviceListeners();
-        InputManager.InputDeviceListener inputDeviceListener = null;
-        for (InputManager.InputDeviceListener listener : listeners) {
-            if (isUnderTest(listener)) {
-                if (inputDeviceListener != null) {
-                    assertThat(listener).isEqualTo(inputDeviceListener);
-                } else {
-                    inputDeviceListener = listener;
-                }
-            }
-        }
-        return inputDeviceListener;
-    }
-
-    private PackageMonitor extractPackageMonitor() {
-        List<ShadowApplication.Wrapper> receivers = ShadowApplication.getInstance()
-                .getRegisteredReceivers();
-        PackageMonitor packageMonitor = null;
-        for (ShadowApplication.Wrapper wrapper : receivers) {
-            BroadcastReceiver receiver = wrapper.getBroadcastReceiver();
-            if (isUnderTest(receiver) && receiver instanceof PackageMonitor) {
-                if (packageMonitor != null) {
-                    assertThat(receiver).isEqualTo(packageMonitor);
-                } else {
-                    packageMonitor = (PackageMonitor) receiver;
-                }
-            }
-        }
-        return packageMonitor;
-    }
-
-    private ContentObserver extractContentObserver(Uri uri) {
-        ShadowContentResolver contentResolver = (ShadowContentResolver) ShadowExtractor
-                .extract(mActivity.getContentResolver());
-        Collection<ContentObserver> observers = contentResolver.getContentObservers(uri);
-        ContentObserver contentObserver = null;
-        for (ContentObserver observer : observers) {
-            if (isUnderTest(observer)) {
-                if (contentObserver != null) {
-                    assertThat(observer).isEqualTo(contentObserver);
-                } else {
-                    contentObserver = observer;
-                }
-            }
-        }
-        return contentObserver;
-    }
-
-    private void enableInstalledPackage(String packageName) {
-        ((PackageManager) mRobolectricPackageManager).setApplicationEnabledSetting(
-                packageName, PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0 /* flags */);
-        extractPackageMonitor().onPackageModified(packageName);
-        Robolectric.flushBackgroundThreadScheduler();
-    }
-
-    private void disableInstalledPackage(String packageName) {
-        ((PackageManager) mRobolectricPackageManager).setApplicationEnabledSetting(
-                packageName, PackageManager.COMPONENT_ENABLED_STATE_DISABLED, 0 /* flags */);
-        extractPackageMonitor().onPackageModified(packageName);
-        Robolectric.flushBackgroundThreadScheduler();
-    }
-
-    private void installAccessibilityService(String packageName) throws Exception {
-        final AccessibilityServiceInfo serviceToAdd = buildAccessibilityServiceInfo(packageName);
-
-        final List<AccessibilityServiceInfo> services = new ArrayList<>();
-        services.addAll(mShadowAccessibilityManager.getInstalledAccessibilityServiceList());
-        services.add(serviceToAdd);
-        mShadowAccessibilityManager.setInstalledAccessibilityServiceList(services);
-
-        final Intent intent = DynamicIndexableContentMonitor
-                .getAccessibilityServiceIntent(packageName);
-        mRobolectricPackageManager.addResolveInfoForIntent(intent, serviceToAdd.getResolveInfo());
-        mRobolectricPackageManager.addPackage(packageName);
-
-        extractPackageMonitor()
-                .onPackageAppeared(packageName, PackageMonitor.PACKAGE_PERMANENT_CHANGE);
-        Robolectric.flushBackgroundThreadScheduler();
-    }
-
-    private void uninstallAccessibilityService(String packageName) throws Exception {
-        final AccessibilityServiceInfo serviceToRemove = buildAccessibilityServiceInfo(packageName);
-
-        final List<AccessibilityServiceInfo> services = new ArrayList<>();
-        services.addAll(mShadowAccessibilityManager.getInstalledAccessibilityServiceList());
-        services.remove(serviceToRemove);
-        mShadowAccessibilityManager.setInstalledAccessibilityServiceList(services);
-
-        final Intent intent = DynamicIndexableContentMonitor
-                .getAccessibilityServiceIntent(packageName);
-        mRobolectricPackageManager.removeResolveInfosForIntent(intent, packageName);
-        mRobolectricPackageManager.removePackage(packageName);
-
-        extractPackageMonitor()
-                .onPackageDisappeared(packageName, PackageMonitor.PACKAGE_PERMANENT_CHANGE);
-        Robolectric.flushBackgroundThreadScheduler();
-    }
-
-    private void installInputMethodService(String packageName) throws Exception {
-        final ResolveInfo resolveInfoToAdd = buildResolveInfo(packageName, "imeService");
-        final InputMethodInfo serviceToAdd = buildInputMethodInfo(resolveInfoToAdd);
-
-        final List<InputMethodInfo> services = new ArrayList<>();
-        services.addAll(mShadowInputMethodManager.getInputMethodList());
-        services.add(serviceToAdd);
-        mShadowInputMethodManager.setInputMethodList(services);
-
-        final Intent intent = DynamicIndexableContentMonitor.getIMEServiceIntent(packageName);
-        mRobolectricPackageManager.addResolveInfoForIntent(intent, resolveInfoToAdd);
-        mRobolectricPackageManager.addPackage(packageName);
-
-        extractPackageMonitor()
-                .onPackageAppeared(packageName, PackageMonitor.PACKAGE_PERMANENT_CHANGE);
-        Robolectric.flushBackgroundThreadScheduler();
-    }
-
-    private void uninstallInputMethodService(String packageName) throws Exception {
-        final ResolveInfo resolveInfoToRemove = buildResolveInfo(packageName, "imeService");
-        final InputMethodInfo serviceToRemove = buildInputMethodInfo(resolveInfoToRemove);
-
-        final List<InputMethodInfo> services = new ArrayList<>();
-        services.addAll(mShadowInputMethodManager.getInputMethodList());
-        services.remove(serviceToRemove);
-        mShadowInputMethodManager.setInputMethodList(services);
-
-        final Intent intent = DynamicIndexableContentMonitor.getIMEServiceIntent(packageName);
-        mRobolectricPackageManager.removeResolveInfosForIntent(intent, packageName);
-        mRobolectricPackageManager.removePackage(packageName);
-
-        extractPackageMonitor()
-                .onPackageDisappeared(packageName, PackageMonitor.PACKAGE_PERMANENT_CHANGE);
-        Robolectric.flushBackgroundThreadScheduler();
-    }
-
-    private AccessibilityServiceInfo buildAccessibilityServiceInfo(String packageName)
-            throws IOException, XmlPullParserException {
-        return new AccessibilityServiceInfo(
-                buildResolveInfo(packageName, "A11yService"), mActivity);
-    }
-
-    private static InputMethodInfo buildInputMethodInfo(ResolveInfo resolveInfo) {
-        return new InputMethodInfo(resolveInfo, false /* isAuxIme */, "SettingsActivity",
-                null /* subtypes */,  0 /* defaultResId */, false /* forceDefault */);
-    }
-
-    private static ResolveInfo buildResolveInfo(String packageName, String className) {
-        final ResolveInfo resolveInfo = new ResolveInfo();
-        resolveInfo.serviceInfo = new ServiceInfo();
-        resolveInfo.serviceInfo.packageName = packageName;
-        resolveInfo.serviceInfo.name = className;
-        // To workaround that RobolectricPackageManager.removeResolveInfosForIntent() only works
-        // for activity/broadcast resolver.
-        resolveInfo.activityInfo = new ActivityInfo();
-        resolveInfo.activityInfo.packageName = packageName;
-        resolveInfo.activityInfo.name = className;
-
-        return resolveInfo;
-    }
-
-    private static boolean isUnderTest(Object object) {
-        return object.getClass().getName().startsWith(
-                DynamicIndexableContentMonitor.class.getName());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/FakeIndexProvider.java b/tests/robotests/src/com/android/settings/search/FakeIndexProvider.java
index 69c2589..b2a1553 100644
--- a/tests/robotests/src/com/android/settings/search/FakeIndexProvider.java
+++ b/tests/robotests/src/com/android/settings/search/FakeIndexProvider.java
@@ -20,7 +20,7 @@
 import android.content.Context;
 import android.provider.SearchIndexableResource;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.List;
 
@@ -44,7 +44,7 @@
                 }
 
                 @Override
-                public List<PreferenceController> getPreferenceControllers(Context context) {
+                public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
                     return null;
                 }
             };
diff --git a/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java b/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java
index 94ee335..86aee6f 100644
--- a/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java
+++ b/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java
@@ -17,14 +17,18 @@
 
 package com.android.settings.search;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.view.LayoutInflater;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -38,10 +42,6 @@
 
 import java.util.ArrayList;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class InlineSwitchViewHolderTest {
@@ -65,7 +65,7 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         final Context context = RuntimeEnvironment.application;
-        mIcon = context.getDrawable(R.drawable.ic_search_history);
+        mIcon = context.getDrawable(R.drawable.ic_search_24dp);
         FakeFeatureFactory.setupForTest(mContext);
         mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
 
diff --git a/tests/robotests/src/com/android/settings/search/InputDeviceResultLoaderTest.java b/tests/robotests/src/com/android/settings/search/InputDeviceResultLoaderTest.java
new file mode 100644
index 0000000..a955af1
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/search/InputDeviceResultLoaderTest.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.search;
+
+import static android.content.Context.INPUT_METHOD_SERVICE;
+import static com.android.settings.search.InputDeviceResultLoader.PHYSICAL_KEYBOARD_FRAGMENT;
+import static com.android.settings.search.InputDeviceResultLoader.VIRTUAL_KEYBOARD_FRAGMENT;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.pm.ServiceInfo;
+import android.hardware.input.InputManager;
+import android.view.InputDevice;
+import android.view.inputmethod.InputMethodInfo;
+import android.view.inputmethod.InputMethodManager;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.dashboard.SiteMapManager;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowInputDevice;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                ShadowInputDevice.class
+        })
+public class InputDeviceResultLoaderTest {
+
+    private static final String QUERY = "test_query";
+    private static final List<String> PHYSICAL_KEYBOARD_BREADCRUMB;
+    private static final List<String> VIRTUAL_KEYBOARD_BREADCRUMB;
+
+    static {
+        PHYSICAL_KEYBOARD_BREADCRUMB = new ArrayList<>();
+        VIRTUAL_KEYBOARD_BREADCRUMB = new ArrayList<>();
+        PHYSICAL_KEYBOARD_BREADCRUMB.add("Settings");
+        PHYSICAL_KEYBOARD_BREADCRUMB.add("physical keyboard");
+        VIRTUAL_KEYBOARD_BREADCRUMB.add("Settings");
+        VIRTUAL_KEYBOARD_BREADCRUMB.add("virtual keyboard");
+    }
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private SiteMapManager mSiteMapManager;
+    @Mock
+    private InputManager mInputManager;
+    @Mock
+    private InputMethodManager mImm;
+    @Mock
+    private PackageManager mPackageManager;
+
+    private InputDeviceResultLoader mLoader;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getApplicationContext()).thenReturn(mContext);
+        when(mContext.getSystemService(Context.INPUT_SERVICE))
+                .thenReturn(mInputManager);
+        when(mContext.getSystemService(INPUT_METHOD_SERVICE))
+                .thenReturn(mImm);
+        when(mContext.getPackageManager())
+                .thenReturn(mPackageManager);
+        when(mContext.getString(anyInt()))
+                .thenAnswer(invocation -> RuntimeEnvironment.application.getString(
+                        (Integer) invocation.getArguments()[0]));
+        mLoader = new InputDeviceResultLoader(mContext, QUERY, mSiteMapManager);
+    }
+
+    @After
+    public void tearDown() {
+        ShadowInputDevice.reset();
+    }
+
+    @Test
+    public void query_noKeyboard_shouldNotReturnAnything() {
+        assertThat(mLoader.loadInBackground()).isEmpty();
+    }
+
+    @Test
+    public void query_hasPhysicalKeyboard_match() {
+        addPhysicalKeyboard(QUERY);
+        when(mSiteMapManager.buildBreadCrumb(mContext, PHYSICAL_KEYBOARD_FRAGMENT,
+                RuntimeEnvironment.application.getString(R.string.physical_keyboard_title)))
+                .thenReturn(PHYSICAL_KEYBOARD_BREADCRUMB);
+
+        final List<SearchResult> results = new ArrayList<>(mLoader.loadInBackground());
+
+        assertThat(results).hasSize(1);
+        assertThat(results.get(0).title).isEqualTo(QUERY);
+        assertThat(results.get(0).breadcrumbs)
+                .containsExactlyElementsIn(PHYSICAL_KEYBOARD_BREADCRUMB);
+    }
+
+    @Test
+    public void query_hasVirtualKeyboard_match() {
+        addVirtualKeyboard(QUERY);
+        when(mSiteMapManager.buildBreadCrumb(mContext, VIRTUAL_KEYBOARD_FRAGMENT,
+                RuntimeEnvironment.application.getString(R.string.add_virtual_keyboard)))
+                .thenReturn(VIRTUAL_KEYBOARD_BREADCRUMB);
+
+        final List<SearchResult> results = new ArrayList<>(mLoader.loadInBackground());
+        assertThat(results).hasSize(1);
+        assertThat(results.get(0).title).isEqualTo(QUERY);
+        assertThat(results.get(0).breadcrumbs)
+                .containsExactlyElementsIn(VIRTUAL_KEYBOARD_BREADCRUMB);
+    }
+
+    @Test
+    public void query_hasPhysicalVirtualKeyboard_doNotMatch() {
+        addPhysicalKeyboard("abc");
+        addVirtualKeyboard("def");
+
+        assertThat(mLoader.loadInBackground()).isEmpty();
+        verifyZeroInteractions(mSiteMapManager);
+    }
+
+    private void addPhysicalKeyboard(String name) {
+        final InputDevice device = mock(InputDevice.class);
+        when(device.isVirtual()).thenReturn(false);
+        when(device.isFullKeyboard()).thenReturn(true);
+        when(device.getName()).thenReturn(name);
+        ShadowInputDevice.sDeviceIds = new int[]{0};
+        ShadowInputDevice.addDevice(0, device);
+    }
+
+    private void addVirtualKeyboard(String name) {
+        final List<InputMethodInfo> imis = new ArrayList<>();
+        final InputMethodInfo info = mock(InputMethodInfo.class);
+        imis.add(info);
+        when(info.getServiceInfo()).thenReturn(new ServiceInfo());
+        when(info.loadLabel(mPackageManager)).thenReturn(name);
+        info.getServiceInfo().packageName = "pkg";
+        info.getServiceInfo().name = "class";
+        when(mImm.getInputMethodList()).thenReturn(imis);
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java b/tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java
index d0a200d..19854fc 100644
--- a/tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java
@@ -17,6 +17,20 @@
 
 package com.android.settings.search;
 
+import static android.content.pm.ApplicationInfo.FLAG_SYSTEM;
+import static android.content.pm.ApplicationInfo.FLAG_UPDATED_SYSTEM_APP;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyList;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
@@ -26,12 +40,12 @@
 import android.os.UserManager;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 import com.android.settings.dashboard.SiteMapManager;
 import com.android.settings.testutils.ApplicationTestUtils;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -50,20 +64,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static android.content.pm.ApplicationInfo.FLAG_SYSTEM;
-import static android.content.pm.ApplicationInfo.FLAG_UPDATED_SYSTEM_APP;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyList;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class InstalledAppResultLoaderTest {
@@ -82,8 +82,8 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        FakeFeatureFactory factory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
+
+        final FakeFeatureFactory factory = FakeFeatureFactory.setupForTest(mContext);
         when(factory.searchFeatureProvider.getSiteMapManager())
                 .thenReturn(mSiteMapManager);
         final List<UserInfo> infos = new ArrayList<>();
diff --git a/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java b/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
index 53b3ca5..a3826f6 100644
--- a/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
+++ b/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
@@ -87,7 +87,7 @@
         final View view = LayoutInflater.from(context).inflate(R.layout.search_intent_item, null);
         mHolder = new IntentSearchViewHolder(view);
 
-        mIcon = context.getDrawable(R.drawable.ic_search_history);
+        mIcon = context.getDrawable(R.drawable.ic_search_24dp);
         mBadgedIcon = context.getDrawable(R.drawable.ic_add);
         when(mFragment.getActivity().getPackageManager()).thenReturn(mPackageManager);
     }
diff --git a/tests/robotests/src/com/android/settings/search/MockAccessibilityLoader.java b/tests/robotests/src/com/android/settings/search/MockAccessibilityLoader.java
new file mode 100644
index 0000000..0a06a35
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/search/MockAccessibilityLoader.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.search;
+
+import android.content.Context;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class MockAccessibilityLoader extends AccessibilityServiceResultLoader {
+
+    public MockAccessibilityLoader(Context context) {
+        super(context, "test_query", null);
+    }
+
+    @Override
+    public Set<? extends SearchResult> loadInBackground() {
+        return new HashSet<>();
+    }
+
+    @Override
+    protected void onDiscardResult(Set<? extends SearchResult> result) {
+
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/search/MockInputDeviceResultLoader.java b/tests/robotests/src/com/android/settings/search/MockInputDeviceResultLoader.java
new file mode 100644
index 0000000..2c16b14
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/search/MockInputDeviceResultLoader.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.search;
+
+import android.content.Context;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class MockInputDeviceResultLoader extends InputDeviceResultLoader {
+    public MockInputDeviceResultLoader(Context context) {
+        super(context, "test_query", null);
+    }
+
+    @Override
+    public Set<? extends SearchResult> loadInBackground() {
+        return new HashSet<>();
+    }
+
+    @Override
+    protected void onDiscardResult(Set<? extends SearchResult> result) {
+
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java
index 6d49555..af8cfe4 100644
--- a/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java
+++ b/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java
@@ -18,11 +18,13 @@
 package com.android.settings.search;
 
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.content.Context;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.DatabaseTestUtils;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.After;
 import org.junit.Before;
@@ -33,8 +35,6 @@
 
 import java.util.List;
 
-import static com.google.common.truth.Truth.assertThat;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SavedQueryRecorderAndRemoverTest {
@@ -57,7 +57,7 @@
     public void canSaveAndRemoveQuery() {
         final String query = "test";
         mRecorder = new SavedQueryRecorder(mContext, query);
-        mRemover = new SavedQueryRemover(mContext, query);
+        mRemover = new SavedQueryRemover(mContext);
 
         // Record a new query and load all queries from DB
         mRecorder.loadInBackground();
@@ -75,4 +75,22 @@
         // Saved query list should be empty because it's removed.
         assertThat(results).isEmpty();
     }
+
+    @Test
+    public void canRemoveAllQueriesAtOnce() {
+        mRemover = new SavedQueryRemover(mContext);;
+
+        // Record a new query and load all queries from DB
+        new SavedQueryRecorder(mContext, "Test1").loadInBackground();
+        new SavedQueryRecorder(mContext, "Test2").loadInBackground();
+        final SavedQueryLoader loader = new SavedQueryLoader(mContext);
+        List<? extends SearchResult> results = loader.loadInBackground();
+        assertThat(results.size()).isEqualTo(2);
+
+        mRemover.loadInBackground();
+        results = loader.loadInBackground();
+
+        // Saved query list should be empty because it's removed.
+        assertThat(results).isEmpty();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java
index 691fcf7..bb8f6d1 100644
--- a/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java
+++ b/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java
@@ -26,8 +26,8 @@
 import android.view.View;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -47,7 +47,6 @@
     private SavedQueryViewHolder mHolder;
     private View mView;
     private View mTitleView;
-    private View mRemoveButton;
 
     @Before
     public void setUp() {
@@ -56,7 +55,6 @@
         mView = LayoutInflater.from(mContext)
                 .inflate(R.layout.search_saved_query_item, null);
         mTitleView = mView.findViewById(android.R.id.title);
-        mRemoveButton = mView.findViewById(android.R.id.icon);
         mHolder = new SavedQueryViewHolder(mView);
     }
 
@@ -65,10 +63,8 @@
         final SearchResult result = mock(SearchResult.class);
         mHolder.onBind(mSearchFragment, result);
 
-        mTitleView.performClick();
-        mRemoveButton.performClick();
+        mHolder.itemView.performClick();
 
         verify(mSearchFragment).onSavedQueryClicked(nullable(CharSequence.class));
-        verify(mSearchFragment).onRemoveSavedQueryClicked(nullable(CharSequence.class));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java b/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
index 7ee3f97..d78a818 100644
--- a/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
@@ -17,6 +17,20 @@
 
 package com.android.settings.search;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.argThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.app.LoaderManager;
 import android.content.Context;
 import android.content.Intent;
@@ -28,10 +42,10 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.DatabaseTestUtils;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 
 import org.junit.After;
@@ -52,20 +66,6 @@
 
 import java.util.Set;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH,
         sdk = TestConfig.SDK_VERSION,
@@ -81,6 +81,10 @@
     private DatabaseResultLoader mDatabaseResultLoader;
     @Mock
     private InstalledAppResultLoader mInstalledAppResultLoader;
+    @Mock
+    private AccessibilityServiceResultLoader mAccessibilityServiceResultLoader;
+    @Mock
+    private InputDeviceResultLoader mInputDeviceResultLoader;
 
     @Mock
     private SavedQueryLoader mSavedQueryLoader;
@@ -113,6 +117,12 @@
         when(mFeatureFactory.searchFeatureProvider
                 .getInstalledAppSearchLoader(any(Context.class), anyString()))
                 .thenReturn(mInstalledAppResultLoader);
+        when(mFeatureFactory.searchFeatureProvider
+                .getAccessibilityServiceResultLoader(any(Context.class), anyString()))
+                .thenReturn(mAccessibilityServiceResultLoader);
+        when(mFeatureFactory.searchFeatureProvider
+                .getInputDeviceResultLoader(any(Context.class), anyString()))
+                .thenReturn(mInputDeviceResultLoader);
         when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
                 .thenReturn(mSavedQueryLoader);
 
@@ -170,6 +180,12 @@
         when(mFeatureFactory.searchFeatureProvider
                 .getInstalledAppSearchLoader(any(Context.class), anyString()))
                 .thenReturn(mInstalledAppResultLoader);
+        when(mFeatureFactory.searchFeatureProvider
+                .getAccessibilityServiceResultLoader(any(Context.class), anyString()))
+                .thenReturn(mAccessibilityServiceResultLoader);
+        when(mFeatureFactory.searchFeatureProvider
+                .getInputDeviceResultLoader(any(Context.class), anyString()))
+                .thenReturn(mInputDeviceResultLoader);
         when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
                 .thenReturn(mSavedQueryLoader);
 
@@ -225,6 +241,12 @@
         when(mFeatureFactory.searchFeatureProvider
                 .getInstalledAppSearchLoader(any(Context.class), anyString()))
                 .thenReturn(mInstalledAppResultLoader);
+        when(mFeatureFactory.searchFeatureProvider
+                .getAccessibilityServiceResultLoader(any(Context.class), anyString()))
+                .thenReturn(mAccessibilityServiceResultLoader);
+        when(mFeatureFactory.searchFeatureProvider
+                .getInputDeviceResultLoader(any(Context.class), anyString()))
+                .thenReturn(mInputDeviceResultLoader);
         when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
                 .thenReturn(mSavedQueryLoader);
         ActivityController<SearchActivity> activityController =
@@ -256,6 +278,12 @@
         when(mFeatureFactory.searchFeatureProvider
                 .getInstalledAppSearchLoader(any(Context.class), anyString()))
                 .thenReturn(mInstalledAppResultLoader);
+        when(mFeatureFactory.searchFeatureProvider
+                .getAccessibilityServiceResultLoader(any(Context.class), anyString()))
+                .thenReturn(mAccessibilityServiceResultLoader);
+        when(mFeatureFactory.searchFeatureProvider
+                .getInputDeviceResultLoader(any(Context.class), anyString()))
+                .thenReturn(mInputDeviceResultLoader);
         when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
                 .thenReturn(mSavedQueryLoader);
 
@@ -333,6 +361,12 @@
         when(mFeatureFactory.searchFeatureProvider
                 .getInstalledAppSearchLoader(any(Context.class), anyString()))
                 .thenReturn(new MockAppLoader(RuntimeEnvironment.application));
+        when(mFeatureFactory.searchFeatureProvider
+                .getAccessibilityServiceResultLoader(any(Context.class), anyString()))
+                .thenReturn(new MockAccessibilityLoader(RuntimeEnvironment.application));
+        when(mFeatureFactory.searchFeatureProvider
+                .getInputDeviceResultLoader(any(Context.class), anyString()))
+                .thenReturn(new MockInputDeviceResultLoader(RuntimeEnvironment.application));
         when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
                 .thenReturn(mSavedQueryLoader);
         ActivityController<SearchActivity> activityController =
@@ -376,9 +410,9 @@
 
         fragment.onIndexingFinished();
 
-        verify(loaderManager).initLoader(eq(SearchFragment.LOADER_ID_DATABASE),
+        verify(loaderManager).initLoader(eq(SearchFragment.SearchLoaderId.DATABASE),
                 eq(null), any(LoaderManager.LoaderCallbacks.class));
-        verify(loaderManager).initLoader(eq(SearchFragment.LOADER_ID_INSTALLED_APPS),
+        verify(loaderManager).initLoader(eq(SearchFragment.SearchLoaderId.INSTALLED_APPS),
                 eq(null), any(LoaderManager.LoaderCallbacks.class));
     }
 
@@ -441,14 +475,46 @@
                 nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_RESULT),
                 eq("test_setting"),
-                argThat(pairMatches(MetricsProto.MetricsEvent.FIELD_SETTINGS_SERACH_RESULT_COUNT)),
-                argThat(pairMatches(MetricsProto.MetricsEvent.FIELD_SETTINGS_SERACH_RESULT_RANK)),
-                argThat(pairMatches(MetricsProto.MetricsEvent.FIELD_SETTINGS_SERACH_QUERY_LENGTH)));
+                argThat(pairMatches(MetricsProto.MetricsEvent.FIELD_SETTINGS_SEARCH_RESULT_COUNT)),
+                argThat(pairMatches(MetricsProto.MetricsEvent.FIELD_SETTINGS_SEARCH_RESULT_RANK)),
+                argThat(pairMatches(MetricsProto.MetricsEvent
+                                .FIELD_SETTINGS_SEARCH_RESULT_ASYNC_RANKING_STATE)),
+                argThat(pairMatches(MetricsProto.MetricsEvent.FIELD_SETTINGS_SEARCH_QUERY_LENGTH)));
 
         verify(mFeatureFactory.searchFeatureProvider).searchResultClicked(nullable(Context.class),
                 nullable(String.class), eq(searchResult));
     }
 
+    @Test
+    public void onResume_shouldCallSearchRankingWarmupIfSmartSearchRankingEnabled(){
+        when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(any(Context.class)))
+                .thenReturn(true);
+
+        ActivityController<SearchActivity> activityController =
+                Robolectric.buildActivity(SearchActivity.class);
+        activityController.setup();
+        SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
+                .findFragmentById(R.id.main_content);
+
+        verify(mFeatureFactory.searchFeatureProvider)
+                .searchRankingWarmup(any(Context.class));
+    }
+
+    @Test
+    public void onResume_shouldNotCallSearchRankingWarmupIfSmartSearchRankingDisabled(){
+        when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(any(Context.class)))
+                .thenReturn(false);
+
+        ActivityController<SearchActivity> activityController =
+                Robolectric.buildActivity(SearchActivity.class);
+        activityController.setup();
+        SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
+                .findFragmentById(R.id.main_content);
+
+        verify(mFeatureFactory.searchFeatureProvider, never())
+                .searchRankingWarmup(any(Context.class));
+    }
+
     private ArgumentMatcher<Pair<Integer, Object>> pairMatches(int tag) {
         return pair -> pair.first == tag;
     }
diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java b/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
index b4a91c5..0769af5 100644
--- a/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
+++ b/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.search;
 
+import static com.google.common.truth.Truth.assertWithMessage;
+
 import android.util.ArraySet;
 import android.util.Log;
 
@@ -28,8 +30,6 @@
 import java.util.List;
 import java.util.Set;
 
-import static com.google.common.truth.Truth.assertWithMessage;
-
 /**
  * {@link CodeInspector} to ensure fragments implement search components correctly.
  */
@@ -144,15 +144,6 @@
         assertWithMessage(notInProviderRegistryError)
                 .that(notInSearchProviderRegistry)
                 .isEmpty();
-        assertNoObsoleteInGrandfatherList("grandfather_not_implementing_indexable",
-                notImplementingIndexableGrandfatherList);
-        assertNoObsoleteInGrandfatherList("grandfather_not_implementing_index_provider",
-                notImplementingIndexProviderGrandfatherList);
-        assertNoObsoleteInGrandfatherList("grandfather_not_in_search_index_provider_registry",
-                notInSearchIndexableRegistryGrandfatherList);
-        assertNoObsoleteInGrandfatherList(
-                "grandfather_not_sharing_pref_controllers_with_search_provider",
-                notSharingPrefControllersGrandfatherList);
     }
 
     private boolean hasSearchIndexProvider(Class clazz) {
diff --git a/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java b/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java
index e601087..cd77b25 100644
--- a/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java
@@ -17,14 +17,16 @@
 
 package com.android.settings.search;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.search.SearchResult.Builder;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -34,8 +36,6 @@
 
 import java.util.ArrayList;
 
-import static com.google.common.truth.Truth.assertThat;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SearchResultBuilderTest {
@@ -57,7 +57,7 @@
         mResultPayload = new ResultPayload(new Intent());
 
         final Context context = ShadowApplication.getInstance().getApplicationContext();
-        mIcon = context.getDrawable(R.drawable.ic_search_history);
+        mIcon = context.getDrawable(R.drawable.ic_search_24dp);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java b/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java
index 503054b..a2afb35 100644
--- a/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java
@@ -17,6 +17,14 @@
 
 package com.android.settings.search;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -26,10 +34,10 @@
 import android.widget.FrameLayout;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.search.SearchResult.Builder;
 import com.android.settings.search.ranking.SearchResultsRankerCallback;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -49,14 +57,6 @@
 import java.util.Objects;
 import java.util.Set;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SearchResultsAdapterTest {
@@ -83,6 +83,8 @@
         mLoaderClassName = DatabaseResultLoader.class.getName();
         when(mFragment.getContext()).thenReturn(mMockContext);
         when(mMockContext.getApplicationContext()).thenReturn(mContext);
+        when(mSearchFeatureProvider.smartSearchRankingTimeoutMs(any(Context.class)))
+                .thenReturn(300L);
         mAdapter = new SearchResultsAdapter(mFragment, mSearchFeatureProvider);
     }
 
@@ -220,6 +222,7 @@
         assertThat(results.get(5).title).isEqualTo(TITLES[5]); // appCharlie
         verify(mFragment).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
         assertThat(mSearchResultsCountCaptor.getValue()).isEqualTo(6);
+        assertThat(mAdapter.getAsyncRankingState()).isEqualTo(SearchResultsAdapter.SUCCEEDED);
     }
 
     @Test
@@ -245,6 +248,7 @@
         assertThat(results.get(5).title).isEqualTo(TITLES[5]); // appCharlie
         verify(mFragment).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
         assertThat(mSearchResultsCountCaptor.getValue()).isEqualTo(6);
+        assertThat(mAdapter.getAsyncRankingState()).isEqualTo(SearchResultsAdapter.SUCCEEDED);
     }
 
     @Test
@@ -270,6 +274,7 @@
         assertThat(results.get(5).title).isEqualTo(TITLES[2]); // charlie
         verify(mFragment).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
         assertThat(mSearchResultsCountCaptor.getValue()).isEqualTo(6);
+        assertThat(mAdapter.getAsyncRankingState()).isEqualTo(SearchResultsAdapter.FAILED);
     }
 
     @Test
@@ -295,6 +300,7 @@
         assertThat(results.get(5).title).isEqualTo(TITLES[2]); // charlie
         verify(mFragment).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
         assertThat(mSearchResultsCountCaptor.getValue()).isEqualTo(6);
+        assertThat(mAdapter.getAsyncRankingState()).isEqualTo(SearchResultsAdapter.FAILED);
     }
 
     @Test
@@ -321,6 +327,7 @@
         assertThat(results.get(5).title).isEqualTo(TITLES[2]); // charlie
         verify(mFragment).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
         assertThat(mSearchResultsCountCaptor.getValue()).isEqualTo(6);
+        assertThat(mAdapter.getAsyncRankingState()).isEqualTo(SearchResultsAdapter.TIMED_OUT);
     }
 
     @Test
@@ -348,6 +355,7 @@
         assertThat(results.get(5).title).isEqualTo(TITLES[2]); // charlie
         verify(mFragment).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
         assertThat(mSearchResultsCountCaptor.getValue()).isEqualTo(6);
+        assertThat(mAdapter.getAsyncRankingState()).isEqualTo(SearchResultsAdapter.TIMED_OUT);
     }
 
     @Test
@@ -451,6 +459,7 @@
         mAdapter.notifyResultsLoaded();
         verify(mSearchFeatureProvider, never()).querySearchResults(
                 any(Context.class), anyString(), any(SearchResultsRankerCallback.class));
+        assertThat(mAdapter.getAsyncRankingState()).isEqualTo(SearchResultsAdapter.DISABLED);
     }
 
     @Test
@@ -460,6 +469,8 @@
         mAdapter.notifyResultsLoaded();
         verify(mSearchFeatureProvider, times(1)).querySearchResults(
                 any(Context.class), anyString(), any(SearchResultsRankerCallback.class));
+        assertThat(mAdapter.getAsyncRankingState())
+                .isEqualTo(SearchResultsAdapter.PENDING_RESULTS);
     }
 
     @Test
@@ -544,7 +555,7 @@
     private Set<SearchResult> getIntentSampleResults() {
         Set<SearchResult> sampleResults = new HashSet<>();
         ArrayList<String> breadcrumbs = new ArrayList<>();
-        final Drawable icon = mContext.getDrawable(R.drawable.ic_search_history);
+        final Drawable icon = mContext.getDrawable(R.drawable.ic_search_24dp);
         final ResultPayload payload = new ResultPayload(null);
         final SearchResult.Builder builder = new Builder();
         builder.setTitle("title")
diff --git a/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java b/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java
index 1a37dec..1809e88 100644
--- a/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java
+++ b/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java
@@ -34,11 +34,14 @@
 import static org.mockito.Mockito.verify;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(
+    manifest = TestConfig.MANIFEST_PATH,
+    sdk = TestConfig.SDK_VERSION,
+    shadows = ShadowEventLogWriter.class
+)
 public class ConfigureKeyGuardDialogTest {
 
     @Test
-    @Config(shadows = ShadowEventLogWriter.class)
     public void displayDialog_clickPositiveButton_launchSetNewPassword() {
         final FragmentController<ConfigureKeyGuardDialog> fragmentController =
                 Robolectric.buildFragment(ConfigureKeyGuardDialog.class);
diff --git a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
index 77ed4b0..a7a9706 100644
--- a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
+++ b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
@@ -73,6 +73,13 @@
                 R.string.wifi_calling_suggestion_title, R.string.wifi_calling_suggestion_summary);
     }
 
+    @Test
+    public void nightDisplaySuggestion_isValid() {
+        assertSuggestionEquals("Settings$NightDisplaySuggestionActivity",
+            CATEGORY_FIRST_IMPRESSION,
+            R.string.night_display_suggestion_title, R.string.night_display_suggestion_summary);
+    }
+
     private void assertSuggestionEquals(String activityName, String category, @StringRes int title,
             @StringRes int summary) {
         final AndroidManifest androidManifest = ShadowApplication.getInstance().getAppManifest();
diff --git a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
index 7310ae0..b986e4f 100644
--- a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
@@ -37,7 +37,11 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(
+    manifest = TestConfig.MANIFEST_PATH,
+    sdk = TestConfig.SDK_VERSION,
+    shadows = {ShadowSecureSettings.class, ShadowUtils.class}
+)
 public class FactoryResetPreferenceControllerTest {
 
     private static final String FACTORY_RESET_KEY = "factory_reset";
@@ -72,7 +76,6 @@
     }
 
     @Test
-    @Config(shadows = { ShadowSecureSettings.class, ShadowUtils.class })
     public void isAvailable_nonSystemUser() {
         when(mUserManager.isAdminUser()).thenReturn(false);
         ShadowUtils.setIsDemoUser(false);
@@ -81,7 +84,6 @@
     }
 
     @Test
-    @Config(shadows = { ShadowSecureSettings.class, ShadowUtils.class })
     public void isAvailable_demoUser() {
         when(mUserManager.isAdminUser()).thenReturn(false);
         ShadowUtils.setIsDemoUser(true);
diff --git a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
index 19f8ee2..cd25953 100644
--- a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
@@ -16,14 +16,23 @@
 
 package com.android.settings.system;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.os.UserManager;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.XmlTestUtils;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.testutils.shadow.ShadowUserManager;
 
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -31,19 +40,25 @@
 
 import java.util.List;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
         shadows = {
-                ShadowUserManager.class
+                ShadowUserManager.class,
+                SettingsShadowResources.class,
         })
 public class SystemDashboardFragmentTest {
 
+    @Before
+    public void setup() {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.bool.config_supportSystemNavigationKeys, true);
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
     @Test
     public void testNonIndexableKeys_existInXmlLayout() {
         final Context context = spy(RuntimeEnvironment.application);
diff --git a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
index 8be2496..6da7a66 100644
--- a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
+++ b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
@@ -19,9 +19,11 @@
 
 import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.bluetooth.BluetoothFeatureProvider;
+import com.android.settings.connecteddevice.SmsMirroringFeatureProvider;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.dashboard.DashboardFeatureProvider;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
+import com.android.settings.datausage.DataPlanFeatureProvider;
 import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
 import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
 import com.android.settings.gestures.AssistGestureFeatureProvider;
@@ -57,6 +59,8 @@
     public final UserFeatureProvider userFeatureProvider;
     public final AssistGestureFeatureProvider assistGestureFeatureProvider;
     public final BluetoothFeatureProvider bluetoothFeatureProvider;
+    public final DataPlanFeatureProvider dataPlanFeatureProvider;
+    public final SmsMirroringFeatureProvider smsMirroringFeatureProvider;
 
     /**
      * Call this in {@code @Before} method of the test class to use fake factory.
@@ -94,6 +98,8 @@
         userFeatureProvider = mock(UserFeatureProvider.class);
         assistGestureFeatureProvider = mock(AssistGestureFeatureProvider.class);
         bluetoothFeatureProvider = mock(BluetoothFeatureProvider.class);
+        dataPlanFeatureProvider = mock(DataPlanFeatureProvider.class);
+        smsMirroringFeatureProvider = mock(SmsMirroringFeatureProvider.class);
     }
 
     @Override
@@ -162,7 +168,17 @@
     }
 
     @Override
+    public DataPlanFeatureProvider getDataPlanFeatureProvider() {
+        return dataPlanFeatureProvider;
+    }
+
+    @Override
     public AssistGestureFeatureProvider getAssistGestureFeatureProvider() {
         return assistGestureFeatureProvider;
     }
+
+    @Override
+    public SmsMirroringFeatureProvider getSmsMirroringFeatureProvider() {
+        return smsMirroringFeatureProvider;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPreferenceFragment.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAppInfoBase.java
similarity index 81%
rename from tests/robotests/src/com/android/settings/testutils/shadow/ShadowPreferenceFragment.java
rename to tests/robotests/src/com/android/settings/testutils/shadow/ShadowAppInfoBase.java
index cfd0ce9..12173c8 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPreferenceFragment.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAppInfoBase.java
@@ -16,20 +16,20 @@
 
 package com.android.settings.testutils.shadow;
 
-import android.support.v14.preference.PreferenceFragment;
+import com.android.settings.applications.AppInfoBase;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 
-@Implements(PreferenceFragment.class)
-public class ShadowPreferenceFragment {
+@Implements(AppInfoBase.class)
+public class ShadowAppInfoBase {
 
     @Implementation
-    public void onStart() {
+    public void onResume() {
         // No-op.
     }
 
     @Implementation
-    public void onStop() {
+    public void onPause() {
         // No-op.
     }
 }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageSummary.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java
similarity index 80%
rename from tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageSummary.java
rename to tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java
index c5fc601..fecceb6 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageSummary.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java
@@ -2,12 +2,12 @@
 
 import android.content.Context;
 
-import com.android.settings.datausage.DataUsageSummary;
+import com.android.settings.datausage.DataUsageUtils;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 
-@Implements(DataUsageSummary.class)
-public class ShadowDataUsageSummary {
+@Implements(DataUsageUtils.class)
+public class ShadowDataUsageUtils {
 
     public static boolean IS_MOBILE_DATA_SUPPORTED = true;
     public static boolean IS_WIFI_SUPPORTED = true;
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDynamicIndexableContentMonitor.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDynamicIndexableContentMonitor.java
deleted file mode 100644
index de5d243..0000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDynamicIndexableContentMonitor.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.android.settings.testutils.shadow;
-
-import android.app.Activity;
-import android.os.UserManager;
-import com.android.settings.search.DynamicIndexableContentMonitor;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.annotation.RealObject;
-
-/**
- * A shadow class of {@link DynamicIndexableContentMonitor}. The real implementation of
- * {@link DynamicIndexableContentMonitor#register} calls {@link UserManager#isUserUnlocked()}, which
- * Robolectric has not yet been updated to support, so throws a NoSuchMethodError exception.
- */
-// TODO: Delete this once Robolectric is updated to the latest SDK.
-@Implements(DynamicIndexableContentMonitor.class)
-public class ShadowDynamicIndexableContentMonitor {
-
-    @Implementation
-    public void register(Activity activity, int loaderId) {
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java
new file mode 100644
index 0000000..b84cf42
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.testutils.shadow;
+
+import android.content.Context;
+import android.hardware.fingerprint.Fingerprint;
+import android.hardware.fingerprint.FingerprintManager;
+import android.support.annotation.NonNull;
+
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.annotation.Resetter;
+import org.robolectric.internal.ShadowExtractor;
+import org.robolectric.shadows.ShadowContextImpl;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.IntStream;
+
+@Implements(FingerprintManager.class)
+public class ShadowFingerprintManager {
+
+    private static Map<String, String> getSystemServiceMap() {
+        return ReflectionHelpers.getStaticField(ShadowContextImpl.class, "SYSTEM_SERVICE_MAP");
+    }
+
+    /**
+     * Call this in @Before of a test to add FingerprintManager to Robolectric's system service
+     * map. Otherwise getSystemService(FINGERPRINT_SERVICE) will return null.
+     */
+    public static void addToServiceMap() {
+        getSystemServiceMap().put(Context.FINGERPRINT_SERVICE, FingerprintManager.class.getName());
+    }
+
+    @Resetter
+    public static void reset() {
+        getSystemServiceMap().remove(Context.FINGERPRINT_SERVICE);
+    }
+
+    public boolean hardwareDetected = true;
+
+    @NonNull
+    private List<Fingerprint> mFingerprints = Collections.emptyList();
+
+    @Implementation
+    public boolean isHardwareDetected() {
+        return hardwareDetected;
+    }
+
+    @Implementation
+    public boolean hasEnrolledFingerprints() {
+        return !mFingerprints.isEmpty();
+    }
+
+    @Implementation
+    public List<Fingerprint> getEnrolledFingerprints() {
+        return mFingerprints;
+    }
+
+    @Implementation
+    public List<Fingerprint> getEnrolledFingerprints(int userId) {
+        return mFingerprints;
+    }
+
+    public void setEnrolledFingerprints(Fingerprint... fingerprints) {
+        mFingerprints = Arrays.asList(fingerprints);
+    }
+
+    public void setDefaultFingerprints(int num) {
+        setEnrolledFingerprints(
+                IntStream.range(0, num)
+                        .mapToObj(i -> new Fingerprint(
+                                "Fingerprint " + i,
+                                0, /* groupId */
+                                i, /* fingerId */
+                                0 /* deviceId */))
+                        .toArray(Fingerprint[]::new));
+    }
+
+    public static ShadowFingerprintManager get() {
+        return (ShadowFingerprintManager) ShadowExtractor.extract(
+                RuntimeEnvironment.application.getSystemService(FingerprintManager.class));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowHelpUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowHelpUtils.java
new file mode 100644
index 0000000..9873502
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowHelpUtils.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.testutils.shadow;
+
+import android.content.Context;
+import android.content.Intent;
+
+import com.android.settings.SettingsActivity;
+import com.android.settingslib.HelpUtils;
+
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.annotation.Resetter;
+
+@Implements(HelpUtils.class)
+public class ShadowHelpUtils {
+
+    private static boolean mGetHelpIntentCalled;
+
+    public static boolean isGetHelpIntentCalled() {
+        return mGetHelpIntentCalled;
+    }
+
+    @Resetter
+    public static void reset() {
+        mGetHelpIntentCalled = false;
+    }
+
+    @Implementation
+    public static Intent getHelpIntent(Context context, String helpUriString,
+            String backupContext) {
+        mGetHelpIntentCalled = true;
+        return new Intent().setClassName(
+                RuntimeEnvironment.application.getPackageName(), SettingsActivity.class.getName());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java
index ce397e4..8b2a27b 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java
@@ -18,88 +18,115 @@
 
 import android.content.ContentResolver;
 import android.provider.Settings;
-
+import com.google.common.collect.HashBasedTable;
+import com.google.common.collect.Table;
+import java.util.Map;
+import java.util.WeakHashMap;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 
-import java.util.HashMap;
-import java.util.Map;
-
 @Implements(Settings.Secure.class)
 public class ShadowSecureSettings {
 
-    private static final Map<String, Object> mValueMap = new HashMap<>();
-
-    @Implementation
-    public static boolean putInt(ContentResolver resolver, String name, int value) {
-        mValueMap.put(name, value);
-        return true;
-    }
-
-    @Implementation
-    public static boolean putString(ContentResolver resolver, String name, String value) {
-        mValueMap.put(name, value);
-        return true;
-    }
+    private static final Map<ContentResolver, Table<Integer, String, Object>> sUserDataMap =
+        new WeakHashMap<>();
 
     @Implementation
     public static boolean putStringForUser(ContentResolver resolver, String name, String value,
-            int userHandle) {
-        mValueMap.put(name, value);
-        return true;
-    }
-
-    @Implementation
-    public static String getString(ContentResolver resolver, String name) {
-        return (String) mValueMap.get(name);
+        int userHandle) {
+        final Table<Integer, String, Object> userTable = getUserTable(resolver);
+        synchronized (userTable) {
+            if (value != null) {
+                userTable.put(userHandle, name, value);
+            } else {
+                userTable.remove(userHandle, name);
+            }
+            return true;
+        }
     }
 
     @Implementation
     public static String getStringForUser(ContentResolver resolver, String name, int userHandle) {
-        return getString(resolver, name);
+        final Table<Integer, String, Object> userTable = getUserTable(resolver);
+        synchronized (userTable) {
+            return (String) userTable.get(userHandle, name);
+        }
     }
 
     @Implementation
-    public static boolean putIntForUser(ContentResolver cr, String name, int value,
-            int userHandle) {
-        return putInt(cr, name, value);
+    public static boolean putIntForUser(ContentResolver resolver, String name, int value,
+        int userHandle) {
+        final Table<Integer, String, Object> userTable = getUserTable(resolver);
+        synchronized (userTable) {
+            userTable.put(userHandle, name, value);
+            return true;
+        }
     }
 
     @Implementation
-    public static int getIntForUser(ContentResolver cr, String name, int def, int userHandle) {
-        return getInt(cr, name, def);
+    public static int getIntForUser(ContentResolver resolver, String name, int def,
+        int userHandle) {
+        final Table<Integer, String, Object> userTable = getUserTable(resolver);
+        synchronized (userTable) {
+            final Object object = userTable.get(userHandle, name);
+            return object instanceof Integer ? (Integer) object : def;
+        }
     }
 
     @Implementation
-    public static int getInt(ContentResolver resolver, String name, int defaultValue) {
-        Integer value = (Integer) mValueMap.get(name);
-        return value == null ? defaultValue : value;
+    public static boolean putLongForUser(ContentResolver resolver, String name, long value,
+        int userHandle) {
+        final Table<Integer, String, Object> userTable = getUserTable(resolver);
+        synchronized (userTable) {
+            userTable.put(userHandle, name, value);
+            return true;
+        }
     }
 
     @Implementation
-    public static boolean putFloat(ContentResolver resolver, String name, float value) {
-        mValueMap.put(name, value);
-        return true;
+    public static long getLongForUser(ContentResolver resolver, String name, long def,
+        int userHandle) {
+        final Table<Integer, String, Object> userTable = getUserTable(resolver);
+        synchronized (userTable) {
+            final Object object = userTable.get(userHandle, name);
+            return object instanceof Long ? (Long) object : def;
+        }
     }
 
     @Implementation
-    public static boolean putFloatForUser(ContentResolver cr, String name, float value,
-            float userHandle) {
-        return putFloat(cr, name, value);
+    public static boolean putFloatForUser(
+            ContentResolver resolver, String name, float value, int userHandle) {
+        final Table<Integer, String, Object> userTable = getUserTable(resolver);
+        synchronized (userTable) {
+            userTable.put(userHandle, name, value);
+            return true;
+        }
     }
 
     @Implementation
-    public static float getFloatForUser(ContentResolver cr, String name, float def, int userHandle) {
-        return getFloat(cr, name, def);
-    }
-
-    @Implementation
-    public static float getFloat(ContentResolver resolver, String name, float defaultValue) {
-        Float value = (Float) mValueMap.get(name);
-        return value == null ? defaultValue : value;
+    public static float getFloatForUser(
+            ContentResolver resolver, String name, float def, int userHandle) {
+        final Table<Integer, String, Object> userTable = getUserTable(resolver);
+        synchronized (userTable) {
+            final Object object = userTable.get(userHandle, name);
+            return object instanceof Float ? (Float) object : def;
+        }
     }
 
     public static void clear() {
-        mValueMap.clear();
+        synchronized (sUserDataMap) {
+            sUserDataMap.clear();
+        }
+    }
+
+    private static Table<Integer, String, Object> getUserTable(ContentResolver contentResolver) {
+        synchronized (sUserDataMap) {
+            Table<Integer, String, Object> table = sUserDataMap.get(contentResolver);
+            if (table == null) {
+                table = HashBasedTable.create();
+                sUserDataMap.put(contentResolver, table);
+            }
+            return table;
+        }
     }
 }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java
index 8d0df17..271ffa8 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java
@@ -18,6 +18,8 @@
 
 import android.content.ComponentName;
 import android.content.Context;
+import android.os.UserHandle;
+import android.os.UserManager;
 
 import com.android.settings.Utils;
 import com.android.settings.password.IFingerprintManager;
@@ -29,6 +31,7 @@
 public class ShadowUtils {
 
     private static IFingerprintManager sFingerprintManager = null;
+    private static boolean sIsUserAMonkey;
     private static boolean sIsDemoUser;
     private static ComponentName sDeviceOwnerComponentName;
 
@@ -48,6 +51,7 @@
 
     public static void reset() {
         sFingerprintManager = null;
+        sIsUserAMonkey = false;
         sIsDemoUser = false;
     }
 
@@ -65,6 +69,18 @@
         return sIsDemoUser;
     }
 
+    public static void setIsUserAMonkey(boolean isUserAMonkey) {
+        sIsUserAMonkey = isUserAMonkey;
+    }
+
+    /**
+     * Returns true if Monkey is running.
+     */
+    @Implementation
+    public static boolean isMonkeyRunning() {
+        return sIsUserAMonkey;
+    }
+
     public static void setDeviceOwnerComponent(ComponentName componentName) {
         sDeviceOwnerComponentName = componentName;
     }
@@ -73,4 +89,9 @@
     public static ComponentName getDeviceOwnerComponent(Context context) {
         return sDeviceOwnerComponentName;
     }
+
+    @Implementation
+    public static int getManagedProfileId(UserManager um, int parentUserId) {
+        return UserHandle.USER_NULL;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java
index be50d77..41ba1e4 100644
--- a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java
@@ -104,4 +104,15 @@
         verify(mRecyclerView, times(2)).addOnScrollListener(any());
     }
 
+    @Test
+    public void onScrolled_nullAnchorViewAndActivity_shouldNotCrash() {
+        final Activity activity = null;
+        final ActionBarShadowController controller =
+                ActionBarShadowController.attachToRecyclerView(activity, mLifecycle, mRecyclerView);
+
+        // Scroll
+        controller.mScrollChangeWatcher.onScrolled(mRecyclerView, 10 /* dx */, 10 /* dy */);
+        // no crash
+    }
+
 }
diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
index 4294dcf..9c6ee45 100644
--- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.widget;
 
-
 import android.app.ActionBar;
 import android.app.Activity;
 import android.app.Fragment;
@@ -30,6 +29,7 @@
 import android.support.v7.preference.Preference;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.ImageButton;
 import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto;
@@ -53,6 +53,7 @@
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -147,8 +148,9 @@
                 EntityHeaderController.ActionType.ACTION_NONE);
         mController.done(mActivity);
 
-        assertThat(appLinks.findViewById(android.R.id.button1).getVisibility())
-                .isEqualTo(View.VISIBLE);
+        final ImageButton button1 = appLinks.findViewById(android.R.id.button1);
+        assertThat(button1.getVisibility()).isEqualTo(View.VISIBLE);
+        assertThat(button1.getDrawable()).isNotNull();
         assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
                 .isEqualTo(View.GONE);
         try {
@@ -175,21 +177,25 @@
                 EntityHeaderController.ActionType.ACTION_NONE);
         mController.done(mActivity);
 
-        assertThat(appLinks.findViewById(android.R.id.button1).getVisibility())
-                .isEqualTo(View.GONE);
+        final ImageButton button1 = appLinks.findViewById(android.R.id.button1);
+        assertThat(button1.getVisibility()).isEqualTo(View.GONE);
+        assertThat(button1.getDrawable()).isNull();
         assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
                 .isEqualTo(View.GONE);
     }
 
     @Test
-    public void bindButton_noAppInfo_shouldNotShowButton() {
+    public void bindButton_noAppInfo_shouldNotAttachClickListener() {
         final View appLinks = mLayoutInflater
                 .inflate(R.layout.settings_entity_header, null /* root */);
+        final Activity activity = mock(Activity.class);
+        when(mFragment.getActivity()).thenReturn(activity);
 
         mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
         mController.setPackageName(null)
+                .setHasAppInfoLink(true)
                 .setButtonActions(
-                        EntityHeaderController.ActionType.ACTION_APP_INFO,
+                        EntityHeaderController.ActionType.ACTION_NONE,
                         EntityHeaderController.ActionType.ACTION_NONE);
         mController.done(mActivity);
 
@@ -197,45 +203,32 @@
                 .isEqualTo(View.GONE);
         assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
                 .isEqualTo(View.GONE);
+
+        appLinks.findViewById(R.id.entity_header_content).performClick();
+        verify(mFragment, never()).getActivity();
+        verify(activity, never()).startActivity(any(Intent.class));
     }
 
     @Test
-    public void bindButton_hasAppInfo_shouldShowButton() {
+    public void bindButton_hasAppInfo_shouldAttachClickListener() {
         final View appLinks = mLayoutInflater
                 .inflate(R.layout.settings_entity_header, null /* root */);
-        when(mFragment.getActivity()).thenReturn(mock(Activity.class));
-
-        mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
-        mController.setPackageName("123")
-                .setUid(UserHandle.USER_SYSTEM)
-                .setButtonActions(
-                        EntityHeaderController.ActionType.ACTION_APP_INFO,
-                        EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE);
-        mController.done(mActivity);
-
-        assertThat(appLinks.findViewById(android.R.id.button1).getVisibility())
-                .isEqualTo(View.VISIBLE);
-        assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
-                .isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void bindButton_hasAppInfo_shouldHaveContentDescription() {
-        final View appLinks = mLayoutInflater
-                .inflate(R.layout.settings_entity_header, null /* root */);
-        when(mFragment.getActivity()).thenReturn(mock(Activity.class));
+        final Activity activity = mock(Activity.class);
+        when(mFragment.getActivity()).thenReturn(activity);
         when(mContext.getString(eq(R.string.application_info_label))).thenReturn("App Info");
 
         mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
         mController.setPackageName("123")
                 .setUid(UserHandle.USER_SYSTEM)
+                .setHasAppInfoLink(true)
                 .setButtonActions(
-                        EntityHeaderController.ActionType.ACTION_APP_INFO,
-                        EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE);
+                        EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE,
+                        EntityHeaderController.ActionType.ACTION_NONE);
         mController.done(mActivity);
 
-        assertThat(appLinks.findViewById(android.R.id.button1).getContentDescription().toString())
-                .isEqualTo("App info");
+        appLinks.findViewById(R.id.entity_header_content).performClick();
+        verify(activity).startActivityForResultAsUser(
+                any(Intent.class), anyInt(), any(UserHandle.class));
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java b/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java
new file mode 100644
index 0000000..09b52c8
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.widget;
+
+import android.content.Context;
+import android.os.Handler;
+import android.view.View;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class LoadingViewControllerTest {
+
+    private Context mContext;
+    private View mLoadingView;
+    private View mContentView;
+
+    private LoadingViewController mController;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mLoadingView = new View(mContext);
+        mContentView = new View(mContext);
+
+        mController = new LoadingViewController(mLoadingView, mContentView);
+    }
+
+    @Test
+    public void showContent_shouldSetContentVisible() {
+        mController.showContent(false /* animate */);
+
+        assertThat(mContentView.getVisibility()).isEqualTo(View.VISIBLE);
+    }
+
+    @Test
+    public void showLoadingViewDelayed_shouldPostRunnable() {
+        final Handler handler = mock(Handler.class);
+        ReflectionHelpers.setField(mController, "mFgHandler", handler);
+        mController.showLoadingViewDelayed();
+
+        verify(handler).postDelayed(any(Runnable.class), anyLong());
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java
index ea27d05..78afc43 100644
--- a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java
@@ -34,7 +34,11 @@
 import static com.google.common.truth.Truth.assertThat;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(
+    manifest = TestConfig.MANIFEST_PATH,
+    sdk = TestConfig.SDK_VERSION,
+    shadows = {ShadowTextUtils.class}
+)
 public class RtlCompatibleViewPagerTest {
 
     private Locale mLocaleEn;
@@ -51,7 +55,6 @@
     }
 
     @Test
-    @Config(shadows = {ShadowTextUtils.class})
     public void testGetCurrentItem_shouldMaintainIndexDuringLocaleChange() {
         testRtlCompatibleInner(0);
         testRtlCompatibleInner(1);
diff --git a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java
new file mode 100644
index 0000000..e061787
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.widget;
+
+
+import android.text.InputType;
+import android.text.TextWatcher;
+import android.view.View;
+import android.widget.EditText;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class ValidatedEditTextPreferenceTest {
+
+    @Mock
+    private View mView;
+    @Mock
+    private ValidatedEditTextPreference.Validator mValidator;
+
+    private ValidatedEditTextPreference mPreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mPreference = new ValidatedEditTextPreference(RuntimeEnvironment.application);
+    }
+
+    @Test
+    public void bindDialogView_nullEditText_shouldNotCrash() {
+        when(mView.findViewById(android.R.id.edit)).thenReturn(null);
+        // should not crash trying to get the EditText text
+        mPreference.onBindDialogView(mView);
+    }
+
+    @Test
+    public void bindDialogView_emptyEditText_shouldNotSetSelection() {
+        final String testText = "";
+        final EditText editText = spy(new EditText(RuntimeEnvironment.application));
+        editText.setText(testText);
+        when(mView.findViewById(android.R.id.edit)).thenReturn(editText);
+
+        mPreference.onBindDialogView(mView);
+
+        // no need to setSelection if text was empty
+        verify(editText, never()).setSelection(anyInt());
+    }
+
+    @Test
+    public void bindDialogView_nonemptyEditText_shouldSetSelection() {
+        final String testText = "whatever";
+        final EditText editText = spy(new EditText(RuntimeEnvironment.application));
+        editText.setText(testText);
+        when(mView.findViewById(android.R.id.edit)).thenReturn(editText);
+
+        mPreference.onBindDialogView(mView);
+
+        // selection should be set to end of string
+        verify(editText).setSelection(testText.length());
+    }
+
+    @Test
+    public void bindDialogView_hasValidator_shouldBindToEditText() {
+        final EditText editText = spy(new EditText(RuntimeEnvironment.application));
+        when(mView.findViewById(android.R.id.edit)).thenReturn(editText);
+
+        mPreference.setValidator(mValidator);
+        mPreference.onBindDialogView(mView);
+
+        verify(editText).addTextChangedListener(any(TextWatcher.class));
+    }
+
+    @Test
+    public void bindDialogView_isPassword_shouldSetInputType() {
+        final EditText editText = spy(new EditText(RuntimeEnvironment.application));
+        when(mView.findViewById(android.R.id.edit)).thenReturn(editText);
+
+        mPreference.setValidator(mValidator);
+        mPreference.setIsPassword(true);
+        mPreference.onBindDialogView(mView);
+
+        assertThat(editText.getInputType()
+                & (InputType.TYPE_TEXT_VARIATION_PASSWORD | InputType.TYPE_CLASS_TEXT))
+                .isNotEqualTo(0);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java
new file mode 100644
index 0000000..687287b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java
@@ -0,0 +1,83 @@
+package com.android.settings.wifi;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.XmlTestUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class ConfigureWifiSettingsTest {
+
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = spy(RuntimeEnvironment.application);
+    }
+
+    @Test
+    public void testNonIndexableKeys_existInXmlLayout() {
+        final List<String> niks = ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER
+                .getNonIndexableKeys(mContext);
+        final int xmlId = new ConfigureWifiSettings().getPreferenceScreenResId();
+
+        final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(mContext, xmlId);
+
+        assertThat(keys).containsAllIn(niks);
+    }
+
+    @Test
+    public void testNonIndexableKeys_noConnection_blocksIP() {
+        ConnectivityManager manager = mock(ConnectivityManager.class);
+        when(manager.getActiveNetworkInfo()).thenReturn(null);
+        doReturn(manager).when(mContext).getSystemService(Context.CONNECTIVITY_SERVICE);
+
+        final List<String> niks = ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER
+                .getNonIndexableKeys(mContext);
+        assertThat(niks).contains(ConfigureWifiSettings.KEY_IP_ADDRESS);
+    }
+
+    @Test
+    public void testNonIndexableKeys_wifiConnection_blocksIP() {
+        ConnectivityManager manager = mock(ConnectivityManager.class);
+        NetworkInfo info = mock(NetworkInfo.class);
+        when(info.getType()).thenReturn(ConnectivityManager.TYPE_WIFI);
+        when(manager.getActiveNetworkInfo()).thenReturn(info);
+        doReturn(manager).when(mContext).getSystemService(Context.CONNECTIVITY_SERVICE);
+
+        final List<String> niks = ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER
+                .getNonIndexableKeys(mContext);
+        assertThat(niks).contains(ConfigureWifiSettings.KEY_IP_ADDRESS);
+    }
+
+    @Test
+    public void testNonIndexableKeys_mobileConnection_blocksIP() {
+        ConnectivityManager manager = mock(ConnectivityManager.class);
+        NetworkInfo info = mock(NetworkInfo.class);
+        when(info.getType()).thenReturn(ConnectivityManager.TYPE_MOBILE);
+        when(manager.getActiveNetworkInfo()).thenReturn(info);
+        doReturn(manager).when(mContext).getSystemService(Context.CONNECTIVITY_SERVICE);
+
+        final List<String> niks = ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER
+                .getNonIndexableKeys(mContext);
+        assertThat(niks).doesNotContain(ConfigureWifiSettings.KEY_IP_ADDRESS);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/SavedAccessPointsWifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/SavedAccessPointsWifiSettingsTest.java
new file mode 100644
index 0000000..8a72d25
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/SavedAccessPointsWifiSettingsTest.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi;
+
+import android.app.Activity;
+import android.content.Context;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import android.net.wifi.WifiManager.ActionListener;
+
+import com.android.settings.TestConfig;
+import com.android.settingslib.wifi.AccessPoint;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SavedAccessPointsWifiSettingsTest {
+
+  @Mock private Activity mActivity;
+  @Mock private WifiManager mockWifiManager;
+  @Mock private WifiDialog mockWifiDialog;
+  @Mock private WifiConfigController mockConfigController;
+  @Mock private WifiConfiguration mockWifiConfiguration;
+  @Mock private AccessPoint mockAccessPoint;
+
+  private Context mContext;
+
+  private SavedAccessPointsWifiSettings mFragment;
+
+  @Before
+  public void setUp() {
+    MockitoAnnotations.initMocks(this);
+    mContext = RuntimeEnvironment.application;
+    mFragment = new SavedAccessPointsWifiSettings();
+    when(mockWifiDialog.getController()).thenReturn(mockConfigController);
+    when(mockConfigController.getConfig()).thenReturn(mockWifiConfiguration);
+
+    ReflectionHelpers.setField(mFragment, "mWifiManager", mockWifiManager);
+  }
+
+  @Test
+  public void onSubmit_shouldInvokeSaveApi() {
+    mFragment.onSubmit(mockWifiDialog);
+    verify(mockWifiManager).save(eq(mockWifiConfiguration), any(ActionListener.class));
+  }
+
+  @Test
+  public void onForget_shouldInvokeForgetApi() {
+    ReflectionHelpers.setField(mFragment, "mSelectedAccessPoint", mockAccessPoint);
+    when(mockAccessPoint.getConfig()).thenReturn(mockWifiConfiguration);
+
+    mFragment.onForget(mockWifiDialog);
+
+    verify(mockWifiManager).forget(eq(mockWifiConfiguration.networkId), any(ActionListener.class));
+  }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
index b45ea1e..e9b6146 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
@@ -19,6 +19,7 @@
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Spinner;
 import android.widget.TextView;
 
@@ -37,7 +38,7 @@
 import org.robolectric.annotation.Config;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
@@ -54,8 +55,9 @@
     private AccessPoint mAccessPoint;
 
     public WifiConfigController mController;
-
-    // An invalid PSK pass phrase. It is 64 characters long, must not be greater than 63
+    private static final String HEX_PSK = "01234567012345670123456701234567012345670123456701234567"
+            + "01abcdef";
+    // An invalid ASCII PSK pass phrase. It is 64 characters long, must not be greater than 63
     private static final String LONG_PSK =
             "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl";
     // An invalid PSK pass phrase. It is 7 characters long, must be at least 8
@@ -140,6 +142,14 @@
     }
 
     @Test
+    public void isSubmittable_hexPsk_shouldReturnTrue() {
+        final TextView password = mView.findViewById(R.id.password);
+        password.setText(HEX_PSK);
+        assertThat(mController.isSubmittable()).isTrue();
+
+    }
+
+    @Test
     public void isSubmittable_savedConfigZeroLengthPassword_shouldReturnTrue() {
         final TextView password = mView.findViewById(R.id.password);
         password.setText("");
@@ -161,6 +171,34 @@
         assertThat(mController.getSignalString()).isNull();
     }
 
+    @Test
+    public void showForCarrierAp() {
+        // Setup the mock view for wifi dialog.
+        View view = mock(View.class);
+        TextView nameText = mock(TextView.class);
+        TextView valueText = mock(TextView.class);
+        when(view.findViewById(R.id.name)).thenReturn(nameText);
+        when(view.findViewById(R.id.value)).thenReturn(valueText);
+        LayoutInflater inflater = mock(LayoutInflater.class);
+        when(inflater.inflate(anyInt(), any(ViewGroup.class), anyBoolean())).thenReturn(view);
+        when(mConfigUiBase.getLayoutInflater()).thenReturn(inflater);
+
+        String carrierName = "Test Carrier";
+        when(mAccessPoint.isCarrierAp()).thenReturn(true);
+        when(mAccessPoint.getCarrierName()).thenReturn(carrierName);
+        mController = new TestWifiConfigController(mConfigUiBase, mView, mAccessPoint,
+                WifiConfigUiBase.MODE_CONNECT);
+        // Verify the content of the text fields.
+        verify(nameText).setText(R.string.wifi_carrier_connect);
+        verify(valueText).setText(
+                String.format(mContext.getString(R.string.wifi_carrier_content), carrierName));
+        // Verify that the advance toggle is not visible.
+        assertThat(mView.findViewById(R.id.wifi_advanced_toggle).getVisibility())
+                .isEqualTo(View.GONE);
+        // Verify that the EAP method menu is not visible.
+        assertThat(mView.findViewById(R.id.eap).getVisibility()).isEqualTo(View.GONE);
+    }
+
     public class TestWifiConfigController extends WifiConfigController {
 
         public TestWifiConfigController(WifiConfigUiBase parent, View view,
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java b/tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java
new file mode 100644
index 0000000..00941ad
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java
@@ -0,0 +1,64 @@
+package com.android.settings.wifi;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
+
+import com.android.settings.wifi.WifiDialog.WifiDialogListener;
+import com.android.settingslib.wifi.AccessPoint;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = ShadowEntityHeaderController.class)
+public class WifiDialogTest {
+    @Mock private AccessPoint mockAccessPoint;
+
+    private Context mContext = RuntimeEnvironment.application;
+
+    private WifiDialogListener mListener = new WifiDialogListener() {
+        @Override
+        public void onForget(WifiDialog dialog) {
+        }
+
+        @Override
+        public void onSubmit(WifiDialog dialog) {
+        }
+    };
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    public void createFullscreen_setsFullscreenTheme() {
+        WifiDialog fullscreen = WifiDialog.createFullscreen(mContext, mListener, mockAccessPoint,
+                WifiConfigUiBase.MODE_CONNECT);
+        assertThat(fullscreen.getContext().getThemeResId())
+                .isEqualTo(R.style.Theme_Settings_NoActionBar);
+    }
+
+    @Test
+    public void createModal_usesDefaultTheme() {
+        WifiDialog modal = WifiDialog
+                .createModal(mContext, mListener, mockAccessPoint, WifiConfigUiBase.MODE_CONNECT);
+
+        WifiDialog wifiDialog = new WifiDialog(mContext, mListener, mockAccessPoint,
+                WifiConfigUiBase.MODE_CONNECT, 0 /* style */, false /* hideSubmitButton */);
+        assertThat(modal.getContext().getThemeResId())
+                .isEqualTo(wifiDialog.getContext().getThemeResId());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java
new file mode 100644
index 0000000..1ccdb1f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi;
+
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class WifiUtilsTest {
+
+    @Test
+    public void testSSID() {
+        assertThat(WifiUtils.isSSIDTooLong("123")).isFalse();
+        assertThat(WifiUtils.isSSIDTooLong("☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎")).isTrue();
+
+        assertThat(WifiUtils.isSSIDTooShort("123")).isFalse();
+        assertThat(WifiUtils.isSSIDTooShort("")).isTrue();
+    }
+
+    @Test
+    public void testPassword() {
+        final String longPassword = "123456789012345678901234567890"
+                + "1234567890123456789012345678901234567890";
+        assertThat(WifiUtils.isPasswordValid("123")).isFalse();
+        assertThat(WifiUtils.isPasswordValid("12345678")).isTrue();
+        assertThat(WifiUtils.isPasswordValid("1234567890")).isTrue();
+        assertThat(WifiUtils.isPasswordValid(longPassword)).isFalse();
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
index 8be686e..306b297 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
@@ -56,8 +56,6 @@
     private static final String TEST_SCORER_PACKAGE_NAME = "Test Scorer";
 
     private Context mContext;
-    @Mock
-    private NetworkScoreManagerWrapper mNetworkScorer;
     private WifiWakeupPreferenceController mController;
 
     @Before
@@ -65,11 +63,11 @@
         MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
         mController = new WifiWakeupPreferenceController(
-                mContext, mock(Lifecycle.class), mNetworkScorer);
+                mContext, mock(Lifecycle.class));
         Settings.System.putInt(mContext.getContentResolver(), WIFI_SCAN_ALWAYS_AVAILABLE, 1);
+        Settings.System.putInt(mContext.getContentResolver(), NETWORK_RECOMMENDATIONS_ENABLED, 1);
         SettingsShadowResources.overrideResource(
                 com.android.internal.R.integer.config_wifi_wakeup_available, 0);
-        when(mNetworkScorer.getActiveScorerPackage()).thenReturn(TEST_SCORER_PACKAGE_NAME);
     }
 
     @After
@@ -116,9 +114,8 @@
     }
 
     @Test
-    public void updateState_preferenceSetCheckedAndSetEnabledWhenSettingsAreEnabled() {
+    public void updateState_preferenceSetCheckedAndSetEnabledWhenWakeupSettingEnabled() {
         final SwitchPreference preference = mock(SwitchPreference.class);
-        Settings.System.putInt(mContext.getContentResolver(), NETWORK_RECOMMENDATIONS_ENABLED, 1);
         Settings.System.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 1);
 
         mController.updateState(preference);
@@ -129,22 +126,20 @@
     }
 
     @Test
-    public void updateState_preferenceSetCheckedAndSetEnabledWhenSettingsAreDisabled() {
+    public void updateState_preferenceSetUncheckedAndSetEnabledWhenWakeupSettingDisabled() {
         final SwitchPreference preference = mock(SwitchPreference.class);
-        Settings.System.putInt(mContext.getContentResolver(), NETWORK_RECOMMENDATIONS_ENABLED, 0);
         Settings.System.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 0);
 
         mController.updateState(preference);
 
         verify(preference).setChecked(false);
-        verify(preference).setEnabled(false);
+        verify(preference).setEnabled(true);
         verify(preference).setSummary(R.string.wifi_wakeup_summary);
     }
 
     @Test
     public void updateState_preferenceSetUncheckedAndSetDisabledWhenWifiScanningDisabled() {
         final SwitchPreference preference = mock(SwitchPreference.class);
-        Settings.System.putInt(mContext.getContentResolver(), NETWORK_RECOMMENDATIONS_ENABLED, 1);
         Settings.System.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 1);
         Settings.System.putInt(mContext.getContentResolver(), WIFI_SCAN_ALWAYS_AVAILABLE, 0);
 
@@ -158,9 +153,8 @@
     @Test
     public void updateState_preferenceSetUncheckedAndSetDisabledWhenScoringDisabled() {
         final SwitchPreference preference = mock(SwitchPreference.class);
-        Settings.System.putInt(mContext.getContentResolver(), NETWORK_RECOMMENDATIONS_ENABLED, 1);
         Settings.System.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 1);
-        when(mNetworkScorer.getActiveScorerPackage()).thenReturn(null);
+        Settings.System.putInt(mContext.getContentResolver(), NETWORK_RECOMMENDATIONS_ENABLED, 0);
 
         mController.updateState(preference);
 
diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailActionBarObserverTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailActionBarObserverTest.java
new file mode 100644
index 0000000..c573d3c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailActionBarObserverTest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.wifi.details;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.ActionBar;
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class WifiDetailActionBarObserverTest {
+
+    @Mock private Bundle mockBundle;
+    @Mock private Activity mockActivity;
+    @Mock private ActionBar mockActionBar;
+    @Mock private WifiNetworkDetailsFragment mockFragment;
+
+    private Context mContext = RuntimeEnvironment.application;
+    private Lifecycle mLifecycle;
+    private WifiDetailActionBarObserver mObserver;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mLifecycle = new Lifecycle();
+
+        when(mockFragment.getActivity()).thenReturn(mockActivity);
+        when(mockActivity.getActionBar()).thenReturn(mockActionBar);
+
+        mObserver = new WifiDetailActionBarObserver(mContext, mockFragment);
+        mLifecycle.addObserver(mObserver);
+    }
+
+    @Test
+    public void actionBarIsSetToNetworkInfo() {
+        mLifecycle.onCreate(mockBundle);
+
+        verify(mockActionBar).setTitle(mContext.getString(R.string.wifi_details_title));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
index 9c1e70c..90d1215 100644
--- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
@@ -18,12 +18,15 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -138,7 +141,7 @@
     @Captor private ArgumentCaptor<View.OnClickListener> mForgetClickListener;
     @Captor private ArgumentCaptor<Preference> mIpv6AddressCaptor;
 
-    private Context mContext = RuntimeEnvironment.application;
+    private Context mContext;
     private Lifecycle mLifecycle;
     private LinkProperties mLinkProperties;
     private WifiDetailPreferenceController mController;
@@ -199,6 +202,7 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
+        mContext = spy(RuntimeEnvironment.application);
         mLifecycle = new Lifecycle();
 
         when(mockAccessPoint.getConfig()).thenReturn(mockWifiConfig);
@@ -230,6 +234,8 @@
                 .thenReturn(mockHeaderController);
         when(mockHeaderController.setSummary(anyString())).thenReturn(mockHeaderController);
 
+        doReturn(null).when(mContext).getSystemService(eq(Context.DEVICE_POLICY_SERVICE));
+
         setupMockedPreferenceScreen();
         mController = newWifiDetailPreferenceController();
     }
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java
new file mode 100644
index 0000000..8f0b143
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.tether;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.wifi.WifiManager;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class WifiTetherApBandPreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private ConnectivityManager mConnectivityManager;
+    @Mock
+    private WifiManager mWifiManager;
+    @Mock
+    private WifiTetherBasePreferenceController.OnTetherConfigUpdateListener mListener;
+    @Mock
+    private PreferenceScreen mScreen;
+
+    private WifiTetherApBandPreferenceController mController;
+    private ListPreference mListPreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mListPreference = new ListPreference(RuntimeEnvironment.application);
+        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
+        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
+                .thenReturn(mConnectivityManager);
+        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
+        when(mContext.getResources()).thenReturn(RuntimeEnvironment.application.getResources());
+        when(mScreen.findPreference(anyString())).thenReturn(mListPreference);
+
+        mController = new WifiTetherApBandPreferenceController(mContext, mListener);
+    }
+
+    @Test
+    public void display_5GhzSupported_shouldDisplayFullList() {
+        when(mWifiManager.getCountryCode()).thenReturn("US");
+        when(mWifiManager.isDualBandSupported()).thenReturn(true);
+
+        mController.displayPreference(mScreen);
+
+        assertThat(mListPreference.getEntries().length).isEqualTo(2);
+    }
+
+    @Test
+    public void display_noCountryCode_shouldDisable() {
+        when(mWifiManager.getCountryCode()).thenReturn(null);
+        when(mWifiManager.isDualBandSupported()).thenReturn(true);
+
+        mController.displayPreference(mScreen);
+
+        assertThat(mListPreference.getEntries()).isNull();
+        assertThat(mListPreference.isEnabled()).isFalse();
+        assertThat(mListPreference.getSummary())
+                .isEqualTo(RuntimeEnvironment.application.getString(R.string.wifi_ap_choose_2G));
+    }
+
+    @Test
+    public void display_5GhzNotSupported_shouldDisable() {
+        when(mWifiManager.isDualBandSupported()).thenReturn(false);
+
+        mController.displayPreference(mScreen);
+
+        assertThat(mListPreference.getEntries()).isNull();
+        assertThat(mListPreference.isEnabled()).isFalse();
+        assertThat(mListPreference.getSummary())
+                .isEqualTo(RuntimeEnvironment.application.getString(R.string.wifi_ap_choose_2G));
+    }
+
+    @Test
+    public void changePreference_shouldUpdateValue() {
+        when(mWifiManager.is5GHzBandSupported()).thenReturn(true);
+
+        mController.displayPreference(mScreen);
+        mController.onPreferenceChange(mListPreference, "1");
+        assertThat(mController.getBandIndex()).isEqualTo(1);
+
+        mController.onPreferenceChange(mListPreference, "0");
+        assertThat(mController.getBandIndex()).isEqualTo(0);
+
+        verify(mListener, times(2)).onTetherConfigUpdated();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
new file mode 100644
index 0000000..fdb8390
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.tether;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.widget.ValidatedEditTextPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class WifiTetherPasswordPreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private ConnectivityManager mConnectivityManager;
+    @Mock
+    private WifiManager mWifiManager;
+    @Mock
+    private WifiTetherBasePreferenceController.OnTetherConfigUpdateListener mListener;
+    @Mock
+    private PreferenceScreen mScreen;
+
+    private WifiTetherPasswordPreferenceController mController;
+    private ValidatedEditTextPreference mPreference;
+    private WifiConfiguration mConfig;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mPreference = new ValidatedEditTextPreference(RuntimeEnvironment.application);
+        mConfig = new WifiConfiguration();
+        mConfig.SSID = "test_1234";
+        mConfig.preSharedKey = "test_password";
+
+        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
+        when(mWifiManager.getWifiApConfiguration()).thenReturn(mConfig);
+        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
+                .thenReturn(mConnectivityManager);
+        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
+        when(mContext.getResources()).thenReturn(RuntimeEnvironment.application.getResources());
+        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
+
+        mController = new WifiTetherPasswordPreferenceController(mContext, mListener);
+    }
+
+    @Test
+    public void displayPreference_shouldStylePreference() {
+        mController.displayPreference(mScreen);
+
+        assertThat(mPreference.getText()).isEqualTo(mConfig.preSharedKey);
+        assertThat(mPreference.getSummary()).isEqualTo(mConfig.preSharedKey);
+    }
+
+    @Test
+    public void changePreference_shouldUpdateValue() {
+        mController.displayPreference(mScreen);
+        mController.onPreferenceChange(mPreference, "1");
+        assertThat(mController.getPassword()).isEqualTo("1");
+
+        mController.onPreferenceChange(mPreference, "0");
+        assertThat(mController.getPassword()).isEqualTo("0");
+
+        verify(mListener, times(2)).onTetherConfigUpdated();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
new file mode 100644
index 0000000..ff3f47e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
@@ -0,0 +1,279 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.tether;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.ConnectivityManager;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import android.provider.Settings;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.shadows.ShadowSettings;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.ArrayList;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                WifiTetherPreferenceControllerTest.ShadowWifiTetherSettings.class,
+                WifiTetherPreferenceControllerTest.ShadowWifiTetherSwitchBarController.class,
+        })
+public class WifiTetherPreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mFeatureFactoryContext;
+    @Mock
+    private Context mContext;
+    @Mock
+    private ConnectivityManager mConnectivityManager;
+    @Mock
+    private WifiManager mWifiManager;
+    @Mock
+    private PreferenceScreen mScreen;
+
+    private WifiTetherPreferenceController mController;
+    private Lifecycle mLifecycle;
+    private MasterSwitchPreference mPreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mLifecycle = new Lifecycle();
+        FakeFeatureFactory.setupForTest(mFeatureFactoryContext);
+        mPreference = new MasterSwitchPreference(RuntimeEnvironment.application);
+        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
+                .thenReturn(mConnectivityManager);
+        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
+        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
+
+        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
+        mController = new WifiTetherPreferenceController(mContext, mLifecycle);
+    }
+
+    @After
+    public void tearDown() {
+        ShadowWifiTetherSwitchBarController.reset();
+    }
+
+    @Test
+    public void isAvailable_noTetherRegex_shouldReturnFalse() {
+        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{});
+        mController = new WifiTetherPreferenceController(mContext, mLifecycle);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_hasTetherRegex_shouldReturnTrue() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void startAndStop_shouldRegisterUnregisterReceiver() {
+        final BroadcastReceiver receiver = ReflectionHelpers.getField(mController, "mReceiver");
+
+        mController.displayPreference(mScreen);
+        mLifecycle.onStart();
+        mLifecycle.onStop();
+
+        assertThat(ShadowWifiTetherSwitchBarController.onStartCalled).isTrue();
+        assertThat(ShadowWifiTetherSwitchBarController.onStopCalled).isTrue();
+        verify(mContext).registerReceiver(eq(receiver), any(IntentFilter.class));
+        verify(mContext).unregisterReceiver(receiver);
+    }
+
+    @Test
+    public void start_wifiApOff_shouldSetInitialStateToOff() {
+        when(mWifiManager.getWifiApState()).thenReturn(WifiManager.WIFI_AP_STATE_DISABLED);
+        final BroadcastReceiver receiver = ReflectionHelpers.getField(mController, "mReceiver");
+        final MasterSwitchPreference pref = mock(MasterSwitchPreference.class);
+        when(mScreen.findPreference(anyString())).thenReturn(pref);
+
+        mController.displayPreference(mScreen);
+        mLifecycle.onStart();
+
+        assertThat(ShadowWifiTetherSwitchBarController.onStartCalled).isTrue();
+        verify(mContext).registerReceiver(eq(receiver), any(IntentFilter.class));
+        verify(pref).setChecked(false);
+    }
+
+    @Test
+    public void start_wifiApOn_shouldSetInitialStateToOn() {
+        when(mWifiManager.getWifiApState()).thenReturn(WifiManager.WIFI_AP_STATE_ENABLED);
+        final BroadcastReceiver receiver = ReflectionHelpers.getField(mController, "mReceiver");
+        final MasterSwitchPreference pref = mock(MasterSwitchPreference.class);
+        when(mScreen.findPreference(anyString())).thenReturn(pref);
+
+        mController.displayPreference(mScreen);
+        mLifecycle.onStart();
+
+        assertThat(ShadowWifiTetherSwitchBarController.onStartCalled).isTrue();
+        verify(mContext).registerReceiver(eq(receiver), any(IntentFilter.class));
+        verify(pref).setChecked(true);
+    }
+
+    @Test
+    public void testReceiver_apStateChangedToDisabled_shouldUpdatePreferenceSummary() {
+        mController.displayPreference(mScreen);
+        receiveApStateChangedBroadcast(WifiManager.WIFI_AP_STATE_DISABLED);
+        assertThat(mPreference.getSummary().toString()).isEqualTo(
+                RuntimeEnvironment.application.getString(R.string.wifi_hotspot_off_subtext));
+    }
+
+    @Test
+    public void testReceiver_apStateChangedToDisabling_shouldUpdatePreferenceSummary() {
+        mController.displayPreference(mScreen);
+        receiveApStateChangedBroadcast(WifiManager.WIFI_AP_STATE_DISABLING);
+        assertThat(mPreference.getSummary().toString()).isEqualTo(
+                RuntimeEnvironment.application.getString(R.string.wifi_tether_stopping));
+    }
+
+    @Test
+    public void testReceiver_apStateChangedToEnabling_shouldUpdatePreferenceSummary() {
+        mController.displayPreference(mScreen);
+        receiveApStateChangedBroadcast(WifiManager.WIFI_AP_STATE_ENABLING);
+        assertThat(mPreference.getSummary().toString()).isEqualTo(
+                RuntimeEnvironment.application.getString(R.string.wifi_tether_starting));
+    }
+
+    @Test
+    public void testReceiver_apStateChangedToEnabled_shouldNotUpdatePreferenceSummary() {
+        mController.displayPreference(mScreen);
+        receiveApStateChangedBroadcast(WifiManager.WIFI_AP_STATE_DISABLED);
+        assertThat(mPreference.getSummary().toString()).isEqualTo(
+                RuntimeEnvironment.application.getString(R.string.wifi_hotspot_off_subtext));
+
+        // When turning on the hotspot, we receive STATE_ENABLING followed by STATE_ENABLED. The
+        // first should change the status to wifi_tether_starting, and the second should not change
+        // this.
+        receiveApStateChangedBroadcast(WifiManager.WIFI_AP_STATE_ENABLING);
+        assertThat(mPreference.getSummary().toString()).isEqualTo(
+                RuntimeEnvironment.application.getString(R.string.wifi_tether_starting));
+        receiveApStateChangedBroadcast(WifiManager.WIFI_AP_STATE_ENABLED);
+        assertThat(mPreference.getSummary().toString()).isEqualTo(
+                RuntimeEnvironment.application.getString(R.string.wifi_tether_starting));
+    }
+
+    @Test
+    public void testReceiver_goingToAirplaneMode_shouldClearPreferenceSummary() {
+        final ContentResolver cr = mock(ContentResolver.class);
+        when(mContext.getContentResolver()).thenReturn(cr);
+        ShadowSettings.ShadowGlobal.putInt(cr, Settings.Global.AIRPLANE_MODE_ON, 1);
+        mController.displayPreference(mScreen);
+        final BroadcastReceiver receiver = ReflectionHelpers.getField(mController, "mReceiver");
+        final Intent broadcast = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED);
+
+        receiver.onReceive(RuntimeEnvironment.application, broadcast);
+
+        assertThat(mPreference.getSummary().toString()).isEqualTo(
+                RuntimeEnvironment.application.getString(R.string.summary_placeholder));
+    }
+
+    @Test
+    public void testReceiver_tetherEnabled_shouldUpdatePreferenceSummary() {
+        mController.displayPreference(mScreen);
+        final BroadcastReceiver receiver = ReflectionHelpers.getField(mController, "mReceiver");
+        final Intent broadcast = new Intent(ConnectivityManager.ACTION_TETHER_STATE_CHANGED);
+        final ArrayList<String> activeTethers = new ArrayList<>();
+        activeTethers.add("1");
+        broadcast.putStringArrayListExtra(ConnectivityManager.EXTRA_ACTIVE_TETHER, activeTethers);
+        broadcast.putStringArrayListExtra(ConnectivityManager.EXTRA_ERRORED_TETHER,
+                new ArrayList<>());
+        final WifiConfiguration configuration = new WifiConfiguration();
+        configuration.SSID = "test-ap";
+        when(mWifiManager.getWifiApConfiguration()).thenReturn(configuration);
+
+        receiver.onReceive(RuntimeEnvironment.application, broadcast);
+
+        verify(mContext).getString(eq(R.string.wifi_tether_enabled_subtext), any());
+    }
+
+    @Implements(WifiTetherSettings.class)
+    public static final class ShadowWifiTetherSettings {
+
+        @Implementation
+        public static boolean isTetherSettingPageEnabled() {
+            return true;
+        }
+    }
+
+    @Implements(WifiTetherSwitchBarController.class)
+    public static final class ShadowWifiTetherSwitchBarController {
+
+        public static boolean onStartCalled;
+        public static boolean onStopCalled;
+
+        public static void reset() {
+            onStartCalled = false;
+            onStopCalled = false;
+        }
+
+        @Implementation
+        public void onStart() {
+            onStartCalled = true;
+        }
+
+        @Implementation
+        public void onStop() {
+            onStopCalled = true;
+        }
+    }
+
+    /**
+     * Helper to cause the controller to receive a WIFI_AP_STATE_CHANGED_ACTION with a specific
+     * state.
+     * @param state - the state, as specified by one of the WifiManager.WIFI_AP_STATE_* values
+     */
+    private void receiveApStateChangedBroadcast(int state) {
+        final BroadcastReceiver receiver = ReflectionHelpers.getField(mController, "mReceiver");
+        final Intent broadcast = new Intent(WifiManager.WIFI_AP_STATE_CHANGED_ACTION);
+        broadcast.putExtra(WifiManager.EXTRA_WIFI_AP_STATE, state);
+        receiver.onReceive(RuntimeEnvironment.application, broadcast);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java
new file mode 100644
index 0000000..f43e3a7
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.tether;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.widget.ValidatedEditTextPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class WifiTetherSSIDPreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private ConnectivityManager mConnectivityManager;
+    @Mock
+    private WifiManager mWifiManager;
+    @Mock
+    private WifiTetherBasePreferenceController.OnTetherConfigUpdateListener mListener;
+    @Mock
+    private PreferenceScreen mScreen;
+
+    private WifiTetherSSIDPreferenceController mController;
+    private ValidatedEditTextPreference mPreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mPreference = new ValidatedEditTextPreference(RuntimeEnvironment.application);
+
+        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
+        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
+                .thenReturn(mConnectivityManager);
+        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
+        when(mContext.getResources()).thenReturn(RuntimeEnvironment.application.getResources());
+        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
+
+        mController = new WifiTetherSSIDPreferenceController(mContext, mListener);
+    }
+
+    @Test
+    public void displayPreference_noWifiConfig_shouldDisplayDefaultSSID() {
+        when(mWifiManager.getWifiApConfiguration()).thenReturn(null);
+
+        mController.displayPreference(mScreen);
+        assertThat(mController.getSSID())
+                .isEqualTo(WifiTetherSSIDPreferenceController.DEFAULT_SSID);
+    }
+
+    @Test
+    public void displayPreference_hasCustomWifiConfig_shouldDisplayCustomSSID() {
+        final WifiConfiguration config = new WifiConfiguration();
+        config.SSID = "test_1234";
+        when(mWifiManager.getWifiApConfiguration()).thenReturn(config);
+
+        mController.displayPreference(mScreen);
+        assertThat(mController.getSSID()).isEqualTo(config.SSID);
+    }
+
+    @Test
+    public void changePreference_shouldUpdateValue() {
+        mController.displayPreference(mScreen);
+        mController.onPreferenceChange(mPreference, "1");
+        assertThat(mController.getSSID()).isEqualTo("1");
+
+        mController.onPreferenceChange(mPreference, "0");
+        assertThat(mController.getSSID()).isEqualTo("0");
+
+        verify(mListener, times(2)).onTetherConfigUpdated();
+    }
+}
diff --git a/tests/unit/Android.mk b/tests/unit/Android.mk
index f9c0489..060c3e1 100644
--- a/tests/unit/Android.mk
+++ b/tests/unit/Android.mk
@@ -9,10 +9,12 @@
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-test \
-    mockito-target-minus-junit4 \
     espresso-core \
+    legacy-android-test \
+    mockito-target-minus-junit4 \
     truth-prebuilt \
-    legacy-android-test
+    ub-uiautomator \
+
 
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/unit/README b/tests/unit/README
index 5184b07..2544ea5 100644
--- a/tests/unit/README
+++ b/tests/unit/README
@@ -1,8 +1,8 @@
 To build the tests you can use the following command at the root of your android source tree
-$ make SettingsUnitTests
+$ make -j SettingsUnitTests
 
 The test apk then needs to be installed onto your test device via for example
-$ adb install -r out/target/product/shamu/data/app/SettingsUnitTests/SettingsUnitTests.apk
+$ adb install -r ${ANDROID_PRODUCT_OUT}/data/app/SettingsUnitTests/SettingsUnitTests.apk
 
 To run all tests:
 $ adb shell am instrument -w com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
diff --git a/tests/unit/src/com/android/settings/datausage/MobileDataUsageActivityTest.java b/tests/unit/src/com/android/settings/datausage/MobileDataUsageActivityTest.java
new file mode 100644
index 0000000..135ad9d
--- /dev/null
+++ b/tests/unit/src/com/android/settings/datausage/MobileDataUsageActivityTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import static junit.framework.Assert.assertEquals;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.NetworkTemplate;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class MobileDataUsageActivityTest {
+    private static final String TAG = "MobileDataUsageTest";
+    @Test
+    public void test_mobileDataUsageIntent() {
+        final Context context = InstrumentationRegistry.getTargetContext();
+        final PackageManager packageManager = context.getPackageManager();
+        final int subId = SubscriptionManager.getDefaultSubscriptionId();
+        final NetworkTemplate template = getNetworkTemplate(context, subId);
+
+        Intent intent = new Intent(android.provider.Settings.ACTION_MOBILE_DATA_USAGE);
+        intent.putExtra(android.provider.Settings.EXTRA_NETWORK_TEMPLATE, template);
+        intent.putExtra(android.provider.Settings.EXTRA_SUB_ID, subId);
+
+        assertEquals(packageManager.queryIntentActivities(intent, 0).size(), 1);
+
+        context.startActivity(intent);
+        // Should exit gracefully without crashing.
+    }
+
+    private NetworkTemplate getNetworkTemplate(Context context, int subId) {
+        TelephonyManager tm = (TelephonyManager) context
+                .getSystemService(Context.TELEPHONY_SERVICE);
+        NetworkTemplate mobileAll = NetworkTemplate.buildTemplateMobileAll(
+                tm.getSubscriberId(subId));
+        return NetworkTemplate.normalize(mobileAll,
+                tm.getMergedSubscriberIds());
+    }
+}
diff --git a/tests/unit/src/com/android/settings/notification/OWNERS b/tests/unit/src/com/android/settings/notification/OWNERS
new file mode 100644
index 0000000..0d73685
--- /dev/null
+++ b/tests/unit/src/com/android/settings/notification/OWNERS
@@ -0,0 +1,4 @@
+# Default reviewers for this and subdirectories.
+asc@google.com
+dsandler@google.com
+juliacr@google.com
\ No newline at end of file
diff --git a/tests/unit/src/com/android/settings/utils/FileSizeFormatterTest.java b/tests/unit/src/com/android/settings/utils/FileSizeFormatterTest.java
index c5b050a..41b236c 100644
--- a/tests/unit/src/com/android/settings/utils/FileSizeFormatterTest.java
+++ b/tests/unit/src/com/android/settings/utils/FileSizeFormatterTest.java
@@ -22,6 +22,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
+import android.icu.util.MeasureUnit;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
@@ -46,7 +47,7 @@
                         FileSizeFormatter.formatFileSize(
                                 mContext,
                                 0 /* size */,
-                                com.android.internal.R.string.gigabyteShort,
+                                MeasureUnit.GIGABYTE,
                                 GIGABYTE_IN_BYTES))
                 .isEqualTo("0.00 GB");
     }
@@ -57,7 +58,7 @@
                         FileSizeFormatter.formatFileSize(
                                 mContext,
                                 MEGABYTE_IN_BYTES * 11 /* size */,
-                                com.android.internal.R.string.gigabyteShort,
+                                MeasureUnit.GIGABYTE,
                                 GIGABYTE_IN_BYTES))
                 .isEqualTo("0.01 GB");
     }
@@ -68,7 +69,7 @@
                         FileSizeFormatter.formatFileSize(
                                 mContext,
                                 MEGABYTE_IN_BYTES * 155 /* size */,
-                                com.android.internal.R.string.gigabyteShort,
+                                MeasureUnit.GIGABYTE,
                                 GIGABYTE_IN_BYTES))
                 .isEqualTo("0.16 GB");
     }
@@ -79,7 +80,7 @@
                         FileSizeFormatter.formatFileSize(
                                 mContext,
                                 MEGABYTE_IN_BYTES * 1551 /* size */,
-                                com.android.internal.R.string.gigabyteShort,
+                                MeasureUnit.GIGABYTE,
                                 GIGABYTE_IN_BYTES))
                 .isEqualTo("1.6 GB");
     }
@@ -91,7 +92,7 @@
                         FileSizeFormatter.formatFileSize(
                                 mContext,
                                 GIGABYTE_IN_BYTES * 15 + MEGABYTE_IN_BYTES * 50 /* size */,
-                                com.android.internal.R.string.gigabyteShort,
+                                MeasureUnit.GIGABYTE,
                                 GIGABYTE_IN_BYTES))
                 .isEqualTo("15 GB");
     }
@@ -102,7 +103,7 @@
                         FileSizeFormatter.formatFileSize(
                                 mContext,
                                 MEGABYTE_IN_BYTES * -155 /* size */,
-                                com.android.internal.R.string.gigabyteShort,
+                                MeasureUnit.GIGABYTE,
                                 GIGABYTE_IN_BYTES))
                 .isEqualTo("-0.16 GB");
     }
diff --git a/tests/unit/src/com/android/settings/vpn2/AppSettingsTest.java b/tests/unit/src/com/android/settings/vpn2/AppSettingsTest.java
index fe437a6..fe074cc 100644
--- a/tests/unit/src/com/android/settings/vpn2/AppSettingsTest.java
+++ b/tests/unit/src/com/android/settings/vpn2/AppSettingsTest.java
@@ -16,26 +16,26 @@
 
 package com.android.settings.vpn2;
 
-import static com.android.settings.vpn2.AppManagementFragment.isAlwaysOnSupportedByApp;
 import static com.android.settings.vpn2.AppManagementFragment.appHasVpnPermission;
-import static org.mockito.Mockito.*;
+
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.when;
 
 import android.app.AppOpsManager;
+import android.content.Context;
 import android.content.pm.ApplicationInfo;
-import android.os.Build;
 import android.os.Process;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
-import android.content.Context;
-
-import java.util.Arrays;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+
 public class AppSettingsTest extends AndroidTestCase {
     private static final String TAG = AppSettingsTest.class.getSimpleName();
 
@@ -49,23 +49,6 @@
     }
 
     @SmallTest
-    public void testAlwaysOnVersionRestriction() {
-        ApplicationInfo mockApp = createMockApp();
-
-        // API 23 (MNC) = not supported
-        mockApp.targetSdkVersion = Build.VERSION_CODES.M;
-        assertFalse(isAlwaysOnSupportedByApp(mockApp));
-
-        // API 24 (NYC) = supported
-        mockApp.targetSdkVersion = Build.VERSION_CODES.N;
-        assertTrue(isAlwaysOnSupportedByApp(mockApp));
-
-        // API 25 (NYC MR1) = supported
-        mockApp.targetSdkVersion = Build.VERSION_CODES.N_MR1;
-        assertTrue(isAlwaysOnSupportedByApp(mockApp));
-    }
-
-    @SmallTest
     public void testAppOpsRequiredToOpenFragment() {
         ApplicationInfo mockApp = createMockApp();
 
diff --git a/tests/unit/src/com/android/settings/vpn2/PreferenceListTest.java b/tests/unit/src/com/android/settings/vpn2/PreferenceListTest.java
index bb12efa..2accbf2 100644
--- a/tests/unit/src/com/android/settings/vpn2/PreferenceListTest.java
+++ b/tests/unit/src/com/android/settings/vpn2/PreferenceListTest.java
@@ -36,9 +36,9 @@
 import java.util.Map;
 
 import org.mockito.ArgumentCaptor;
+import org.mockito.ArgumentMatcher;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.mockito.compat.ArgumentMatcher;
 
 public class PreferenceListTest extends AndroidTestCase {
     private static final String TAG = "PreferenceListTest";
@@ -135,13 +135,10 @@
                 /* lockdownVpnKey */ null);
         updater.run();
 
-        final ArgumentMatcher<VpnProfile> equalsFake = new ArgumentMatcher<VpnProfile>() {
-            @Override
-            public boolean matchesObject(final Object arg) {
-                if (arg == vpnProfile) return true;
-                if (arg == null) return false;
-                return TextUtils.equals(((VpnProfile) arg).key, vpnProfile.key);
-            }
+        final ArgumentMatcher<VpnProfile> equalsFake = arg -> {
+            if (arg == vpnProfile) return true;
+            if (arg == null) return false;
+            return TextUtils.equals(arg.key, vpnProfile.key);
         };
 
         // The VPN profile should have been used to create a preference and set up at laest once
diff --git a/tests/unit/src/com/android/settings/wifi/SavedNetworkSettingsTest.java b/tests/unit/src/com/android/settings/wifi/SavedNetworkSettingsTest.java
new file mode 100644
index 0000000..79eccc4
--- /dev/null
+++ b/tests/unit/src/com/android/settings/wifi/SavedNetworkSettingsTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.wifi;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.action.ViewActions.click;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+
+import android.content.Context;
+import android.content.Intent;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+
+import com.android.settings.Settings;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+@RunWith(AndroidJUnit4.class)
+public class SavedNetworkSettingsTest {
+
+    // Keys used to lookup resources by name (see the resourceId helper method).
+    private static final String STRING = "string";
+    private static final String WIFI_ADD_NETWORK = "wifi_add_network";
+    private static final String WIFI_NETWORK_LABEL = "wifi_ssid";
+
+    private Context mContext;
+
+    @Rule
+    public ActivityTestRule<Settings.SavedAccessPointsSettingsActivity> mActivityRule =
+            new ActivityTestRule<>(Settings.SavedAccessPointsSettingsActivity.class, true);
+
+    private int resourceId(String type, String name) {
+        return mContext.getResources().getIdentifier(name, type, mContext.getPackageName());
+    }
+
+    @Before
+    public void setUp() {
+        mContext = InstrumentationRegistry.getTargetContext();
+    }
+
+    private void launchSavedNetworksSettings() {
+        Intent intent = new Intent()
+                .setClassName(mContext.getPackageName(),
+                        Settings.SavedAccessPointsSettingsActivity.class.getName())
+                .setPackage(mContext.getPackageName());
+        mActivityRule.launchActivity(intent);
+    }
+
+    @Test
+    public void launchSavedNetworkSettings_shouldHaveAddNetworkField() {
+        launchSavedNetworksSettings();
+        onView(withText(resourceId(STRING, WIFI_ADD_NETWORK))).check(matches(isDisplayed()))
+                .perform(click());
+        onView(withText(resourceId(STRING, WIFI_NETWORK_LABEL))).check(matches(isDisplayed()));
+    }
+}
diff --git a/tests/unit/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java b/tests/unit/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
new file mode 100644
index 0000000..add988c
--- /dev/null
+++ b/tests/unit/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.tether;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.Instrumentation;
+import android.content.Intent;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+
+import com.android.settings.Settings;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class WifiTetherSettingsTest {
+
+    private static final long TIMEOUT = 2000L;
+
+    private Instrumentation mInstrumentation;
+    private Intent mTetherActivityIntent;
+    private UiDevice mDevice;
+
+    @Before
+    public void setUp() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mDevice = UiDevice.getInstance(mInstrumentation);
+        mTetherActivityIntent = new Intent()
+                .setClassName(mInstrumentation.getTargetContext().getPackageName(),
+                        Settings.TetherSettingsActivity.class.getName())
+                .setPackage(mInstrumentation.getTargetContext().getPackageName());
+    }
+
+    @After
+    public void tearDown() {
+        mDevice.pressHome();
+    }
+
+    @Test
+    public void verifyPageIsDisabledByDefault() {
+        assertThat(WifiTetherSettings.isTetherSettingPageEnabled()).isFalse();
+    }
+
+    @Test
+    public void launchTetherSettings_shouldHaveAllFields() {
+        launchWifiTetherActivity();
+        onView(withText("Network name")).check(matches(isDisplayed()));
+        onView(withText("Password")).check(matches(isDisplayed()));
+        onView(withText("Select AP Band")).check(matches(isDisplayed()));
+    }
+
+    private void launchWifiTetherActivity() {
+        mInstrumentation.startActivitySync(mTetherActivityIntent);
+        onView(withText("Portable Wi‑Fi hotspot")).perform();
+        UiObject2 item = mDevice.wait(Until.findObject(By.text("Portable Wi‑Fi hotspot")), TIMEOUT);
+        item.click();
+    }
+}